machine_rtc.c: Fix the time zone inversion issue.

For example, to set the Eastern Time Zone, please use GMT+8 or UTC+8.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

docs/en/system/time.rst

@@ -100,7 +100,7 @@ Functions
 
     This is inverse function of localtime. It's argument is a full 8-tuple
     which expresses a time as per localtime. It returns an integer which is
-    the number of seconds since Jan 1, 2000.
+    the number of seconds since Jan 1, 1970.
 
     UIFLOW2:
 

m5stack/machine_rtc.c

@@ -208,11 +208,31 @@ static mp_obj_t machine_rtc_timezone(size_t n_args, const mp_obj_t *args) {
         if (tz == NULL) {
             return mp_const_none;
         } else {
+            char *ptr = strchr(tz, '+');
+            if (ptr != NULL) {
+                *ptr = '-';
+            } else {
+                ptr = strchr(tz, '-');
+                if (ptr != NULL) {
+                    *ptr = '+';
+                }
+            }
             return mp_obj_new_str(tz, strlen(tz));
         }
     } else {
-        char tz[64];
-        snprintf(tz, sizeof(tz), "%s", mp_obj_str_get_str(args[1]));
+        char tz[64] = { 0 };
+        snprintf(tz, sizeof(tz), "%s", mp_obj_str_get_str(args[0]));
+
+        char *ptr = strchr(tz, '-');
+        if (ptr != NULL) {
+            *ptr = '+';
+        } else {
+            ptr = strchr(tz, '+');
+            if (ptr != NULL) {
+                *ptr = '-';
+            }
+        }
+
         setenv("TZ", tz, 1);
         tzset();
 

m5stack/patches/0006-modtime-add-timezone-method.patch

@@ -118,7 +118,7 @@ Index: micropython/ports/esp32/modtime.c
      struct timeval tv;
      gettimeofday(&tv, NULL);
      timeutils_struct_time_t tm;
-@@ -56,3 +95,36 @@ static mp_obj_t mp_time_time_get(void) {
+@@ -56,3 +95,46 @@ static mp_obj_t mp_time_time_get(void) {
      gettimeofday(&tv, NULL);
      return mp_obj_new_int(tv.tv_sec);
  }
@@ -129,23 +129,33 @@ Index: micropython/ports/esp32/modtime.c
 +        if (tz == NULL) {
 +            return mp_const_none;
 +        } else {
++            char *ptr = strchr(tz, '+');
++            if (ptr != NULL) {
++                *ptr = '-';
++            } else {
++                ptr = strchr(tz, '-');
++                if (ptr != NULL) {
++                    *ptr = '+';
++                }
++            }
 +            return mp_obj_new_str(tz, strlen(tz));
 +        }
 +    } else {
-+        char tz[64];
++        char tz[64] = { 0 };
 +        snprintf(tz, sizeof(tz), "%s", mp_obj_str_get_str(args[0]));
-+        setenv("TZ", tz, 1);
-+        tzset();
 +
-+        time_t now;
-+        char strftime_buf[64];
-+        struct tm timeinfo;
-+
-+        time(&now);
++        char *ptr = strchr(tz, '-');
++        if (ptr != NULL) {
++            *ptr = '+';
++        } else {
++            ptr = strchr(tz, '+');
++            if (ptr != NULL) {
++                *ptr = '-';
++            }
++        }
 +
-+        localtime_r(&now, &timeinfo);
-+        strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
-+        ESP_LOGE("time", "The current date/time in Shanghai is: %s", strftime_buf);
++        setenv("TZ", tz, 1);
++        tzset();
 +
 +        nvs_write_str_helper(UIFLOW_NVS_NAMESPACE, "tz", tz);
 +        return mp_const_none;