add and reformat

jziolkowski · Sep 15, 2024 · 8c511fe · 8c511fe
1 parent 7b97bf2
commit 8c511fe
Show file tree

Hide file tree

Showing 36 changed files with 356 additions and 184 deletions.
diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS.json
@@ -1,19 +1,23 @@
 {
   "Status": {
-    "Module": 6,
+    "ButtonRetain": 0,
+    "ButtonTopic": "0",
     "DeviceName": "Tasmota",
     "FriendlyName": [
       "Tasmota"
     ],
-    "Topic": "tasmota_1A704F",
-    "ButtonTopic": "0",
+    "InfoRetain": 0,
+    "LedMask": "FFFF",
+    "LedState": 1,
+    "Module": 6,
     "Power": 1,
     "PowerOnState": 3,
-    "LedState": 1,
-    "LedMask": "FFFF",
+    "PowerRetain": 0,
     "SaveData": 1,
     "SaveState": 1,
-    "SwitchTopic": "0",
+    "SensorRetain": 0,
+    "StateRetain": 0,
+    "StatusRetain": 0,
     "SwitchMode": [
       0,
       0,
@@ -24,12 +28,8 @@
       0,
       0
     ],
-    "ButtonRetain": 0,
     "SwitchRetain": 0,
-    "SensorRetain": 0,
-    "PowerRetain": 0,
-    "InfoRetain": 0,
-    "StateRetain": 0,
-    "StatusRetain": 0
+    "SwitchTopic": "0",
+    "Topic": "tasmota_1A704F"
   }
 }
diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS1.json
@@ -1,17 +1,17 @@
 {
   "StatusPRM": {
+    "BCResetTime": "2022-11-05T18:47:52",
     "Baudrate": 115200,
-    "SerialConfig": "8N1",
+    "BootCount": 12,
+    "CfgHolder": 4617,
     "GroupTopic": "tasmotas",
     "OtaUrl": "http://ota.tasmota.com/tasmota/release/tasmota.bin.gz",
     "RestartReason": "Power On",
-    "Uptime": "94T04:19:39",
-    "StartupUTC": "2023-10-09T15:15:19",
-    "Sleep": 50,
-    "CfgHolder": 4617,
-    "BootCount": 12,
-    "BCResetTime": "2022-11-05T18:47:52",
+    "SaveAddress": "FB000",
     "SaveCount": 896,
-    "SaveAddress": "FB000"
+    "SerialConfig": "8N1",
+    "Sleep": 50,
+    "StartupUTC": "2023-10-09T15:15:19",
+    "Uptime": "94T04:19:39"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json b/tests/status_parsing/jsonfiles/12.2.0.2/STATUS2.json
@@ -1,12 +1,12 @@
 {
   "StatusFWR": {
-    "Version": "12.2.0.2(tasmota)",
-    "BuildDateTime": "2022-11-03T16:54:39",
     "Boot": 31,
+    "BuildDateTime": "2022-11-03T16:54:39",
+    "CR": "369/699",
     "Core": "2_7_4_9",
-    "SDK": "2.2.2-dev(38a443e)",
     "CpuFrequency": 80,
     "Hardware": "ESP8266EX",
-    "CR": "369/699"
+    "SDK": "2.2.2-dev(38a443e)",
+    "Version": "12.2.0.2(tasmota)"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.1.json
@@ -1,27 +1,27 @@
 {
   "StatusNET": {
-    "Hostname": "tasmota-68FF94-8084",
-    "IPAddress": "0.0.0.0",
-    "Gateway": "192.168.7.1",
-    "Subnetmask": "255.255.255.0",
     "DNSServer1": "192.168.7.1",
     "DNSServer2": "0.0.0.0",
-    "Mac": "34:98:7A:68:FF:94",
-    "IP6Global": "",
-    "IP6Local": "",
     "Ethernet": {
-      "Hostname": "tasmota-68FF94-8084eth",
-      "IPAddress": "192.168.7.187",
-      "Gateway": "192.168.7.1",
-      "Subnetmask": "255.255.255.0",
       "DNSServer1": "192.168.7.1",
       "DNSServer2": "0.0.0.0",
-      "Mac": "34:98:7A:68:FF:97",
+      "Gateway": "192.168.7.1",
+      "Hostname": "tasmota-68FF94-8084eth",
       "IP6Global": "",
-      "IP6Local": "fe80::3698:7aff:fe68:ff97%en1"
+      "IP6Local": "fe80::3698:7aff:fe68:ff97%en1",
+      "IPAddress": "192.168.7.187",
+      "Mac": "34:98:7A:68:FF:97",
+      "Subnetmask": "255.255.255.0"
     },
-    "Webserver": 2,
+    "Gateway": "192.168.7.1",
     "HTTP_API": 1,
+    "Hostname": "tasmota-68FF94-8084",
+    "IP6Global": "",
+    "IP6Local": "",
+    "IPAddress": "0.0.0.0",
+    "Mac": "34:98:7A:68:FF:94",
+    "Subnetmask": "255.255.255.0",
+    "Webserver": 2,
     "WifiConfig": 0,
     "WifiPower": 17.0
   }

diff --git a/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json b/tests/status_parsing/jsonfiles/14.2.0.4/STATUS5.json
@@ -1,27 +1,27 @@
 {
   "StatusNET": {
-    "Hostname": "xxxxxxxx",
-    "IPAddress": "192.168.0.1",
-    "Gateway": "192.168.0.99",
-    "Subnetmask": "255.255.254.0",
     "DNSServer1": "192.168.0.99",
     "DNSServer2": "0.0.0.0",
-    "Mac": "xx:xx:xx:xx:xx:xx",
-    "IP6Global": "xxxx:::::::xxxx",
-    "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%st3",
     "Ethernet": {
-      "Hostname": "xxxxxxxx-eth",
-      "IPAddress": "192.168.0.2",
-      "Gateway": "192.168.0.99",
-      "Subnetmask": "255.255.254.0",
       "DNSServer1": "192.168.0.99",
       "DNSServer2": "0.0.0.0",
-      "Mac": "xx:xx:xx:xx:xx:xx",
+      "Gateway": "192.168.0.99",
+      "Hostname": "xxxxxxxx-eth",
       "IP6Global": "xxxx:::::::xxxx",
-      "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%en1"
+      "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%en1",
+      "IPAddress": "192.168.0.2",
+      "Mac": "xx:xx:xx:xx:xx:xx",
+      "Subnetmask": "255.255.254.0"
     },
-    "Webserver": 2,
+    "Gateway": "192.168.0.99",
     "HTTP_API": 1,
+    "Hostname": "xxxxxxxx",
+    "IP6Global": "xxxx:::::::xxxx",
+    "IP6Local": "fe80::xxxx:xxxx:xxxx:xxxx%st3",
+    "IPAddress": "192.168.0.1",
+    "Mac": "xx:xx:xx:xx:xx:xx",
+    "Subnetmask": "255.255.254.0",
+    "Webserver": 2,
     "WifiConfig": 4,
     "WifiPower": 0.0
   }

diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATE.json
@@ -1,13 +1,13 @@
 {
+  "POWER1": "OFF",
   "Time": "2024-01-12T06:29:01",
   "Uptime": "2T05:25:48",
   "Vcc": 3.258,
-  "POWER1": "OFF",
   "Wifi": {
     "AP": 1,
-    "SSId": "xxx",
     "BSSId": "F0:9F:C2:03:CD:73",
     "Channel": 6,
-    "RSSI": 100
+    "RSSI": 100,
+    "SSId": "xxx"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS.json
@@ -1,17 +1,18 @@
 {
   "Status": {
-    "Module": 1,
+    "ButtonRetain": 0,
+    "ButtonTopic": "0",
     "FriendlyName": [
       "Sonoff_1"
     ],
-    "Topic": "sonoff_1",
-    "ButtonTopic": "0",
+    "LedState": 1,
+    "Module": 1,
     "Power": 1,
     "PowerOnState": 3,
-    "LedState": 1,
+    "PowerRetain": 0,
     "SaveData": 1,
     "SaveState": 1,
-    "SwitchTopic": "0",
+    "SensorRetain": 0,
     "SwitchMode": [
       0,
       0,
@@ -22,9 +23,8 @@
       0,
       0
     ],
-    "ButtonRetain": 0,
     "SwitchRetain": 0,
-    "SensorRetain": 0,
-    "PowerRetain": 0
+    "SwitchTopic": "0",
+    "Topic": "sonoff_1"
   }
 }
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS1.json
@@ -1,14 +1,14 @@
 {
   "StatusPRM": {
     "Baudrate": 115200,
+    "BootCount": 420,
     "GroupTopic": "sonoffs",
     "OtaUrl": "http://sonoff.maddox.co.uk/tasmota/sonoff.ino.bin",
     "RestartReason": "Hardware Watchdog",
-    "Uptime": "1T19:36:45",
-    "StartupUTC": "2024-01-10T00:03:13",
-    "Sleep": 0,
-    "BootCount": 420,
+    "SaveAddress": "F6000",
     "SaveCount": 10693,
-    "SaveAddress": "F6000"
+    "Sleep": 0,
+    "StartupUTC": "2024-01-10T00:03:13",
+    "Uptime": "1T19:36:45"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS10.json
@@ -1,10 +1,10 @@
 {
   "StatusSNS": {
-    "Time": "2024-01-11T20:39:58",
     "AM2301": {
-      "Temperature": 23.9,
-      "Humidity": 24.4
+      "Humidity": 24.4,
+      "Temperature": 23.9
     },
-    "TempUnit": "C"
+    "TempUnit": "C",
+    "Time": "2024-01-11T20:39:58"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS11.json
@@ -1,15 +1,15 @@
 {
   "StatusSTS": {
+    "POWER1": "ON",
     "Time": "2024-01-11T20:39:58",
     "Uptime": "1T19:36:45",
     "Vcc": 3.231,
-    "POWER1": "ON",
     "Wifi": {
       "AP": 1,
-      "SSId": "xxx",
       "BSSId": "F0:9F:C2:03:CD:73",
       "Channel": 6,
-      "RSSI": 100
+      "RSSI": 100,
+      "SSId": "xxx"
     }
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS2.json
@@ -1,9 +1,9 @@
 {
   "StatusFWR": {
-    "Version": "6.3.0.12(sonoff)",
-    "BuildDateTime": "2018-11-23T14:07:50",
     "Boot": 4,
+    "BuildDateTime": "2018-11-23T14:07:50",
     "Core": "2_3_0",
-    "SDK": "1.5.3(aec24ac9)"
+    "SDK": "1.5.3(aec24ac9)",
+    "Version": "6.3.0.12(sonoff)"
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS3.json
@@ -1,19 +1,19 @@
 {
   "StatusLOG": {
-    "SerialLog": 2,
-    "WebLog": 2,
-    "SysLog": 0,
     "LogHost": "192.168.0.130",
     "LogPort": 514,
     "SSId": [
       "xxx",
       "xxx-2"
     ],
-    "TelePeriod": 300,
+    "SerialLog": 2,
     "SetOption": [
       "54000009",
       "55818000",
       "00000001"
-    ]
+    ],
+    "SysLog": 0,
+    "TelePeriod": 300,
+    "WebLog": 2
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS4.json
@@ -1,18 +1,18 @@
 {
   "StatusMEM": {
-    "ProgramSize": 498,
-    "Free": 504,
-    "Heap": 18,
-    "ProgramFlashSize": 1024,
-    "FlashSize": 1024,
-    "FlashChipId": "1440E0",
-    "FlashMode": 3,
     "Features": [
       "00000809",
       "0FDAE794",
       "240383A0",
       "23B617CE",
       "00003BC0"
-    ]
+    ],
+    "FlashChipId": "1440E0",
+    "FlashMode": 3,
+    "FlashSize": 1024,
+    "Free": 504,
+    "Heap": 18,
+    "ProgramFlashSize": 1024,
+    "ProgramSize": 498
   }
-}
+}
diff --git a/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json b/tests/status_parsing/jsonfiles/6.3.0.12/STATUS5.json
@@ -1,12 +1,12 @@
 {
   "StatusNET": {
+    "DNSServer": "192.168.1.130",
+    "Gateway": "192.168.1.1",
     "Hostname": "sonoff_1-3937",
     "IPAddress": "192.168.1.200",
-    "Gateway": "192.168.1.1",
-    "Subnetmask": "255.255.255.0",
-    "DNSServer": "192.168.1.130",
     "Mac": "5C:CF:7F:E7:4F:61",
+    "Subnetmask": "255.255.255.0",
     "Webserver": 2,
     "WifiConfig": 3
   }
-}
+}