Merge pull request #11 from teeks99/iso-time

Test of time formatted in ISO standard
teeks99 · Jan 1, 2024 · f0ec36e · f0ec36e
2 parents 10be3fc + c3c644a
commit f0ec36e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Upcoming
 --------
 
+*   Using ISO8601 for the default timestamp format. For existing functionality change the `timestamp_fmt` option to
+    `human`. 
 
 1.1
 ---

diff --git a/skins/JSON/current_minimal.json.tmpl b/skins/JSON/current_minimal.json.tmpl
@@ -9,7 +9,11 @@
     },
     "generation":
     {
+        #if $Extras.timestamp_fmt is "human"
         "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")",
+        #else
+        "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")",
+        #end if
         "generator": "weewx $station.version"
     },
     "current":

diff --git a/skins/JSON/skin.conf b/skins/JSON/skin.conf
@@ -1,3 +1,10 @@
+[Extras]
+    #  Format of the timestamp, defaults to ISO, also supports `human`
+    # Defined by python's datetime module https://docs.python.org/3/library/datetime.html
+    # iso   - %Y-%m-%dT%H:%M:%S%z
+    # human - %a, %d %b %Y %H:%M:%S %Z
+    timestamp_fmt = iso
+
 [CheetahGenerator]
     # This section is used by the generator CheetahGenerator, and specifies
     # which files are to be generated from which template.

diff --git a/skins/JSON/weewx.json.tmpl b/skins/JSON/weewx.json.tmpl
@@ -9,7 +9,11 @@
     },
     "generation":
     {
+        #if $Extras.timestamp_fmt is "human"
         "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")",
+        #else
+        "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")",
+        #end if
         "generator": "weewx $station.version"
     },
     "current":