jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix Mi Desk Lamp

Browse Source 
Try to fix Mi Desk Lamp (#8748)
This commit is contained in:
Theo Arends 2020-06-29 17:35:02 +02:00
parent acc0562422
commit 074bef9f70
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tasmota/support_rotary.ino
View File

@ -30,8 +30,8 @@ struct ROTARY {
uint8_t state = 0; uint8_t state = 0;
uint8_t position = 128; uint8_t position = 128;
uint8_t last_position = 128; uint8_t last_position = 128;
uint8_t interrupts_in_use_count = 0;
uint8_t changed = 0; uint8_t changed = 0;
bool busy = false;
} Rotary; } Rotary;
/********************************************************************************************/ /********************************************************************************************/
@ -43,7 +43,7 @@ void update_rotary(void) ICACHE_RAM_ATTR;
void update_rotary(void) void update_rotary(void)
{ {
if (MI_DESK_LAMP == my_module_type) { if (MI_DESK_LAMP == my_module_type) {
if (LightPowerIRAM()) { if (LightPowerIRAM() && !Rotary.busy) {
/* /*
* https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h * https://github.com/PaulStoffregen/Encoder/blob/master/Encoder.h
*/ */
@ -83,19 +83,9 @@ void RotaryInit(void)
if (PinUsed(GPIO_ROT1A) && PinUsed(GPIO_ROT1B)) { if (PinUsed(GPIO_ROT1A) && PinUsed(GPIO_ROT1B)) {
Rotary.present++; Rotary.present++;
pinMode(Pin(GPIO_ROT1A), INPUT_PULLUP); pinMode(Pin(GPIO_ROT1A), INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(Pin(GPIO_ROT1A)), update_rotary, CHANGE);
pinMode(Pin(GPIO_ROT1B), INPUT_PULLUP); pinMode(Pin(GPIO_ROT1B), INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(Pin(GPIO_ROT1B)), update_rotary, CHANGE);
// GPIO6-GPIO11 are typically used to interface with the flash memory IC on
// most esp8266 modules, so we should avoid adding interrupts to these pins.
if ((Pin(GPIO_ROT1A) < 6) || (Pin(GPIO_ROT1A) > 11)) {
attachInterrupt(digitalPinToInterrupt(Pin(GPIO_ROT1A)), update_rotary, CHANGE);
Rotary.interrupts_in_use_count++;
}
if ((Pin(GPIO_ROT1B) < 6) || (Pin(GPIO_ROT1B) > 11)) {
attachInterrupt(digitalPinToInterrupt(Pin(GPIO_ROT1B)), update_rotary, CHANGE);
Rotary.interrupts_in_use_count++;
}
} }
} }
@ -105,38 +95,38 @@ void RotaryInit(void)
void RotaryHandler(void) void RotaryHandler(void)
{ {
if (Rotary.interrupts_in_use_count < 2) {
noInterrupts();
update_rotary();
} else {
noInterrupts();
}
if (Rotary.last_position != Rotary.position) { if (Rotary.last_position != Rotary.position) {
Rotary.busy = true;
int rotary_position = Rotary.position - Rotary.last_position;
if (MI_DESK_LAMP == my_module_type) { // Mi Desk lamp if (MI_DESK_LAMP == my_module_type) { // Mi Desk lamp
if (Button.hold_timer[0]) { if (Button.hold_timer[0]) {
Rotary.changed = 1; Rotary.changed = 1;
// button1 is pressed: set color temperature // button1 is pressed: set color temperature
int16_t t = LightGetColorTemp(); int16_t t = LightGetColorTemp();
t = t + ((Rotary.position - Rotary.last_position) * 4); t = t + ((rotary_position) * 4);
if (t < 153) { if (t < 153) {
t = 153; t = 153;
} }
if (t > 500) { if (t > 500) {
t = 500; t = 500;
} }
DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), Rotary.position - Rotary.last_position); DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_COLORTEMPERATURE " %d"), rotary_position);
LightSetColorTemp((uint16_t)t); LightSetColorTemp((uint16_t)t);
// char scmnd[20];
// snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_COLORTEMPERATURE " %d"), t);
// ExecuteCommand(scmnd, SRC_SWITCH);
} else { } else {
int8_t d = Settings.light_dimmer; int8_t d = Settings.light_dimmer;
d = d + (Rotary.position - Rotary.last_position); d = d + rotary_position;
if (d < 1) { if (d < 1) {
d = 1; d = 1;
} }
if (d > 100) { if (d > 100) {
d = 100; d = 100;
} }
// DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), Rotary.position - Rotary.last_position); DEBUG_CORE_LOG(PSTR("ROT: " D_CMND_DIMMER " %d"), rotary_position);
// AddLog_P2(LOG_LEVEL_DEBUG, PSTR("ROT: " D_CMND_DIMMER " %d"), d);
char scmnd[20]; char scmnd[20];
snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER "0 %d"), d); snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_DIMMER "0 %d"), d);
@ -145,8 +135,8 @@ void RotaryHandler(void)
} }
Rotary.last_position = 128; Rotary.last_position = 128;
Rotary.position = 128; Rotary.position = 128;
Rotary.busy = false;
} }
interrupts();
} }
void RotaryLoop(void) void RotaryLoop(void)