jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
fvanroie 2020-11-21 23:41:14 +01:00
parent 7954c1912b
commit c9f7609eed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hasp_gui.cpp
View File

@ -105,8 +105,8 @@ bool guiCheckSleep()
return (guiSleeping != HASP_SLEEP_OFF); return (guiSleeping != HASP_SLEEP_OFF);
} }
/* Experimental Display flushing */ /* After flusing to the file stream or web client, we also send the buffer to the tft */
static void IRAM_ATTR my_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p) static void IRAM_ATTR printscreen_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area, lv_color_t * color_p)
{ {
#if 0 #if 0
size_t len = (area->x2 - area->x1 + 1) * (area->y2 - area->y1 + 1); /* Number of pixels */ size_t len = (area->x2 - area->x1 + 1) * (area->y2 - area->y1 + 1); /* Number of pixels */
@ -130,7 +130,7 @@ static void IRAM_ATTR my_flush_cb(lv_disp_drv_t * disp, const lv_area_t * area,
#endif #endif
/* Tell lvgl that flushing is done */ /* Tell lvgl that flushing is done */
// lv_disp_flush_ready(disp); // lv_disp_flush_ready(disp); ===> moved into the drivers
} }
/* Interrupt driven periodic handler */ /* Interrupt driven periodic handler */
@ -911,7 +911,7 @@ static void gui_screenshot_to_file(lv_disp_drv_t * disp, const lv_area_t * area,
len *= sizeof(lv_color_t); /* Number of bytes */ len *= sizeof(lv_color_t); /* Number of bytes */
size_t res = pFileOut.write((uint8_t *)color_p, len); size_t res = pFileOut.write((uint8_t *)color_p, len);
if(res != len) gui_flush_not_complete(); if(res != len) gui_flush_not_complete();
my_flush_cb(disp, area, color_p); printscreen_flush_cb(disp, area, color_p);
} }
/** Take Screenshot. /** Take Screenshot.
@ -965,7 +965,7 @@ static void gui_screenshot_to_http(lv_disp_drv_t * disp, const lv_area_t * area,
len *= sizeof(lv_color_t); /* Number of bytes */ len *= sizeof(lv_color_t); /* Number of bytes */
size_t res = httpClientWrite((uint8_t *)color_p, len); size_t res = httpClientWrite((uint8_t *)color_p, len);
if(res != len) gui_flush_not_complete(); if(res != len) gui_flush_not_complete();
my_flush_cb(disp, area, color_p); printscreen_flush_cb(disp, area, color_p);
} }
/** Take Screenshot. /** Take Screenshot.

2
src/hasp_mqtt.cpp
View File

@ -486,7 +486,7 @@ void mqttStop()
size_t len; size_t len;
snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstatus"), mqttNodeTopic); snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR("%sstatus"), mqttNodeTopic);
len = snprintf_P(tmp_payload, sizeof(tmp_payload), PSTR("OFF"), mqttNodeTopic); len = snprintf_P(tmp_payload, sizeof(tmp_payload), PSTR("OFF"));
mqttPublish(tmp_topic, tmp_payload, len); mqttPublish(tmp_topic, tmp_payload, len);
mqttClient.disconnect(); mqttClient.disconnect();