diff --git a/code/espurna/espurna.ino b/code/espurna/espurna.ino
index e0d9e2f1..73dc44f6 100644
--- a/code/espurna/espurna.ino
+++ b/code/espurna/espurna.ino
@@ -26,138 +26,6 @@ along with this program. If not, see .
// METHODS
// -----------------------------------------------------------------------------
-String getIdentifier() {
- char buffer[20];
- snprintf_P(buffer, sizeof(buffer), PSTR("%s_%06X"), DEVICE, ESP.getChipId());
- return String(buffer);
-}
-
-String buildTime() {
-
- const char time_now[] = __TIME__; // hh:mm:ss
- unsigned int hour = atoi(&time_now[0]);
- unsigned int minute = atoi(&time_now[3]);
- unsigned int second = atoi(&time_now[6]);
-
- const char date_now[] = __DATE__; // Mmm dd yyyy
- const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
- unsigned int month = 0;
- for ( int i = 0; i < 12; i++ ) {
- if (strncmp(date_now, months[i], 3) == 0 ) {
- month = i + 1;
- break;
- }
- }
- unsigned int day = atoi(&date_now[3]);
- unsigned int year = atoi(&date_now[7]);
-
- char buffer[20];
- snprintf_P(
- buffer, sizeof(buffer), PSTR("%04d/%02d/%02d %02d:%02d:%02d"),
- year, month, day, hour, minute, second
- );
-
- return String(buffer);
-
-}
-
-
-unsigned long getUptime() {
-
- static unsigned long last_uptime = 0;
- static unsigned char uptime_overflows = 0;
-
- if (millis() < last_uptime) ++uptime_overflows;
- last_uptime = millis();
- unsigned long uptime_seconds = uptime_overflows * (UPTIME_OVERFLOW / 1000) + (last_uptime / 1000);
-
- return uptime_seconds;
-
-}
-
-void heartbeat() {
-
- unsigned long uptime_seconds = getUptime();
- unsigned int free_heap = ESP.getFreeHeap();
-
- #if NTP_SUPPORT
- DEBUG_MSG_P(PSTR("[MAIN] Time: %s\n"), (char *) ntpDateTime().c_str());
- #endif
-
- if (!mqttConnected()) {
- DEBUG_MSG_P(PSTR("[MAIN] Uptime: %ld seconds\n"), uptime_seconds);
- DEBUG_MSG_P(PSTR("[MAIN] Free heap: %d bytes\n"), free_heap);
- #if ADC_VCC_ENABLED
- DEBUG_MSG_P(PSTR("[MAIN] Power: %d mV\n"), ESP.getVcc());
- #endif
- }
-
-
- #if (HEARTBEAT_REPORT_INTERVAL)
- mqttSend(MQTT_TOPIC_INTERVAL, HEARTBEAT_INTERVAL / 1000);
- #endif
- #if (HEARTBEAT_REPORT_APP)
- mqttSend(MQTT_TOPIC_APP, APP_NAME);
- #endif
- #if (HEARTBEAT_REPORT_VERSION)
- mqttSend(MQTT_TOPIC_VERSION, APP_VERSION);
- #endif
- #if (HEARTBEAT_REPORT_HOSTNAME)
- mqttSend(MQTT_TOPIC_HOSTNAME, getSetting("hostname").c_str());
- #endif
- #if (HEARTBEAT_REPORT_IP)
- mqttSend(MQTT_TOPIC_IP, getIP().c_str());
- #endif
- #if (HEARTBEAT_REPORT_MAC)
- mqttSend(MQTT_TOPIC_MAC, WiFi.macAddress().c_str());
- #endif
- #if (HEARTBEAT_REPORT_RSSI)
- mqttSend(MQTT_TOPIC_RSSI, String(WiFi.RSSI()).c_str());
- #endif
- #if (HEARTBEAT_REPORT_UPTIME)
- mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
- #if INFLUXDB_SUPPORT
- influxDBSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
- #endif
- #endif
- #if (HEARTBEAT_REPORT_FREEHEAP)
- mqttSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
- #if INFLUXDB_SUPPORT
- influxDBSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
- #endif
- #endif
- #if (HEARTBEAT_REPORT_RELAY)
- relayMQTT();
- #endif
- #if (LIGHT_PROVIDER != LIGHT_PROVIDER_NONE) & (HEARTBEAT_REPORT_LIGHT)
- lightMQTT();
- #endif
- #if (HEARTBEAT_REPORT_VCC)
- #if ADC_VCC_ENABLED
- mqttSend(MQTT_TOPIC_VCC, String(ESP.getVcc()).c_str());
- #endif
- #endif
- #if (HEARTBEAT_REPORT_STATUS)
- mqttSend(MQTT_TOPIC_STATUS, MQTT_STATUS_ONLINE, true);
- #endif
-
-}
-
-void customReset(unsigned char status) {
- EEPROM.write(EEPROM_CUSTOM_RESET, status);
- EEPROM.commit();
-}
-
-unsigned char customReset() {
- static unsigned char status = 255;
- if (status == 255) {
- status = EEPROM.read(EEPROM_CUSTOM_RESET);
- if (status > 0) customReset(0);
- if (status > CUSTOM_RESET_MAX) status = 0;
- }
- return status;
-}
-
void hardwareSetup() {
EEPROM.begin(EEPROM_SIZE);
diff --git a/code/espurna/utils.ino b/code/espurna/utils.ino
index 6e41bc12..c8428cb0 100644
--- a/code/espurna/utils.ino
+++ b/code/espurna/utils.ino
@@ -6,6 +6,137 @@ Copyright (C) 2017 by Xose PĂ©rez
*/
+String getIdentifier() {
+ char buffer[20];
+ snprintf_P(buffer, sizeof(buffer), PSTR("%s_%06X"), DEVICE, ESP.getChipId());
+ return String(buffer);
+}
+
+String buildTime() {
+
+ const char time_now[] = __TIME__; // hh:mm:ss
+ unsigned int hour = atoi(&time_now[0]);
+ unsigned int minute = atoi(&time_now[3]);
+ unsigned int second = atoi(&time_now[6]);
+
+ const char date_now[] = __DATE__; // Mmm dd yyyy
+ const char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+ unsigned int month = 0;
+ for ( int i = 0; i < 12; i++ ) {
+ if (strncmp(date_now, months[i], 3) == 0 ) {
+ month = i + 1;
+ break;
+ }
+ }
+ unsigned int day = atoi(&date_now[3]);
+ unsigned int year = atoi(&date_now[7]);
+
+ char buffer[20];
+ snprintf_P(
+ buffer, sizeof(buffer), PSTR("%04d/%02d/%02d %02d:%02d:%02d"),
+ year, month, day, hour, minute, second
+ );
+
+ return String(buffer);
+
+}
+
+
+unsigned long getUptime() {
+
+ static unsigned long last_uptime = 0;
+ static unsigned char uptime_overflows = 0;
+
+ if (millis() < last_uptime) ++uptime_overflows;
+ last_uptime = millis();
+ unsigned long uptime_seconds = uptime_overflows * (UPTIME_OVERFLOW / 1000) + (last_uptime / 1000);
+
+ return uptime_seconds;
+
+}
+
+void heartbeat() {
+
+ unsigned long uptime_seconds = getUptime();
+ unsigned int free_heap = ESP.getFreeHeap();
+
+ #if NTP_SUPPORT
+ DEBUG_MSG_P(PSTR("[MAIN] Time: %s\n"), (char *) ntpDateTime().c_str());
+ #endif
+
+ if (!mqttConnected()) {
+ DEBUG_MSG_P(PSTR("[MAIN] Uptime: %ld seconds\n"), uptime_seconds);
+ DEBUG_MSG_P(PSTR("[MAIN] Free heap: %d bytes\n"), free_heap);
+ #if ADC_VCC_ENABLED
+ DEBUG_MSG_P(PSTR("[MAIN] Power: %d mV\n"), ESP.getVcc());
+ #endif
+ }
+
+ #if (HEARTBEAT_REPORT_INTERVAL)
+ mqttSend(MQTT_TOPIC_INTERVAL, HEARTBEAT_INTERVAL / 1000);
+ #endif
+ #if (HEARTBEAT_REPORT_APP)
+ mqttSend(MQTT_TOPIC_APP, APP_NAME);
+ #endif
+ #if (HEARTBEAT_REPORT_VERSION)
+ mqttSend(MQTT_TOPIC_VERSION, APP_VERSION);
+ #endif
+ #if (HEARTBEAT_REPORT_HOSTNAME)
+ mqttSend(MQTT_TOPIC_HOSTNAME, getSetting("hostname").c_str());
+ #endif
+ #if (HEARTBEAT_REPORT_IP)
+ mqttSend(MQTT_TOPIC_IP, getIP().c_str());
+ #endif
+ #if (HEARTBEAT_REPORT_MAC)
+ mqttSend(MQTT_TOPIC_MAC, WiFi.macAddress().c_str());
+ #endif
+ #if (HEARTBEAT_REPORT_RSSI)
+ mqttSend(MQTT_TOPIC_RSSI, String(WiFi.RSSI()).c_str());
+ #endif
+ #if (HEARTBEAT_REPORT_UPTIME)
+ mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
+ #if INFLUXDB_SUPPORT
+ influxDBSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
+ #endif
+ #endif
+ #if (HEARTBEAT_REPORT_FREEHEAP)
+ mqttSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
+ #if INFLUXDB_SUPPORT
+ influxDBSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
+ #endif
+ #endif
+ #if (HEARTBEAT_REPORT_RELAY)
+ relayMQTT();
+ #endif
+ #if (LIGHT_PROVIDER != LIGHT_PROVIDER_NONE) & (HEARTBEAT_REPORT_LIGHT)
+ lightMQTT();
+ #endif
+ #if (HEARTBEAT_REPORT_VCC)
+ #if ADC_VCC_ENABLED
+ mqttSend(MQTT_TOPIC_VCC, String(ESP.getVcc()).c_str());
+ #endif
+ #endif
+ #if (HEARTBEAT_REPORT_STATUS)
+ mqttSend(MQTT_TOPIC_STATUS, MQTT_STATUS_ONLINE, true);
+ #endif
+
+}
+
+void customReset(unsigned char status) {
+ EEPROM.write(EEPROM_CUSTOM_RESET, status);
+ EEPROM.commit();
+}
+
+unsigned char customReset() {
+ static unsigned char status = 255;
+ if (status == 255) {
+ status = EEPROM.read(EEPROM_CUSTOM_RESET);
+ if (status > 0) customReset(0);
+ if (status > CUSTOM_RESET_MAX) status = 0;
+ }
+ return status;
+}
+
char * ltrim(char * s) {
char *p = s;
while ((unsigned char) *p == ' ') ++p;