Skip to content

Commit f83b6ad

Browse files
committed
let see what fucking marivel is going to say
1 parent bef832d commit f83b6ad

3 files changed

Lines changed: 47 additions & 25 deletions

File tree

boards/BCU/measurements.json

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
3-
"id": "duty_cycle_u",
4-
"name": "Duty Cycle U (%)",
3+
"id": "duty_cycle_U",
4+
"name": "Duty Cycle u (%)",
55
"type": "float32",
66
"podUnits": "%",
77
"displayUnits": "%",
@@ -214,8 +214,8 @@
214214
}
215215
},
216216
{
217-
"id": "current_u_motor_a",
218-
"name": "Current U Motor A",
217+
"id": "current_u_inverter_a",
218+
"name": "Current U Inverter A",
219219
"type": "float32",
220220
"podUnits": "A",
221221
"displayUnits": "A",
@@ -227,8 +227,8 @@
227227
}
228228
},
229229
{
230-
"id": "current_v_motor_a",
231-
"name": "Current V Motor A",
230+
"id": "current_v_inverter_a",
231+
"name": "Current V Inverter A",
232232
"type": "float32",
233233
"podUnits": "A",
234234
"displayUnits": "A",
@@ -240,8 +240,8 @@
240240
}
241241
},
242242
{
243-
"id": "current_w_motor_a",
244-
"name": "Current W Motor A",
243+
"id": "current_w_inverter_a",
244+
"name": "Current W Inverter A",
245245
"type": "float32",
246246
"podUnits": "A",
247247
"displayUnits": "A",
@@ -253,8 +253,8 @@
253253
}
254254
},
255255
{
256-
"id": "current_u_motor_b",
257-
"name": "Current U Motor B",
256+
"id": "current_u_inverter_b",
257+
"name": "Current U Inverter B",
258258
"type": "float32",
259259
"podUnits": "A",
260260
"displayUnits": "A",
@@ -266,8 +266,8 @@
266266
}
267267
},
268268
{
269-
"id": "current_v_motor_b",
270-
"name": "Current V Motor B",
269+
"id": "current_v_inverter_b",
270+
"name": "Current V Inverter B",
271271
"type": "float32",
272272
"podUnits": "A",
273273
"displayUnits": "A",
@@ -279,8 +279,8 @@
279279
}
280280
},
281281
{
282-
"id": "current_w_motor_b",
283-
"name": "Current W Motor B",
282+
"id": "current_w_inverter_b",
283+
"name": "Current W Inverter B",
284284
"type": "float32",
285285
"podUnits": "A",
286286
"displayUnits": "A",
@@ -385,15 +385,37 @@
385385
"displayUnits": ""
386386
},
387387
{
388-
"id": "angle_offset",
389-
"name": "Angle offset",
388+
"id": "electrical_angle",
389+
"name": "Electrical Angle",
390390
"type": "float32",
391391
"podUnits": "rad",
392392
"displayUnits": "rad"
393393
},
394394
{
395-
"id": "electrical_angle",
396-
"name": "Electrical Angle",
395+
"id": "target_u_voltage",
396+
"name": "Target Voltage",
397+
"type": "float32",
398+
"podUnits": "V",
399+
"displayUnits": "V"
400+
},
401+
{
402+
"id": "target_u_voltage",
403+
"name": "Target Voltage",
404+
"type": "float32",
405+
"podUnits": "V",
406+
"displayUnits": "V"
407+
},
408+
{
409+
"id": "target_w_voltage",
410+
"name": "Target Voltage",
411+
"type": "float32",
412+
"podUnits": "V",
413+
"displayUnits": "V"
414+
},
415+
416+
{
417+
"id": "angle_offset",
418+
"name": "Angle offset",
397419
"type": "float32",
398420
"podUnits": "rad",
399421
"displayUnits": "rad"

boards/BCU/orders.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"name": "Start Space Vector",
3131
"variables": [
3232
"modulation_frequency_hz",
33-
"conmutation_frequency_hz",
33+
"commutation_frequency_hz",
3434
"voltage_reference",
3535
"voltage_max"
3636
]
@@ -49,7 +49,7 @@
4949
"type": "order",
5050
"name": "Start Speed Control",
5151
"variables": [
52-
"requested_linear_speed"
52+
"target_linear_speed"
5353
]
5454
},
5555
{

boards/BCU/packets.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@
8181
"q_current_reference",
8282
"measured_q_current",
8383
"q_current_error",
84-
"target_u_voltage",
85-
"target_v_voltage",
86-
"target_w_voltage",
8784
"electrical_angle",
8885
"pi_id_output",
8986
"pi_iq_output",
90-
"angle_offset"
87+
"angle_offset",
88+
"target_u_voltage",
89+
"target_v_voltage",
90+
"target_w_voltage"
9191
]
9292
},
9393
{
9494
"id": 1707,
9595
"type": "data",
9696
"name": "Speed Control",
9797
"variables": [
98-
"requested_linear_speed",
98+
"target_linear_speed",
9999
"speed_speetec_1"
100100
]
101101
}

0 commit comments

Comments
 (0)