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

Switch haspGetVersion to char* instead of String

Browse Source
This commit is contained in:
fvanroie 2020-11-26 20:09:58 +01:00
parent 9e282457ca
commit 99cdf25810
5 changed files with 114 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hasp.cpp
View File

@ -395,6 +395,7 @@ void haspSetup()
} }
if(th) { if(th) {
lv_theme_set_act(th);
Log.trace(TAG_HASP, F("Custom theme loaded")); Log.trace(TAG_HASP, F("Custom theme loaded"));
} else { } else {
Log.error(TAG_HASP, F("No theme could be loaded")); Log.error(TAG_HASP, F("No theme could be loaded"));
@ -495,11 +496,11 @@ void hasp_background(uint16_t pageid, uint16_t imageid)
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
String haspGetVersion() void haspGetVersion(char * version, size_t len)
{ {
char buffer[16]; // char buffer[16];
snprintf_P(buffer, sizeof(buffer), "%u.%u.%u", HASP_VERSION_MAJOR, HASP_VERSION_MINOR, HASP_VERSION_REVISION); snprintf_P(version, len, "%u.%u.%u", HASP_VERSION_MAJOR, HASP_VERSION_MINOR, HASP_VERSION_REVISION);
return buffer; // return buffer;
} }
void haspClearPage(uint16_t pageid) void haspClearPage(uint16_t pageid)

2
src/hasp.h
View File

@ -60,7 +60,7 @@ uint8_t haspGetPage();
void haspClearPage(uint16_t pageid); void haspClearPage(uint16_t pageid);
String haspGetNodename(); String haspGetNodename();
String haspGetVersion(); void haspGetVersion(char* version,size_t len);
void haspBackground(uint16_t pageid, uint16_t imageid); void haspBackground(uint16_t pageid, uint16_t imageid);
void hasp_set_group_objects(uint8_t groupid, uint8_t eventid, lv_obj_t * src_obj); void hasp_set_group_objects(uint8_t groupid, uint8_t eventid, lv_obj_t * src_obj);

6
src/hasp_http.cpp
View File

@ -400,7 +400,11 @@ void webHandleInfo()
/* HASP Stats */ /* HASP Stats */
httpMessage += F("<b>HASP Version: </b>"); httpMessage += F("<b>HASP Version: </b>");
httpMessage += String(haspGetVersion()); {
char version[32];
haspGetVersion(version, sizeof(version));
httpMessage += version;
}
httpMessage += F("<br/><b>Build DateTime: </b>"); httpMessage += F("<br/><b>Build DateTime: </b>");
httpMessage += __DATE__; httpMessage += __DATE__;
httpMessage += F(" "); httpMessage += F(" ");

7
src/hasp_mqtt.cpp
View File

@ -214,9 +214,10 @@ void mqtt_send_statusupdate()
{ {
char buffer[128]; char buffer[128];
snprintf_P(data, sizeof(data), PSTR("{\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), haspGetVersion(buffer, sizeof(buffer));
haspGetVersion().c_str(), long(millis() / 1000)); snprintf_P(data, sizeof(data), PSTR("{\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), buffer,
strcat(buffer, data); long(millis() / 1000));
#if HASP_USE_WIFI > 0 #if HASP_USE_WIFI > 0
#if defined(STM32F4xx) #if defined(STM32F4xx)
IPAddress ip; IPAddress ip;

16
src/hasp_slave.cpp
View File

@ -26,7 +26,6 @@ unsigned long updatLedPeriod = 1000; // timer in msec for tele mqtt send
bool ledstate = false; bool ledstate = false;
void slave_send_state(const __FlashStringHelper * subtopic, const char * payload) void slave_send_state(const __FlashStringHelper * subtopic, const char * payload)
{ {
// page = 0 // page = 0
@ -49,10 +48,12 @@ void slave_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const char * at
{ {
char cBuffer[192]; char cBuffer[192];
memset(cBuffer, 0, sizeof(cBuffer)); memset(cBuffer, 0, sizeof(cBuffer));
snprintf_P(cBuffer, sizeof(cBuffer), PSTR("publish %sstate/json {\"p[%u].b[%u].%s\":\"%s\"}"), slaveNodeTopic, pageid, btnid, attribute, data); snprintf_P(cBuffer, sizeof(cBuffer), PSTR("publish %sstate/json {\"p[%u].b[%u].%s\":\"%s\"}"), slaveNodeTopic,
pageid, btnid, attribute, data);
slave.ExecuteCommand((char *)cBuffer); slave.ExecuteCommand((char *)cBuffer);
// Log after char buffers are cleared // Log after char buffers are cleared
Log.notice(TAG_TASM,F("TAS PUB: %sstate/json = {\"p[%u].b[%u].%s\":\"%s\"}"), slaveNodeTopic, pageid, btnid, attribute, data); Log.notice(TAG_TASM, F("TAS PUB: %sstate/json = {\"p[%u].b[%u].%s\":\"%s\"}"), slaveNodeTopic, pageid, btnid,
attribute, data);
} }
void slave_send_input(uint8_t id, const char * payload) void slave_send_input(uint8_t id, const char * payload)
@ -73,9 +74,11 @@ void TASMO_TELE_JSON()
char data[3 * 128]; char data[3 * 128];
{ {
char buffer[128]; char buffer[128];
snprintf_P(data, sizeof(data), PSTR("{\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), haspGetVersion(buffer, sizeof(buffer));
haspGetVersion().c_str(), long(millis() / 1000));
strcat(buffer, data); snprintf_P(data, sizeof(data), PSTR("{\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), buffer,
long(millis() / 1000));
snprintf_P(buffer, sizeof(buffer), PSTR("\"espCanUpdate\":\"false\",\"page\":%u,\"numPages\":%u,"), snprintf_P(buffer, sizeof(buffer), PSTR("\"espCanUpdate\":\"false\",\"page\":%u,\"numPages\":%u,"),
haspGetPage(), (HASP_NUM_PAGES)); haspGetPage(), (HASP_NUM_PAGES));
strcat(data, buffer); strcat(data, buffer);
@ -159,7 +162,6 @@ void IRAM_ATTR slaveLoop(void)
// updateLedTimer = millis(); // updateLedTimer = millis();
// TASMO_EVERY_SECOND(); // TASMO_EVERY_SECOND();
// } // }
} }
#endif #endif