diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-09-12 23:54:09 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-09-12 23:54:09 +0200 |
| commit | d2d0c35b04ece686dcd3553173986249ff9f2b3b (patch) | |
| tree | f07b5e17667e09b39fb69a262a9b2c9a18a12fa6 | |
| parent | add fan tacho (diff) | |
remove float since integer division precise enough
| -rw-r--r-- | table-fan/Makefile | 1 | ||||
| -rw-r--r-- | table-fan/table-fan.c | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/table-fan/Makefile b/table-fan/Makefile index 85f972c..c41073f 100644 --- a/table-fan/Makefile +++ b/table-fan/Makefile @@ -26,7 +26,6 @@ OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio EXTERNAL_LIBS := lufa SPREADAVR_PATH := ../contrib/avr-utils -PRINTF_HAS_FLOAT := 1 RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc RESET_PARAM := 'r' diff --git a/table-fan/table-fan.c b/table-fan/table-fan.c index 0a49c91..6580b26 100644 --- a/table-fan/table-fan.c +++ b/table-fan/table-fan.c @@ -91,20 +91,18 @@ ISR(TIMER1_CAPT_vect) } tacho_last_ts = current; - float rpm = 1875000.0 / (float)diff ; - printf("\rtacho: %8.2f rpm", rpm); + uint16_t rpm = 1875000 / diff; + printf("\rspeed: %6d rpm", rpm); } void handle_cmd(uint8_t cmd) { switch(cmd) { - case '0': led_off(); printf("ok\r\n"); break; - case '1': led_on(); printf("ok\r\n"); break; - case '+': pwm_inc(); printf("pwm = %d\r\n", PWM_VAL); break; - case '-': pwm_dec(); printf("pwm = %d\r\n", PWM_VAL); break; + case '+': pwm_inc(); break; // printf("pwm = %d\r\n", PWM_VAL); break; + case '-': pwm_dec(); break; // printf("pwm = %d\r\n", PWM_VAL); break; case 'r': reset2bootloader(); break; - default: printf("error\r\n"); return; + default: return; // printf("error\r\n"); return; } } |