Merge branch 'ui' into dev

2020-02-21 23:08:38 +01:00
parent 68fc473372 532262f670
commit 30aa1149a3
4 changed files with 65 additions and 29 deletions
--- a/stm-firmware/include/reflow-controller/rotary-encoder.h
+++ b/stm-firmware/include/reflow-controller/rotary-encoder.h
@@ -35,7 +35,7 @@ void rotary_encoder_setup(void);

 uint32_t rotary_encoder_get_abs_val(void);

-int32_t rotary_encoder_get_chage_val(void);
+int32_t rotary_encoder_get_change_val(void);

 void rotary_encoder_stop(void);