diff --git a/scripts/getcommands.js b/scripts/getcommands.js index fe151eb6a..687389f90 100644 --- a/scripts/getcommands.js +++ b/scripts/getcommands.js @@ -77,18 +77,18 @@ function getFolder(name, cb){ let cmd = { name: mytrim(parts[0]), args: mytrim(parts[1]), - descr: mytrim(parts[3]), + descr: mytrim(""), fn: mytrim(parts[2]), file: file.slice(6), requires:"", examples: "", }; - if (cmd.descr !== 'NULL'){ - console.log('replace "'+cmd.descr+'" with NULL'); - lines[i] = lines[i].replace('"'+cmd.descr+'"', 'NULL'); - modified++; - } + //if (cmd.descr !== 'NULL'){ + // console.log('replace "'+cmd.descr+'" with NULL'); + // lines[i] = lines[i].replace(', NULL, NULL);', ', NULL);'); + // modified++; + //} if (!cmdindex[cmd.name]){ // it did not have a doc line before diff --git a/src/cmnds/cmd_newLEDDriver_colors.c b/src/cmnds/cmd_newLEDDriver_colors.c index 76f273cef..1d5c77a71 100644 --- a/src/cmnds/cmd_newLEDDriver_colors.c +++ b/src/cmnds/cmd_newLEDDriver_colors.c @@ -112,7 +112,7 @@ void LED_SetColorByIndex(int index) { c = g_color[g_curColor]; - sprintf(tmp, "%02X%02X%02X", c[0], c[1], c[2]); + snprintf(tmp, sizeof(tmp), "%02X%02X%02X", c[0], c[1], c[2]); LED_SetBaseColor(0, "led_basecolor_rgb", tmp, 0); if (LED_GetEnableAll() == 0) { diff --git a/src/driver/drv_bl_shared.c b/src/driver/drv_bl_shared.c index 5ff302eb7..ffe7c2f60 100644 --- a/src/driver/drv_bl_shared.c +++ b/src/driver/drv_bl_shared.c @@ -403,11 +403,11 @@ void BL_ProcessUpdate(float voltage, float current, float power) /* 2019-09-07T15:50-04:00 */ if (NTP_GetTimesZoneOfsSeconds()>0) { - sprintf(datetime, "%04i-%02i-%02iT%02i:%02i+%02i:%02i", + snprintf(datetime, sizeof(datetime), "%04i-%02i-%02iT%02i:%02i+%02i:%02i", ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, NTP_GetTimesZoneOfsSeconds()/3600, (NTP_GetTimesZoneOfsSeconds()/60) % 60); } else { - sprintf(datetime, "%04i-%02i-%02iT%02i:%02i-%02i:%02i", + snprintf(datetime, sizeof(datetime), "%04i-%02i-%02iT%02i:%02i-%02i:%02i", ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, abs(NTP_GetTimesZoneOfsSeconds()/3600), (abs(NTP_GetTimesZoneOfsSeconds())/60) % 60); } @@ -441,11 +441,11 @@ void BL_ProcessUpdate(float voltage, float current, float power) ltm = localtime(&ConsumptionResetTime); if (NTP_GetTimesZoneOfsSeconds()>0) { - sprintf(datetime, "%04i-%02i-%02iT%02i:%02i+%02i:%02i", + snprintf(datetime,sizeof(datetime), "%04i-%02i-%02iT%02i:%02i+%02i:%02i", ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, NTP_GetTimesZoneOfsSeconds()/3600, (NTP_GetTimesZoneOfsSeconds()/60) % 60); } else { - sprintf(datetime, "%04i-%02i-%02iT%02i:%02i-%02i:%02i", + snprintf(datetime, sizeof(datetime), "%04i-%02i-%02iT%02i:%02i-%02i:%02i", ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, abs(NTP_GetTimesZoneOfsSeconds()/3600), (abs(NTP_GetTimesZoneOfsSeconds())/60) % 60); } @@ -565,7 +565,7 @@ void BL_ProcessUpdate(float voltage, float current, float power) MQTT_PublishMain_StringFloat(counter_mqttNames[4], dailyStats[0]); stat_updatesSent++; ltm = localtime(&ConsumptionResetTime); - sprintf(datetime, "%04i-%02i-%02i %02i:%02i:%02i", + snprintf(datetime,sizeof(datetime), "%04i-%02i-%02i %02i:%02i:%02i", ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, ltm->tm_sec); MQTT_PublishMain_StringString(counter_mqttNames[5], datetime, 0); stat_updatesSent++; diff --git a/src/httpserver/rest_interface.c b/src/httpserver/rest_interface.c index 310d97ae5..9e0894757 100644 --- a/src/httpserver/rest_interface.c +++ b/src/httpserver/rest_interface.c @@ -918,7 +918,6 @@ static int http_rest_post_pins(http_request_t* request) { os_free(p); os_free(t); return http_rest_error(request, 200, "OK"); - return 0; } static int http_rest_error(http_request_t* request, int code, char* msg) {