diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-05-19 15:30:10 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-05-19 15:30:10 +0200 |
| commit | eddf06228904dd3a9b5e602abf59092c188d4ce1 (patch) | |
| tree | ba2c0dba7717aa0e5e58769ddeaa8be6b4b261d1 /tube-rotator | |
| parent | printing speed after successful command (diff) | |
speed is actually reversed
Diffstat (limited to 'tube-rotator')
| -rw-r--r-- | tube-rotator/stepper.c | 6 | ||||
| -rw-r--r-- | tube-rotator/tube-rotator.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tube-rotator/stepper.c b/tube-rotator/stepper.c index 80f4d8d..675be26 100644 --- a/tube-rotator/stepper.c +++ b/tube-rotator/stepper.c @@ -97,18 +97,18 @@ ISR(TIMER1_COMPA_vect) void stepper_set_speed(uint16_t new_speed) { - if(new_speed >= STEPPER_SPEED_MIN && new_speed <= STEPPER_SPEED_MAX) + if(new_speed <= STEPPER_SPEED_MIN && new_speed >= STEPPER_SPEED_MAX) target_speed = new_speed; } void stepper_inc_speed(void) { - target_speed = (target_speed >= STEPPER_SPEED_MAX) ? target_speed : target_speed + 1; + target_speed = (target_speed <= STEPPER_SPEED_MAX) ? STEPPER_SPEED_MAX : target_speed - 1; } void stepper_dec_speed(void) { - target_speed = (target_speed <= STEPPER_SPEED_MIN) ? target_speed : target_speed - 1; + target_speed = (target_speed >= STEPPER_SPEED_MIN) ? STEPPER_SPEED_MIN : target_speed + 1; } uint16_t stepper_get_speed(void) diff --git a/tube-rotator/tube-rotator.c b/tube-rotator/tube-rotator.c index b5a6bd6..e1c84ce 100644 --- a/tube-rotator/tube-rotator.c +++ b/tube-rotator/tube-rotator.c @@ -47,7 +47,7 @@ void handle_cmd(uint8_t cmd) case '3': stepper_set_speed(STEPPER_SPEED_180RPM); break; default: printf("Error(cmd): unknown command %02X '%c'\r\n", cmd, cmd); return; } - printf("current speed: %d \r", stepper_get_speed()); + printf("current speed: %4d \r", stepper_get_speed()); } int main(void) |