Skip to content

Commit 2bd40cf

Browse files
JaciBrunningJaciBrunning
committed
Update grapple-frc-msgs
1 parent 1306b91 commit 2bd40cf

File tree

4 files changed

+189
-183
lines changed

4 files changed

+189
-183
lines changed

‎grapple-hook/schema.json

+167-167
Original file line numberDiff line numberDiff line change
@@ -55,137 +55,6 @@
5555
}
5656
},
5757
"definitions": {
58-
"AdjustableChannelRequest": {
59-
"type": "object",
60-
"required": [
61-
"channel",
62-
"enabled",
63-
"voltage"
64-
],
65-
"properties": {
66-
"channel": {
67-
"type": "integer",
68-
"format": "uint8",
69-
"minimum": 0.0
70-
},
71-
"enabled": {
72-
"type": "boolean"
73-
},
74-
"voltage": {
75-
"type": "integer",
76-
"format": "uint16",
77-
"minimum": 0.0
78-
}
79-
}
80-
},
81-
"ChannelStatus": {
82-
"oneOf": [
83-
{
84-
"type": "object",
85-
"required": [
86-
"data",
87-
"type"
88-
],
89-
"properties": {
90-
"data": {
91-
"type": "object",
92-
"required": [
93-
"current",
94-
"enabled"
95-
],
96-
"properties": {
97-
"current": {
98-
"type": "integer",
99-
"format": "uint16",
100-
"minimum": 0.0
101-
},
102-
"enabled": {
103-
"type": "boolean"
104-
}
105-
}
106-
},
107-
"type": {
108-
"type": "string",
109-
"enum": [
110-
"Switchable"
111-
]
112-
}
113-
}
114-
},
115-
{
116-
"type": "object",
117-
"required": [
118-
"data",
119-
"type"
120-
],
121-
"properties": {
122-
"data": {
123-
"type": "object",
124-
"required": [
125-
"current"
126-
],
127-
"properties": {
128-
"current": {
129-
"type": "integer",
130-
"format": "uint16",
131-
"minimum": 0.0
132-
}
133-
}
134-
},
135-
"type": {
136-
"type": "string",
137-
"enum": [
138-
"NonSwitchable"
139-
]
140-
}
141-
}
142-
},
143-
{
144-
"type": "object",
145-
"required": [
146-
"data",
147-
"type"
148-
],
149-
"properties": {
150-
"data": {
151-
"type": "object",
152-
"required": [
153-
"current",
154-
"enabled",
155-
"voltage",
156-
"voltage_setpoint"
157-
],
158-
"properties": {
159-
"current": {
160-
"type": "integer",
161-
"format": "uint16",
162-
"minimum": 0.0
163-
},
164-
"enabled": {
165-
"type": "boolean"
166-
},
167-
"voltage": {
168-
"type": "integer",
169-
"format": "uint16",
170-
"minimum": 0.0
171-
},
172-
"voltage_setpoint": {
173-
"type": "integer",
174-
"format": "uint16",
175-
"minimum": 0.0
176-
}
177-
}
178-
},
179-
"type": {
180-
"type": "string",
181-
"enum": [
182-
"Adjustable"
183-
]
184-
}
185-
}
186-
}
187-
]
188-
},
18958
"DeviceId": {
19059
"oneOf": [
19160
{
@@ -1157,6 +1026,137 @@
11571026
"TB100ms"
11581027
]
11591028
},
1029+
"MitocandriaAdjustableChannelRequest": {
1030+
"type": "object",
1031+
"required": [
1032+
"channel",
1033+
"enabled",
1034+
"voltage"
1035+
],
1036+
"properties": {
1037+
"channel": {
1038+
"type": "integer",
1039+
"format": "uint8",
1040+
"minimum": 0.0
1041+
},
1042+
"enabled": {
1043+
"type": "boolean"
1044+
},
1045+
"voltage": {
1046+
"type": "integer",
1047+
"format": "uint16",
1048+
"minimum": 0.0
1049+
}
1050+
}
1051+
},
1052+
"MitocandriaChannelStatus": {
1053+
"oneOf": [
1054+
{
1055+
"type": "object",
1056+
"required": [
1057+
"data",
1058+
"type"
1059+
],
1060+
"properties": {
1061+
"data": {
1062+
"type": "object",
1063+
"required": [
1064+
"current",
1065+
"enabled"
1066+
],
1067+
"properties": {
1068+
"current": {
1069+
"type": "integer",
1070+
"format": "uint16",
1071+
"minimum": 0.0
1072+
},
1073+
"enabled": {
1074+
"type": "boolean"
1075+
}
1076+
}
1077+
},
1078+
"type": {
1079+
"type": "string",
1080+
"enum": [
1081+
"Switchable"
1082+
]
1083+
}
1084+
}
1085+
},
1086+
{
1087+
"type": "object",
1088+
"required": [
1089+
"data",
1090+
"type"
1091+
],
1092+
"properties": {
1093+
"data": {
1094+
"type": "object",
1095+
"required": [
1096+
"current"
1097+
],
1098+
"properties": {
1099+
"current": {
1100+
"type": "integer",
1101+
"format": "uint16",
1102+
"minimum": 0.0
1103+
}
1104+
}
1105+
},
1106+
"type": {
1107+
"type": "string",
1108+
"enum": [
1109+
"NonSwitchable"
1110+
]
1111+
}
1112+
}
1113+
},
1114+
{
1115+
"type": "object",
1116+
"required": [
1117+
"data",
1118+
"type"
1119+
],
1120+
"properties": {
1121+
"data": {
1122+
"type": "object",
1123+
"required": [
1124+
"current",
1125+
"enabled",
1126+
"voltage",
1127+
"voltage_setpoint"
1128+
],
1129+
"properties": {
1130+
"current": {
1131+
"type": "integer",
1132+
"format": "uint16",
1133+
"minimum": 0.0
1134+
},
1135+
"enabled": {
1136+
"type": "boolean"
1137+
},
1138+
"voltage": {
1139+
"type": "integer",
1140+
"format": "uint16",
1141+
"minimum": 0.0
1142+
},
1143+
"voltage_setpoint": {
1144+
"type": "integer",
1145+
"format": "uint16",
1146+
"minimum": 0.0
1147+
}
1148+
}
1149+
},
1150+
"type": {
1151+
"type": "string",
1152+
"enum": [
1153+
"Adjustable"
1154+
]
1155+
}
1156+
}
1157+
}
1158+
]
1159+
},
11601160
"MitocandriaRequest": {
11611161
"oneOf": [
11621162
{
@@ -1191,7 +1191,7 @@
11911191
],
11921192
"properties": {
11931193
"channel": {
1194-
"$ref": "#/definitions/SwitchableChannelRequest"
1194+
"$ref": "#/definitions/MitocandriaSwitchableChannelRequest"
11951195
}
11961196
}
11971197
},
@@ -1217,7 +1217,7 @@
12171217
],
12181218
"properties": {
12191219
"channel": {
1220-
"$ref": "#/definitions/AdjustableChannelRequest"
1220+
"$ref": "#/definitions/MitocandriaAdjustableChannelRequest"
12211221
}
12221222
}
12231223
},
@@ -1375,7 +1375,7 @@
13751375
"last_update": {
13761376
"anyOf": [
13771377
{
1378-
"$ref": "#/definitions/StatusFrame"
1378+
"$ref": "#/definitions/MitocandriaStatusFrame"
13791379
},
13801380
{
13811381
"type": "null"
@@ -1384,6 +1384,39 @@
13841384
}
13851385
}
13861386
},
1387+
"MitocandriaStatusFrame": {
1388+
"type": "object",
1389+
"required": [
1390+
"channels"
1391+
],
1392+
"properties": {
1393+
"channels": {
1394+
"type": "array",
1395+
"items": {
1396+
"$ref": "#/definitions/MitocandriaChannelStatus"
1397+
},
1398+
"maxItems": 5,
1399+
"minItems": 5
1400+
}
1401+
}
1402+
},
1403+
"MitocandriaSwitchableChannelRequest": {
1404+
"type": "object",
1405+
"required": [
1406+
"channel",
1407+
"enabled"
1408+
],
1409+
"properties": {
1410+
"channel": {
1411+
"type": "integer",
1412+
"format": "uint8",
1413+
"minimum": 0.0
1414+
},
1415+
"enabled": {
1416+
"type": "boolean"
1417+
}
1418+
}
1419+
},
13871420
"OldVersionDeviceRequest": {
13881421
"oneOf": [
13891422
{
@@ -1705,39 +1738,6 @@
17051738
}
17061739
]
17071740
},
1708-
"StatusFrame": {
1709-
"type": "object",
1710-
"required": [
1711-
"channels"
1712-
],
1713-
"properties": {
1714-
"channels": {
1715-
"type": "array",
1716-
"items": {
1717-
"$ref": "#/definitions/ChannelStatus"
1718-
},
1719-
"maxItems": 5,
1720-
"minItems": 5
1721-
}
1722-
}
1723-
},
1724-
"SwitchableChannelRequest": {
1725-
"type": "object",
1726-
"required": [
1727-
"channel",
1728-
"enabled"
1729-
],
1730-
"properties": {
1731-
"channel": {
1732-
"type": "integer",
1733-
"format": "uint8",
1734-
"minimum": 0.0
1735-
},
1736-
"enabled": {
1737-
"type": "boolean"
1738-
}
1739-
}
1740-
},
17411741
"WrappedDeviceProviderRequest": {
17421742
"oneOf": [
17431743
{

‎grapple-hook/src-tauri/Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)