From 618d86078c26ae924d94e35d3a1175fdc1ad6dd6 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 1 Jul 2020 10:34:39 +0200 Subject: [PATCH] Rotary experiments --- tasmota/support_rotary.ino | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tasmota/support_rotary.ino b/tasmota/support_rotary.ino index 2dd8aad9c..1eb6bbcdb 100644 --- a/tasmota/support_rotary.ino +++ b/tasmota/support_rotary.ino @@ -27,15 +27,15 @@ //#define ROTARY_OPTION2 #ifdef ROTARY_OPTION1 -const uint8_t rotary_dimmer_increment = 1; -const uint8_t rotary_ct_increment = 2; -const uint8_t rotary_color_increment = 4; +const int8_t rotary_dimmer_increment = 1; +const int8_t rotary_ct_increment = 2; +const int8_t rotary_color_increment = 4; #endif #ifdef ROTARY_OPTION2 -const uint8_t rotary_dimmer_increment = 2; -const uint8_t rotary_ct_increment = 8; -const uint8_t rotary_color_increment = 8; +const int8_t rotary_dimmer_increment = 2; +const int8_t rotary_ct_increment = 8; +const int8_t rotary_color_increment = 8; #endif struct ROTARY { @@ -131,7 +131,7 @@ void RotaryHandler(void) { Rotary.busy = true; - int rotary_position = Rotary.position - Rotary.last_position; + int8_t rotary_position = Rotary.position - Rotary.last_position; Rotary.last_position = 128; Rotary.position = 128; @@ -140,13 +140,13 @@ void RotaryHandler(void) { } if (Button.hold_timer[0]) { // Button1 is pressed: set color temperature -// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ROT: CT/Color position %d"), rotary_position); + AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ROT: CT/Color position %d"), rotary_position); Rotary.changed = 1; if (!LightColorTempOffset(rotary_position * rotary_ct_increment)) { // Ct 153..500 = (500 - 153) / 8 = 43 steps LightColorOffset(rotary_position * rotary_color_increment); // Hue 0..359 = 360 / 8 = 45 steps } } else { -// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ROT: Dimmer position %d"), rotary_position); + AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ROT: Dimmer position %d"), rotary_position); LightDimmerOffset(rotary_position * rotary_dimmer_increment); // Dimmer 1..100 = 100 / 2 = 50 steps }