mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13567 from s-hadinger/berry_virtual_displaydimmer 

Support for DisplayDimmer for Core2 with Berry drivers
This commit is contained in:
s-hadinger 2021-11-04 19:45:42 +01:00 committed by GitHub
parent aa79f73aa9 3cfae4ccce
commit dda96c84a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasmota/berry/drivers/i2c_axp192_M5StackCore2.be
View File

@ -3,7 +3,7 @@
-------------------------------------------------------------#
class AXP192_M5Stack_Core2 : AXP192
def init()
super(self, AXP192).init()
super(self).init()
if self.wire
# Disable vbus hold limit
@ -116,6 +116,20 @@ class AXP192_M5Stack_Core2 : AXP192
self.write8(0x12, self.read8(0x12) | 0x40) # set EXTEN to enable 5v boost
end
end
# Dimmer in percentage
def set_displaydimmer(x)
var v = tasmota.scale_uint(x, 0, 100, 2500, 3300)
self.set_lcd_voltage(v)
end
# respond to display events
def display(cmd, idx, payload, raw)
if cmd == "dim" || cmd == "power"
self.set_displaydimmer(idx)
end
end
end
axp = AXP192_M5Stack_Core2()

8
tasmota/xdrv_13_display.ino
View File

@ -1861,6 +1861,10 @@ void DisplaySetPower(void)
XdspCall(FUNC_DISPLAY_POWER);
} else {
renderer->DisplayOnff(disp_power);
#ifdef USE_BERRY
// still call Berry virtual display in case it is not managed entirely by renderer
Xdsp18(FUNC_DISPLAY_POWER);
#endif // USE_BERRY
}
}
}
@ -1961,6 +1965,10 @@ void ApplyDisplayDimmer(void) {
}
if (renderer) {
renderer->dim8(dimmer8, dimmer8_gamma); // provide 8 bits and gamma corrected dimmer in 8 bits
#ifdef USE_BERRY
// still call Berry virtual display in case it is not managed entirely by renderer
Xdsp18(FUNC_DISPLAY_DIM);
#endif // USE_BERRY
} else {
XdspCall(FUNC_DISPLAY_DIM);
}

10
tasmota/xdsp_18_berry_display.ino
View File

@ -32,19 +32,19 @@ bool Xdsp18(uint8_t function) {
switch (function) {
case FUNC_DISPLAY_INIT_DRIVER:
result = callBerryEventDispatcher(PSTR("display"), PSTR("init_driver"), function, XdrvMailbox.data);
result = callBerryEventDispatcher(PSTR("display"), PSTR("init_driver"), 0, nullptr);
break;
case FUNC_DISPLAY_INIT:
result = callBerryEventDispatcher(PSTR("display"), PSTR("init_driver"), function, XdrvMailbox.data);
result = callBerryEventDispatcher(PSTR("display"), PSTR("init_driver"), 0, nullptr);
break;
case FUNC_DISPLAY_MODEL:
result = callBerryEventDispatcher(PSTR("display"), PSTR("model"), function, XdrvMailbox.data);
result = callBerryEventDispatcher(PSTR("display"), PSTR("model"), 0, nullptr);
break;
case FUNC_DISPLAY_DIM:
result = callBerryEventDispatcher(PSTR("display"), PSTR("dim"), function, XdrvMailbox.data);
result = callBerryEventDispatcher(PSTR("display"), PSTR("dim"), GetDisplayDimmer(), nullptr);
break;
case FUNC_DISPLAY_POWER:
result = callBerryEventDispatcher(PSTR("display"), PSTR("power"), function, XdrvMailbox.data);
result = callBerryEventDispatcher(PSTR("display"), PSTR("power"), disp_power ? GetDisplayDimmer() : 0, nullptr);
break;
}
return result;