diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-05-20 03:56:14 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-05-20 03:56:14 +0200 |
| commit | 0b70b0e64a9e2681f81e26014e5978c16fb2838c (patch) | |
| tree | 85432931f39aeadb6a902d45b810b9c1382e7dec /tube-rotator | |
| parent | prevent stepper from being reastarted if already running (diff) | |
better min/max values
Diffstat (limited to 'tube-rotator')
| -rw-r--r-- | tube-rotator/stepper.c | 4 | ||||
| -rw-r--r-- | tube-rotator/stepper.h | 6 | ||||
| -rw-r--r-- | tube-rotator/tube-rotator.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tube-rotator/stepper.c b/tube-rotator/stepper.c index 2de1fc2..84bd666 100644 --- a/tube-rotator/stepper.c +++ b/tube-rotator/stepper.c @@ -132,7 +132,7 @@ uint16_t stepper_get_speed(void) return target_speed; } -uint8_t stepper_get_speed_rpm(void) +uint16_t stepper_get_speed_rpm(void) { - return (uint8_t)lround( ( (double)F_CPU / (double)(51200 * (target_speed + 1) ) ) * 60.0 ); + return (uint16_t)lround( ( (double)F_CPU / (double)(64.0 * 800.0 * (double)(target_speed + 1) ) ) * 60.0 ); } diff --git a/tube-rotator/stepper.h b/tube-rotator/stepper.h index e48be30..5f26fdf 100644 --- a/tube-rotator/stepper.h +++ b/tube-rotator/stepper.h @@ -23,8 +23,8 @@ #ifndef R3TUBE_stepper_h_INCLUDED #define R3TUBE_stepper_h_INCLUDED -#define STEPPER_SPEED_MIN 1000 -#define STEPPER_SPEED_MAX 150 +#define STEPPER_SPEED_MIN 950 +#define STEPPER_SPEED_MAX 149 #define STEPPER_SPEED_20RPM 936 #define STEPPER_SPEED_30RPM 624 @@ -46,6 +46,6 @@ void stepper_set_speed(uint16_t new_speed); void stepper_inc_speed(void); void stepper_dec_speed(void); uint16_t stepper_get_speed(void); -uint8_t stepper_get_speed_rpm(void); +uint16_t stepper_get_speed_rpm(void); #endif diff --git a/tube-rotator/tube-rotator.c b/tube-rotator/tube-rotator.c index e0b0255..88b2280 100644 --- a/tube-rotator/tube-rotator.c +++ b/tube-rotator/tube-rotator.c @@ -53,7 +53,7 @@ void handle_cmd(uint8_t cmd) case '0': stepper_set_speed(STEPPER_SPEED_100RPM); break; default: printf("Error(cmd): unknown command %02X '%c'\r\n", cmd, cmd); return; } - printf("target speed: %3d rpm\r", stepper_get_speed_rpm()); + printf("target speed: %4d rpm\r", stepper_get_speed_rpm()); } int main(void) |