Skip to content

Minor comment error fix and speed_byte mapping fix. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bwshockley wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Minor comment error fix and speed_byte mapping fix. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47d461e
Update DCCHardware.c
bwshockley May 20, 2015
60aee46
Update speed_byte to map analog values
bwshockley Jul 4, 2015
8f3c9f9
Update Throttle Reading
bwshockley Apr 26, 2016
3a85911
Update to Conditional Statements
bwshockley Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DCCHardware.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*dos_send_premable: A packet has been made available, and so we should broadcast the preamble: 14 '1's in a row
*dos_send_bstart: Each data uint8_t is preceded by a '0'
*dos_send_uint8_t: Sending the current data uint8_t
*dos_end_bit: After the final uint8_t is sent, send a '0'.
*dos_end_bit: After the final uint8_t is sent, send a '1'.
*/
typedef enum {
dos_idle,
Expand Down
23 changes: 16 additions & 7 deletions examples/CmdrArduino_minimum/CmdrArduino_minimum.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,23 @@ void loop() {

//handle reading throttle
analog_value = analogRead(0);
speed_byte = (analog_value >> 2)-127 ; //divide by four to take a 0-1023 range number and make it 1-126 range.
const uint16_t dead_zone_width = 10;
if(analog_value <= (511-(.5*dead_zone_width)))
{
speed_byte = map(analog_value, 0, 511-(.5*dead_zone_width), -127, -2)
}
else if(analog_value >= (511+(.5*dead_zone_width)))
{
speed_byte = map(analog_value, 511+(.5*dead_zone_width), 1023, 2, 127)
}
else
{
if(old_speed > 0) speed_byte = 1;
else speed_byte = -1;
}

if(speed_byte != old_speed)
{
if(speed_byte == 0) //this would be treated as an e-stop!
{
if(old_speed > 0) speed_byte = 1;
else speed_byte = -1;
}
Serial.print("analog = ");
Serial.println(analog_value, DEC);
Serial.print("digital = ");
Expand All @@ -58,6 +67,6 @@ void loop() {
old_speed = speed_byte;
}
dps.update();

++count;
}