Skip to content

Commit debdf1a

Browse files
oganigloganigl
committed
some changes have been done
1 parent 522e5ae commit debdf1a

File tree

7 files changed

+136
-350
lines changed

7 files changed

+136
-350
lines changed

‎boards/BCU/BCU.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"packets.json"
77
],
88
"measurements": [
9-
"order_measurements.json",
10-
"measurements.json"
9+
"BCU_measurements.json"
10+
11+
],
12+
"sockets": [
13+
"sockets.json"
1114
]
1215
}

‎boards/BCU/measurements.json‎

Lines changed: 96 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,79 @@
11
[
22
{
3-
"id": "output_duty_cycle_u",
4-
"name": "Duty Cycle U",
3+
"id": "duty_cycle_u",
4+
"name": "Duty Cycle U (%)",
55
"type": "float32",
66
"podUnits": "%",
7-
"displayUnits": "%"
7+
"displayUnits": "%",
8+
"out_of_range": {
9+
"warning": [
10+
0.0,
11+
100.0
12+
]
13+
}
814
},
915
{
10-
"id": "output_duty_cycle_v",
11-
"name": "Duty Cycle V",
16+
"id": "duty_cycle_v",
17+
"name": "Duty Cycle V (%)",
1218
"type": "float32",
1319
"podUnits": "%",
14-
"displayUnits": "%"
20+
"displayUnits": "%",
21+
"out_of_range": {
22+
"warning": [
23+
0.0,
24+
100.0
25+
]
26+
}
1527
},
1628
{
17-
"id": "output_duty_cycle_w",
18-
"name": "Duty Cycle W",
29+
"id": "duty_cycle_w",
30+
"name": "Duty Cycle W (%)",
1931
"type": "float32",
2032
"podUnits": "%",
21-
"displayUnits": "%"
33+
"displayUnits": "%",
34+
"out_of_range": {
35+
"warning": [
36+
0.0,
37+
100.0
38+
]
39+
}
2240
},
2341
{
24-
"id": "output_commutation_frequency_hz",
25-
"name": "Commutation Frequency",
42+
"id": "modulation_frequency_hz",
43+
"name": "Modulation Frequency (Hz)",
2644
"type": "uint32",
2745
"podUnits": "Hz",
28-
"displayUnits": "Hz"
46+
"displayUnits": "Hz",
47+
"below": {
48+
"warning": 10000
49+
}
2950
},
3051
{
31-
"id": "output_dead_time_ns",
52+
"id": "dead_time_ns",
3253
"name": "Dead Time",
3354
"type": "uint32",
3455
"podUnits": "ns",
35-
"displayUnits": "ns"
56+
"displayUnits": "ns",
57+
"out_of_range":{
58+
"warning": [
59+
0,
60+
100
61+
]
62+
}
3663
},
3764
{
38-
"id": "bcu_general_state",
65+
"id": "Motor_State",
66+
"name": "Motor State",
67+
"type": "enum",
68+
"podUnits": "",
69+
"displayUnits": "",
70+
"enumValues": [
71+
"INACTIVE",
72+
"ACTIVE"
73+
]
74+
},
75+
{
76+
"id": "Bcu_general_state",
3977
"name": "General State",
4078
"type": "enum",
4179
"podUnits": "",
@@ -47,17 +85,17 @@
4785
]
4886
},
4987
{
50-
"id": "control_state",
88+
"id": "Bcu_control_state",
5189
"name": "Control State",
5290
"type": "enum",
5391
"podUnits": "",
5492
"displayUnits": "",
5593
"enumValues": [
5694
"Idle",
5795
"Test_PWM",
58-
"Space Vector",
59-
"Current Control",
60-
"Speed Control"
96+
"Space_Vector",
97+
"Current_Control",
98+
"Speed_Control"
6199
]
62100
},
63101
{
@@ -68,22 +106,22 @@
68106
"displayUnits": "s"
69107
},
70108
{
71-
"id": "output_modulation_index",
72-
"name": "Output Modulation Index",
109+
"id": "conmutation_index",
110+
"name": "Conmutation Index",
73111
"type": "float32",
74112
"podUnits": "",
75113
"displayUnits": ""
76114
},
77115
{
78-
"id": "output_modulation_frequency_hz",
79-
"name": "Output Modulation Frequency",
116+
"id": "commutation_frequency_hz",
117+
"name": "Commutation Modulation Frequency",
80118
"type": "float32",
81119
"podUnits": "Hz",
82120
"displayUnits": "Hz"
83121
},
84122
{
85-
"id": "dc_link_average_voltage",
86-
"name": "DC Link Average Voltage",
123+
"id": "voltage_reference",
124+
"name": "Reference Voltage",
87125
"type": "float32",
88126
"podUnits": "V",
89127
"displayUnits": "V",
@@ -92,9 +130,9 @@
92130
"warning": 446.4
93131
}
94132
},
95-
{
96-
"id": "bcu_bus_voltage",
97-
"name": "Bus Voltage",
133+
{
134+
"id": "voltage_max",
135+
"name": "Max Voltage",
98136
"type": "float32",
99137
"podUnits": "V",
100138
"displayUnits": "V",
@@ -104,6 +142,17 @@
104142
}
105143
},
106144
{
145+
"id": "dc_link_average_voltage",
146+
"name": "DC Link Average Voltage",
147+
"type": "float32",
148+
"podUnits": "V",
149+
"displayUnits": "V",
150+
"below": {
151+
"safe": 400.0,
152+
"warning": 446.4
153+
}
154+
},
155+
{
107156
"id": "dc_link_a_voltage",
108157
"name": "DC Link A Voltage",
109158
"type": "float32",
@@ -247,106 +296,70 @@
247296
"name": "Position Speetec 1",
248297
"type": "float64",
249298
"podUnits": "m",
250-
"displayUnits": "m",
251-
"below": {
252-
"safe": 3.0,
253-
"warning": 4.0
254-
}
299+
"displayUnits": "m"
255300
},
256301
{
257302
"id": "speed_speetec_1",
258303
"name": "Speed Speetec 1",
259304
"type": "float64",
260305
"podUnits": "m/s",
261-
"displayUnits": "m/s",
262-
"below": {
263-
"safe": 10.0
264-
}
306+
"displayUnits": "m/s"
265307
},
266308
{
267309
"id": "acceleration_speetec_1",
268310
"name": "Acceleration Speetec 1",
269311
"type": "float64",
270-
"podUnits": "m/s^2",
271-
"displayUnits": "m/s^2",
272-
"below": {
273-
"safe": 30.0
274-
}
312+
"podUnits": "m/ss",
313+
"displayUnits": "m/ss"
275314
},
276315
{
277316
"id": "direction_speetec_1",
278317
"name": "Direction Speetec 1",
279-
"type": "bool"
280-
},
281-
{
282-
"id": "position_speetec_2",
283-
"name": "Position Speetec 2",
284-
"type": "float64",
285-
"podUnits": "m",
286-
"displayUnits": "m"
287-
},
288-
{
289-
"id": "speed_speetec_2",
290-
"name": "Speed Speetec 2",
291-
"type": "float64",
292-
"podUnits": "m/s",
293-
"displayUnits": "m/s"
294-
},
295-
{
296-
"id": "acceleration_speetec_2",
297-
"name": "Acceleration Speetec 2",
298-
"type": "float64",
299-
"podUnits": "m/s^2",
300-
"displayUnits": "m/s^2"
301-
},
302-
{
303-
"id": "direction_speetec_2",
304-
"name": "Direction Speetec 2",
305318
"type": "enum",
306-
"enumValues": [
307-
"Forward",
308-
"Backward"
319+
"enumValues":[
320+
"BACKWARD",
321+
"FORWARD"
309322
]
310323
},
311324
{
312325
"id": "d_current_reference",
313326
"name": "D Current Reference",
314-
"type": "float64",
327+
"type": "float32",
315328
"podUnits": "A",
316329
"displayUnits": "A"
317330
},
318331
{
319332
"id": "measured_d_current",
320333
"name": "Measured D Current",
321-
"type": "float64",
334+
"type": "float32",
322335
"podUnits": "A",
323336
"displayUnits": "A"
324337
},
325338
{
326339
"id": "d_current_error",
327340
"name": "D Current Error",
328-
"type": "float64",
341+
"type": "float32",
329342
"podUnits": "A",
330343
"displayUnits": "A"
331344
},
332345
{
333346
"id": "q_current_reference",
334347
"name": "Q Current Reference",
335-
"type": "float64",
348+
"type": "float32",
336349
"podUnits": "A",
337350
"displayUnits": "A"
338351
},
339352
{
340353
"id": "measured_q_current",
341354
"name": "Measured Q Current",
342-
"type": "float64",
355+
"type": "float32",
343356
"podUnits": "A",
344357
"displayUnits": "A"
345358
},
346359
{
347360
"id": "q_current_error",
348361
"name": "Q Current Error",
349-
"type": "float64",
362+
"type": "float32",
350363
"podUnits": "",
351364
"displayUnits": ""
352365
},
@@ -372,30 +385,16 @@
372385
"displayUnits": ""
373386
},
374387
{
375-
"id": "target_u_voltage",
376-
"name": "Target U Voltage",
377-
"type": "float64",
378-
"podUnits": "V",
379-
"displayUnits": "V"
380-
},
381-
{
382-
"id": "target_v_voltage",
383-
"name": "Target V Voltage",
384-
"type": "float64",
385-
"podUnits": "V",
386-
"displayUnits": "V"
387-
},
388-
{
389-
"id": "target_w_voltage",
390-
"name": "Target W Voltage",
391-
"type": "float64",
392-
"podUnits": "V",
393-
"displayUnits": "V"
388+
"id": "angle_offset",
389+
"name": "Angle offset",
390+
"type": "float32",
391+
"podUnits": "rad",
392+
"displayUnits": "rad"
394393
},
395394
{
396395
"id": "electrical_angle",
397396
"name": "Electrical Angle",
398-
"type": "float64",
397+
"type": "float32",
399398
"podUnits": "rad",
400399
"displayUnits": "rad"
401400
},
@@ -405,12 +404,5 @@
405404
"type": "float32",
406405
"podUnits": "m/s",
407406
"displayUnits": "m/s"
408-
},
409-
{
410-
"id": "angle_offset",
411-
"name": "Angle offset",
412-
"type": "float32",
413-
"podUnits": "rad",
414-
"displayUnits": "rad"
415407
}
416408
]

0 commit comments

Comments
 (0)