fixed date/time support for optional format strings

Author: suculent

library.json

@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/suculent/thinx-firmware-esp8266"
   },
-  "version": "2.1.170",
+  "version": "2.1.171",
   "authors": {
     "name": "Matej Sychra",
     "url": "https://thinx.cloud"

library.properties

@@ -1,5 +1,5 @@
 name=THiNX
-version=2.1.170
+version=2.1.171
 author=Matej Sychra
 maintainer=Matej Sychra
 sentence=A library to wrap THiNX device registration, MQTT and ESP8266HttpUpdate/ArduinoOTA

src/THiNXLib.cpp

@@ -814,62 +814,37 @@ long THiNX::epoch() {
 }
 
 String THiNX::time(const char* optional_format) {
-    
-    /*
-     char *format = (const char *)time_format;
-     
-     if (optional_format != NULL) {
-     format = optional_format;
-     }
-     */
-    
-    long stamp = THiNX::epoch();
-    struct tm lt;
-    char res[32];
-    (void) localtime_r(&stamp, &lt);
-    if (strftime(res, sizeof(res), time_format, &lt) == 0) {
-        Serial.println(F("cannot format supplied time into buffer"));
-    }
-    return String(res);
-    
-    /* deprecated
-     unsigned long stamp = THiNX::epoch();
-     unsigned long time_unix = stamp + 3600;
-     String time_representation = String((time_unix % 86400L) / 3600);
-     time_representation += ":";
-     // leading minute zero
-     if ( ((time_unix % 3600) / 60) < 10 ) {
-     time_representation += "0";
-     }
-     time_representation += String((time_unix % 3600) / 60);
-     time_representation += ":";
-     // leading second zero
-     if ( ((time_unix % 3600) % 60) < 10 ) {
-     time_representation += "0";
-     }
-     time_representation += String((time_unix % 3600) % 60);
-     return String(time_representation);
-     */
+
+  char *format = strdup(time_format);
+  if (optional_format != NULL) {
+    format = strdup(optional_format);
+  }
+
+  long stamp = THiNX::epoch();
+  struct tm lt;
+  char res[32];
+  (void) localtime_r(&stamp, &lt);
+  if (strftime(res, sizeof(res), format, &lt) == 0) {
+      Serial.println(F("cannot format supplied time into buffer"));
+  }
+  return String(res);
 }
 
 String THiNX::date(const char* optional_format) {
-    
-    /*
-     char *format = (const char *) date_format;
-     
-     if (optional_format != NULL) {
-     format = (const char *)optional_format;
-     }*/
-    
-    long stamp = THiNX::epoch();
-    
-    struct tm lt;
-    char res[32];
-    (void) localtime_r(&stamp, &lt);
-    if (strftime(res, sizeof(res), date_format, &lt) == 0) {
-        Serial.println(F("cannot format supplied date into buffer"));
-    }
-    return String(res);
+
+  char *format = strdup(date_format);
+  if (optional_format != NULL) {
+    format = strdup(optional_format);
+  }
+
+  long stamp = THiNX::epoch();
+  struct tm lt;
+  char res[32];
+  (void) localtime_r(&stamp, &lt);
+  if (strftime(res, sizeof(res), format, &lt) == 0) {
+      Serial.println(F("cannot format supplied date into buffer"));
+  }
+  return String(res);
 }
 
 /*

src/THiNXLib.h

@@ -9,14 +9,14 @@
 
 // Provides placeholder for THINX_FIRMWARE_VERSION_SHORT
 #ifndef VERSION
-#define VERSION "2.1.169"
+#define VERSION "2.1.171"
 #endif
 
 #ifndef THX_REVISION
 #ifdef THINX_FIRMWARE_VERSION_SHORT
 #define THX_REVISION THINX_FIRMWARE_VERSION_SHORT
 #else
-#define THX_REVISION "169"
+#define THX_REVISION "171"
 #endif
 #endif
 
@@ -202,9 +202,9 @@ class THiNX {
 
     long checkin_timeout;          // next timeout millis()
     long checkin_interval = 3600 * 1000;  // can be set externaly, defaults to 1h
-    
+
     long last_checkin_millis;
-    long last_checkin_timestamp;    
+    long last_checkin_timestamp;
 
     long reboot_timeout;          // next timeout millis()
     long reboot_interval = 86400 * 1000;  // can be set externaly, defaults to 24h

src/thinx.h

@@ -4,11 +4,11 @@
 
 const char * THINX_ALIAS = "unnamed";
 const char * THINX_API_KEY = "0";
-const char * THINX_APP_VERSION = "thinx-lib-esp8266-arduino:2.1.169:2018-03-16";
+const char * THINX_APP_VERSION = "thinx-lib-esp8266-arduino:2.1.171:2018-03-19";
 const char * THINX_CLOUD_URL = "thinx.cloud";
-const char * THINX_COMMIT_ID = "16b6719284cb56c90db02c289c80aa181df0e906";
-const char * THINX_FIRMWARE_VERSION = "thinx-lib-esp8266-arduino:2.1.169";
-const char * THINX_FIRMWARE_VERSION_SHORT = "2.1.169";
+const char * THINX_COMMIT_ID = "0";
+const char * THINX_FIRMWARE_VERSION = "thinx-lib-esp8266-arduino:2.1.171";
+const char * THINX_FIRMWARE_VERSION_SHORT = "2.1.171";
 const char * THINX_MQTT_URL = "thinx.cloud";
 const char * THINX_OWNER = "0";
 const char * THINX_PLATFORM  = "platformio";