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

Now using Settings.display_options instead of display_type

This commit is contained in:
Ajith Vasudevan 2021-03-03 18:15:27 +05:30
parent 850aff3ab6
commit 7a85a0e88e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/xdsp_15_tm1637.ino
View File

@ -258,9 +258,9 @@ bool DriverInit(void) {
if(Settings.display_model == XDSP_15) { if(Settings.display_model == XDSP_15) {
if(TM1637Data.driver_inited) return true; if(TM1637Data.driver_inited) return true;
if(Settings.display_type == 2) { TM1637Data.num_digits = 8; TM1637Data.display_type = TM1638; } if(Settings.display_options.data == 2) { TM1637Data.num_digits = 8; TM1637Data.display_type = TM1638; }
else if(Settings.display_type == 1) { TM1637Data.num_digits = 6; TM1637Data.display_type = TM1637; } else if(Settings.display_options.data == 1) { TM1637Data.num_digits = 6; TM1637Data.display_type = TM1637; }
else { Settings.display_type = 0; TM1637Data.num_digits = 4; TM1637Data.display_type = TM1637; } else { Settings.display_options.data = 0; TM1637Data.num_digits = 4; TM1637Data.display_type = TM1637; }
if(TM1637Data.display_type == TM1637) { if(TM1637Data.display_type == TM1637) {
strcpy(TM1637Data.model_name, "TM1637"); strcpy(TM1637Data.model_name, "TM1637");
@ -277,7 +277,7 @@ bool DriverInit(void) {
TM1637Data.brightness = (Settings.display_dimmer ? Settings.display_dimmer : TM1637Data.brightness); TM1637Data.brightness = (Settings.display_dimmer ? Settings.display_dimmer : TM1637Data.brightness);
setBrightness(TM1637Data.brightness); setBrightness(TM1637Data.brightness);
TM1637Data.driver_inited = true; TM1637Data.driver_inited = true;
AddLog(LOG_LEVEL_INFO, PSTR("DSP: %s display driver initialized with %d digits (DisplayType %d)"), TM1637Data.model_name, TM1637Data.num_digits, Settings.display_type); AddLog(LOG_LEVEL_INFO, PSTR("DSP: %s display driver initialized with %d digits (DisplayType %d)"), TM1637Data.model_name, TM1637Data.num_digits, Settings.display_options.data);
} }
return true; return true;
@ -1010,11 +1010,11 @@ bool Xdsp15(uint8_t function)
result = DriverInit(); // init result = DriverInit(); // init
break; break;
case FUNC_DISPLAY_INIT: case FUNC_DISPLAY_INIT:
AddLog(LOG_LEVEL_DEBUG, PSTR("TM7: %s: FUNC_DISPLAY_INIT: Display depends on TM1637Data.display_type, currently %d"), TM1637Data.model_name, Settings.display_type); AddLog(LOG_LEVEL_DEBUG, PSTR("TM7: %s: FUNC_DISPLAY_INIT: Display depends on TM1637Data.display_type, currently %d"), TM1637Data.model_name, Settings.display_options.data);
result = true; result = true;
break; break;
case FUNC_DISPLAY_TYPE: case FUNC_DISPLAY_TYPE:
AddLog(LOG_LEVEL_DEBUG, PSTR("TM7: %s: FUNC_DISPLAY_TYPE: TM1637Data.display_type set to %d, restarting to take effect ..."), TM1637Data.model_name, Settings.display_type); AddLog(LOG_LEVEL_DEBUG, PSTR("TM7: %s: FUNC_DISPLAY_TYPE: TM1637Data.display_type set to %d, restarting to take effect ..."), TM1637Data.model_name, Settings.display_options.data);
TasmotaGlobal.restart_flag = 2; TasmotaGlobal.restart_flag = 2;
break; break;
case FUNC_DISPLAY_SEVENSEG_TEXT: case FUNC_DISPLAY_SEVENSEG_TEXT: