Skip to content

Commit 8b47273

Browse files
jziolkowskijziolkowski
authored
More schema updates, CI update (#294)
1 parent a2b070c commit 8b47273

File tree

16 files changed

+487
-50
lines changed

16 files changed

+487
-50
lines changed

‎.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
paths-ignore:
1010
- '.github/**'
1111
- '**.md'
12+
- 'tests/**'
13+
- 'assets/**'
1214

1315
jobs:
1416
Binaries:

‎.github/workflows/release_pypi.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
paths-ignore:
88
- '.github/**'
99
- '**.md'
10+
- 'tests/**'
11+
- 'assets/**'
1012

1113
jobs:
1214
build_wheel_and_release:

‎tdmgr/schemas/status.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ class StatusPTHSchema(StatusBaseModel):
151151

152152
class StatusSTKSchema(StatusBaseModel):
153153
CallChain: List[str]
154-
DEPC: str
155-
EPC: List[str]
154+
DEPC: Optional[str] = None
155+
EPC: Union[str, List[str]]
156156
EXCVADDR: str
157157
Exception: int
158158
Reason: str
@@ -210,6 +210,7 @@ class StateSTSBaseSchema(StatusBaseModel):
210210
UptimeSec: Optional[int] = None
211211
Vcc: Optional[float] = None
212212
White: Optional[int] = None
213+
Width: Optional[int] = None
213214
Wifi: WifiSchema
214215

215216

‎tests/status_parsing/jsonfiles/13.0.0.1/STATUS13.json

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"StatusSHT": {
33
"SHT0": {
4-
"Relay1": 1,
5-
"Relay2": 2,
6-
"Open": 100,
7-
"Close": 100,
84
"50perc": 50,
9-
"Delay": 0,
10-
"Opt": "0001",
115
"Calib": [
126
300,
137
500,
148
700,
159
900,
1610
1000
1711
],
12+
"Close": 100,
13+
"Delay": 0,
1814
"Mode": "1",
15+
"Open": 100,
16+
"Opt": "0001",
17+
"Relay1": 1,
18+
"Relay2": 2,
1919
"TiltConfig": [
2020
0,
2121
0,
@@ -25,21 +25,21 @@
2525
]
2626
},
2727
"SHT1": {
28-
"Relay1": 3,
29-
"Relay2": 4,
30-
"Open": 100,
31-
"Close": 100,
3228
"50perc": 50,
33-
"Delay": 0,
34-
"Opt": "0001",
3529
"Calib": [
3630
300,
3731
500,
3832
700,
3933
900,
4034
1000
4135
],
36+
"Close": 100,
37+
"Delay": 0,
4238
"Mode": "1",
39+
"Open": 100,
40+
"Opt": "0001",
41+
"Relay1": 3,
42+
"Relay2": 4,
4343
"TiltConfig": [
4444
0,
4545
0,
@@ -49,21 +49,21 @@
4949
]
5050
},
5151
"SHT2": {
52-
"Relay1": 5,
53-
"Relay2": 6,
54-
"Open": 100,
55-
"Close": 100,
5652
"50perc": 50,
57-
"Delay": 0,
58-
"Opt": "0001",
5953
"Calib": [
6054
300,
6155
500,
6256
700,
6357
900,
6458
1000
6559
],
60+
"Close": 100,
61+
"Delay": 0,
6662
"Mode": "1",
63+
"Open": 100,
64+
"Opt": "0001",
65+
"Relay1": 5,
66+
"Relay2": 6,
6767
"TiltConfig": [
6868
0,
6969
0,
@@ -73,21 +73,21 @@
7373
]
7474
},
7575
"SHT3": {
76-
"Relay1": 7,
77-
"Relay2": 8,
78-
"Open": 100,
79-
"Close": 100,
8076
"50perc": 50,
81-
"Delay": 0,
82-
"Opt": "0001",
8377
"Calib": [
8478
300,
8579
500,
8680
700,
8781
900,
8882
1000
8983
],
84+
"Close": 100,
85+
"Delay": 0,
9086
"Mode": "1",
87+
"Open": 100,
88+
"Opt": "0001",
89+
"Relay1": 7,
90+
"Relay2": 8,
9191
"TiltConfig": [
9292
0,
9393
0,
@@ -97,21 +97,21 @@
9797
]
9898
},
9999
"SHT4": {
100-
"Relay1": 9,
101-
"Relay2": 10,
102-
"Open": 100,
103-
"Close": 100,
104100
"50perc": 50,
105-
"Delay": 0,
106-
"Opt": "0001",
107101
"Calib": [
108102
300,
109103
500,
110104
700,
111105
900,
112106
1000
113107
],
108+
"Close": 100,
109+
"Delay": 0,
114110
"Mode": "1",
111+
"Open": 100,
112+
"Opt": "0001",
113+
"Relay1": 9,
114+
"Relay2": 10,
115115
"TiltConfig": [
116116
0,
117117
0,
@@ -121,21 +121,21 @@
121121
]
122122
},
123123
"SHT5": {
124-
"Relay1": 11,
125-
"Relay2": 12,
126-
"Open": 100,
127-
"Close": 100,
128124
"50perc": 50,
129-
"Delay": 0,
130-
"Opt": "0001",
131125
"Calib": [
132126
300,
133127
500,
134128
700,
135129
900,
136130
1000
137131
],
132+
"Close": 100,
133+
"Delay": 0,
138134
"Mode": "1",
135+
"Open": 100,
136+
"Opt": "0001",
137+
"Relay1": 11,
138+
"Relay2": 12,
139139
"TiltConfig": [
140140
0,
141141
0,
@@ -145,21 +145,21 @@
145145
]
146146
},
147147
"SHT6": {
148-
"Relay1": 13,
149-
"Relay2": 14,
150-
"Open": 100,
151-
"Close": 100,
152148
"50perc": 50,
153-
"Delay": 0,
154-
"Opt": "0001",
155149
"Calib": [
156150
300,
157151
500,
158152
700,
159153
900,
160154
1000
161155
],
156+
"Close": 100,
157+
"Delay": 0,
162158
"Mode": "1",
159+
"Open": 100,
160+
"Opt": "0001",
161+
"Relay1": 13,
162+
"Relay2": 14,
163163
"TiltConfig": [
164164
0,
165165
0,
@@ -169,21 +169,21 @@
169169
]
170170
},
171171
"SHT7": {
172-
"Relay1": 15,
173-
"Relay2": 16,
174-
"Open": 100,
175-
"Close": 100,
176172
"50perc": 50,
177-
"Delay": 0,
178-
"Opt": "0001",
179173
"Calib": [
180174
300,
181175
500,
182176
700,
183177
900,
184178
1000
185179
],
180+
"Close": 100,
181+
"Delay": 0,
186182
"Mode": "1",
183+
"Open": 100,
184+
"Opt": "0001",
185+
"Relay1": 15,
186+
"Relay2": 16,
187187
"TiltConfig": [
188188
0,
189189
0,

‎tests/status_parsing/jsonfiles/14.1.0.1/STATUS12.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"StatusSTK": {
3+
"CallChain": [
4+
"420c07e6",
5+
"42096a7e",
6+
"42038380",
7+
"4208fd0a",
8+
"40387976",
9+
"4038718c",
10+
"40387108",
11+
"40387f00",
12+
"42052608",
13+
"4201328a",
14+
"42125084",
15+
"4204eea4",
16+
"4204ef1e",
17+
"420131f0",
18+
"4204eeb4",
19+
"4209e6f0",
20+
"42113ac6"
21+
],
22+
"EPC": "400587d2",
23+
"EXCVADDR": "00000003",
24+
"Exception": 5,
25+
"Reason": "Load access fault"
26+
}
27+
}

‎tests/status_parsing/jsonfiles/14.2.0.6/STATUS.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"Status": {
3+
"ButtonRetain": 0,
4+
"ButtonTopic": "0",
5+
"DeviceName": "AthomEM6",
6+
"FriendlyName": [
7+
"AthomEM6"
8+
],
9+
"InfoRetain": 0,
10+
"LedMask": "FFFF",
11+
"LedState": 1,
12+
"Module": 0,
13+
"Power": "0",
14+
"PowerLock": "0",
15+
"PowerOnState": 3,
16+
"PowerRetain": 0,
17+
"SaveData": 1,
18+
"SaveState": 1,
19+
"SensorRetain": 0,
20+
"StateRetain": 0,
21+
"StatusRetain": 0,
22+
"SwitchMode": [
23+
0,
24+
0,
25+
0,
26+
0,
27+
0,
28+
0,
29+
0,
30+
0,
31+
0,
32+
0,
33+
0,
34+
0,
35+
0,
36+
0,
37+
0,
38+
0,
39+
0,
40+
0,
41+
0,
42+
0,
43+
0,
44+
0,
45+
0,
46+
0,
47+
0,
48+
0,
49+
0,
50+
0
51+
],
52+
"SwitchRetain": 0,
53+
"SwitchTopic": "0",
54+
"Topic": "athomem6"
55+
}
56+
}

‎tests/status_parsing/jsonfiles/14.2.0.6/STATUS1.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"StatusPRM": {
3+
"BCResetTime": "2024-09-26T16:17:46",
4+
"Baudrate": 115200,
5+
"BootCount": 36,
6+
"CfgHolder": 4617,
7+
"GroupTopic": "tasmotas",
8+
"OtaUrl": "http://otaserver/ota/tasmota/tasmota32c3-theo.bin",
9+
"RestartReason": "Software reset digital core",
10+
"SaveCount": 81,
11+
"SerialConfig": "8N1",
12+
"Sleep": 50,
13+
"StartupUTC": "2024-09-27T15:55:58",
14+
"Uptime": "0T20:37:07"
15+
}
16+
}

0 commit comments

Comments
 (0)