jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-01 06:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix displaymode 2/3 to not receive MQTT data

Browse Source 
Fix displaymode 2/3 to not receive MQTT data (#5990)
This commit is contained in:
Theo Arends 2019-07-01 12:54:26 +02:00
parent 6abccdb8cc
commit d66a3e8450
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sonoff/xdrv_13_display.ino
View File

@ -61,18 +61,8 @@ const char S_JSON_DISPLAY_COMMAND_VALUE[] PROGMEM = "{\"" D_CMND_DISPLAY
const char S_JSON_DISPLAY_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_DISPLAY "%s\":%d}"; const char S_JSON_DISPLAY_COMMAND_NVALUE[] PROGMEM = "{\"" D_CMND_DISPLAY "%s\":%d}";
const char S_JSON_DISPLAY_COMMAND_INDEX_NVALUE[] PROGMEM = "{\"" D_CMND_DISPLAY "%s%d\":%d}"; const char S_JSON_DISPLAY_COMMAND_INDEX_NVALUE[] PROGMEM = "{\"" D_CMND_DISPLAY "%s%d\":%d}";
uint8_t disp_power = 0; char *dsp_str;
uint8_t disp_device = 0;
uint8_t disp_refresh = 1;
int16_t disp_xpos = 0;
int16_t disp_ypos = 0;
uint8_t disp_autodraw = 1;
uint8_t dsp_init;
uint8_t dsp_font;
uint8_t dsp_flag;
uint8_t dsp_on;
uint16_t dsp_x; uint16_t dsp_x;
uint16_t dsp_y; uint16_t dsp_y;
uint16_t dsp_x2; uint16_t dsp_x2;
@ -80,21 +70,30 @@ uint16_t dsp_y2;
uint16_t dsp_rad; uint16_t dsp_rad;
uint16_t dsp_color; uint16_t dsp_color;
int16_t dsp_len; int16_t dsp_len;
char *dsp_str; int16_t disp_xpos = 0;
int16_t disp_ypos = 0;
uint8_t disp_power = 0;
uint8_t disp_device = 0;
uint8_t disp_refresh = 1;
uint8_t disp_autodraw = 1;
uint8_t dsp_init;
uint8_t dsp_font;
uint8_t dsp_flag;
uint8_t dsp_on;
#ifdef USE_DISPLAY_MODES1TO5 #ifdef USE_DISPLAY_MODES1TO5
char disp_temp[2]; // C or F
uint8_t disp_subscribed = 0;
char **disp_log_buffer; char **disp_log_buffer;
char **disp_screen_buffer;
char disp_temp[2]; // C or F
uint8_t disp_log_buffer_cols = 0; uint8_t disp_log_buffer_cols = 0;
uint8_t disp_log_buffer_idx = 0; uint8_t disp_log_buffer_idx = 0;
uint8_t disp_log_buffer_ptr = 0; uint8_t disp_log_buffer_ptr = 0;
char **disp_screen_buffer;
uint8_t disp_screen_buffer_cols = 0; uint8_t disp_screen_buffer_cols = 0;
uint8_t disp_screen_buffer_rows = 0; uint8_t disp_screen_buffer_rows = 0;
bool disp_subscribed = false;
#endif // USE_DISPLAY_MODES1TO5 #endif // USE_DISPLAY_MODES1TO5
@ -820,8 +819,7 @@ void DisplayMqttSubscribe(void)
* - home/%prefix%/%topic% * - home/%prefix%/%topic%
* - home/level2/%prefix%/%topic% etc. * - home/level2/%prefix%/%topic% etc.
*/ */
// if (Settings.display_mode &0x04) { if (Settings.display_model && (Settings.display_mode &0x04)) {
if (Settings.display_model) {
char stopic[TOPSZ]; char stopic[TOPSZ];
char ntopic[TOPSZ]; char ntopic[TOPSZ];
@ -839,9 +837,9 @@ void DisplayMqttSubscribe(void)
strncat(ntopic, Settings.mqtt_prefix[2], sizeof(ntopic) - strlen(ntopic) -1); // Subscribe to tele messages strncat(ntopic, Settings.mqtt_prefix[2], sizeof(ntopic) - strlen(ntopic) -1); // Subscribe to tele messages
strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1); // Add multi-level wildcard strncat_P(ntopic, PSTR("/#"), sizeof(ntopic) - strlen(ntopic) -1); // Add multi-level wildcard
MqttSubscribe(ntopic); MqttSubscribe(ntopic);
disp_subscribed = 1; disp_subscribed = true;
} else { } else {
disp_subscribed = 0; disp_subscribed = false;
} }
} }
@ -948,16 +946,16 @@ bool DisplayCommand(void)
* 5 = Mqtt up and time Mqtt (incl local) sensors and time Mqtt (incl local) sensors and time * 5 = Mqtt up and time Mqtt (incl local) sensors and time Mqtt (incl local) sensors and time
*/ */
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 5)) {
uint8_t last_display_mode = Settings.display_mode; uint32_t last_display_mode = Settings.display_mode;
Settings.display_mode = XdrvMailbox.payload; Settings.display_mode = XdrvMailbox.payload;
if (!disp_subscribed) {
if (disp_subscribed != (Settings.display_mode &0x04)) {
restart_flag = 2; // Restart to Add/Remove MQTT subscribe restart_flag = 2; // Restart to Add/Remove MQTT subscribe
} else { } else {
if (last_display_mode && !Settings.display_mode) { // Switch to mode 0 if (last_display_mode && !Settings.display_mode) { // Switch to mode 0
DisplayInit(DISPLAY_INIT_MODE); DisplayInit(DISPLAY_INIT_MODE);
DisplayClear(); DisplayClear();
} else { } else {
// if (!last_display_mode && Settings.display_mode) { // Switch to non mode 0
DisplayLogBufferInit(); DisplayLogBufferInit();
DisplayInit(DISPLAY_INIT_MODE); DisplayInit(DISPLAY_INIT_MODE);
} }