Skip to content

Commit e7f6a00

Browse files
jmaralojmaralo
authored
Merge pull request #106 from HyperloopUPV-H8/ethernet-view/lightweight-charts
Light weight charts implemented
2 parents 17339b0 + ca8c7eb commit e7f6a00

31 files changed

Lines changed: 592 additions & 878 deletions

‎common-front/lib/selectors/BMSL.ts‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
BooleanMeasurement,
33
Measurements,
44
NumericMeasurement,
5-
getMeasurementFallback,
5+
useMeasurementsStore
66
} from "..";
77

88
export type BmslMeasurements = {
@@ -39,78 +39,64 @@ export type BmslMeasurements = {
3939
export function selectBmslMeasurements(
4040
measurements: Measurements
4141
): BmslMeasurements {
42+
43+
const getMeasurementFallback = useMeasurementsStore(state => state.getMeasurementFallback);
44+
4245
return {
43-
av_current: getMeasurementFallback(measurements, "BMSL/av_current"),
46+
av_current: getMeasurementFallback("BMSL/av_current"),
4447

45-
low_cell1: getMeasurementFallback(measurements, "BMSL/low_cell1"),
46-
low_cell2: getMeasurementFallback(measurements, "BMSL/low_cell2"),
47-
low_cell3: getMeasurementFallback(measurements, "BMSL/low_cell3"),
48-
low_cell4: getMeasurementFallback(measurements, "BMSL/low_cell4"),
49-
low_cell5: getMeasurementFallback(measurements, "BMSL/low_cell5"),
50-
low_cell6: getMeasurementFallback(measurements, "BMSL/low_cell6"),
48+
low_cell1: getMeasurementFallback("BMSL/low_cell1"),
49+
low_cell2: getMeasurementFallback("BMSL/low_cell2"),
50+
low_cell3: getMeasurementFallback("BMSL/low_cell3"),
51+
low_cell4: getMeasurementFallback("BMSL/low_cell4"),
52+
low_cell5: getMeasurementFallback("BMSL/low_cell5"),
53+
low_cell6: getMeasurementFallback("BMSL/low_cell6"),
5154

52-
low_SOC1: getMeasurementFallback(measurements, "BMSL/low_SOC1"),
53-
low_is_balancing1: getMeasurementFallback(
54-
measurements,
55-
"BMSL/low_is_balancing1"
56-
),
55+
low_SOC1: getMeasurementFallback("BMSL/low_SOC1"),
56+
low_is_balancing1: getMeasurementFallback("BMSL/low_is_balancing1"),
5757
low_maximum_cell: getMeasurementFallback(
58-
measurements,
5958
"BMSL/low_maximum_cell"
6059
),
6160
low_minimum_cell: getMeasurementFallback(
62-
measurements,
6361
"BMSL/low_minimum_cell"
6462
),
6563
low_battery_temperature_1: getMeasurementFallback(
66-
measurements,
6764
"BMSL/low_battery_temperature_1"
6865
),
6966
low_battery_temperature_2: getMeasurementFallback(
70-
measurements,
7167
"BMSL/low_battery_temperature_2"
7268
),
7369
total_voltage_low: getMeasurementFallback(
74-
measurements,
7570
"BMSL/total_voltage_low"
7671
),
7772
input_charging_current: getMeasurementFallback(
78-
measurements,
7973
"BMSL/input_charging_current"
8074
),
8175
output_charging_current: getMeasurementFallback(
82-
measurements,
8376
"BMSL/output_charging_current"
8477
),
8578
input_charging_voltage: getMeasurementFallback(
86-
measurements,
8779
"BMSL/output_charging_current"
8880
),
8981

9082
output_charging_voltage: getMeasurementFallback(
91-
measurements,
9283
"BMSL/output_charging_voltage"
9384
),
9485

9586
pwm_frequency: getMeasurementFallback(
96-
measurements,
9787
"BMSL/pwm_frequency"
9888
),
9989

10090
conditions_ready: getMeasurementFallback(
101-
measurements,
10291
"BMSL/conditions_ready"
10392
),
10493
conditions_want_to_charge: getMeasurementFallback(
105-
measurements,
10694
"BMSL/conditions_want_to_charge"
10795
),
10896
conditions_charging: getMeasurementFallback(
109-
measurements,
11097
"BMSL/conditions_charging"
11198
),
11299
conditions_fault: getMeasurementFallback(
113-
measurements,
114100
"BMSL/conditions_fault"
115101
),
116102
} as BmslMeasurements;

‎common-front/lib/selectors/LCU.ts‎

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
EnumMeasurement,
33
Measurements,
44
NumericMeasurement,
5-
getMeasurementFallback,
5+
useMeasurementsStore
66
} from "..";
77

88
export type LcuMeasurements = {
@@ -72,216 +72,168 @@ export type LcuMeasurements = {
7272
export function selectLcuMeasurements(
7373
measurements: Measurements
7474
): LcuMeasurements {
75+
76+
const getMeasurementFallback = useMeasurementsStore(state => state.getMeasurementFallback);
77+
7578
return {
7679
general_state: getMeasurementFallback(
77-
measurements,
7880
"LCU_MASTER/lcu_master_general_state"
7981
),
8082
specific_state: getMeasurementFallback(
81-
measurements,
8283
"LCU_MASTER/lcu_master_specific_state"
8384
),
8485
slave_general_state: getMeasurementFallback(
85-
measurements,
8686
"LCU_MASTER/lcu_master_slave_general_state"
8787
),
8888
slave_specific_state: getMeasurementFallback(
89-
measurements,
9089
"LCU_MASTER/lcu_master_slave_specific_state"
9190
),
9291

9392
airgap_1: getMeasurementFallback(
94-
measurements,
9593
"LCU_MASTER/lcu_master_airgap_1"
9694
),
9795
airgap_2: getMeasurementFallback(
98-
measurements,
9996
"LCU_MASTER/lcu_master_slave_airgap_2"
10097
),
10198
airgap_3: getMeasurementFallback(
102-
measurements,
10399
"LCU_MASTER/lcu_master_airgap_3"
104100
),
105101
airgap_4: getMeasurementFallback(
106-
measurements,
107102
"LCU_MASTER/lcu_master_slave_airgap_4"
108103
),
109104
slave_airgap_5: getMeasurementFallback(
110-
measurements,
111105
"LCU_MASTER/lcu_master_airgap_5"
112106
),
113107
slave_airgap_6: getMeasurementFallback(
114-
measurements,
115108
"LCU_MASTER/lcu_master_slave_airgap_6"
116109
),
117110
slave_airgap_7: getMeasurementFallback(
118-
measurements,
119111
"LCU_MASTER/lcu_master_airgap_7"
120112
),
121113
slave_airgap_8: getMeasurementFallback(
122-
measurements,
123114
"LCU_MASTER/lcu_master_slave_airgap_8"
124115
),
125116

126117
current_coil_1: getMeasurementFallback(
127-
measurements,
128118
"LCU_MASTER/lcu_master_current_coil_hems_1"
129119
),
130120
current_coil_2: getMeasurementFallback(
131-
measurements,
132121
"LCU_MASTER/lcu_master_current_coil_hems_3"
133122
),
134123
current_coil_3: getMeasurementFallback(
135-
measurements,
136124
"LCU_MASTER/lcu_master_current_coil_ems_1"
137125
),
138126
current_coil_4: getMeasurementFallback(
139-
measurements,
140127
"LCU_MASTER/lcu_master_current_coil_ems_3"
141128
),
142129
slave_current_coil_5: getMeasurementFallback(
143-
measurements,
144130
"LCU_MASTER/lcu_master_slave_current_coil_hems_2"
145131
),
146132
slave_current_coil_6: getMeasurementFallback(
147-
measurements,
148133
"LCU_MASTER/lcu_master_slave_current_coil_hems_4"
149134
),
150135
slave_current_coil_7: getMeasurementFallback(
151-
measurements,
152136
"LCU_MASTER/lcu_master_slave_current_coil_ems_2"
153137
),
154138
slave_current_coil_8: getMeasurementFallback(
155-
measurements,
156139
"LCU_MASTER/lcu_master_slave_current_coil_ems_4"
157140
),
158141

159142
temperature_hems_1: getMeasurementFallback(
160-
measurements,
161143
"LCU_MASTER/lcu_master_temperature_hems_1"
162144
),
163145
temperature_hems_2: getMeasurementFallback(
164-
measurements,
165146
"LCU_MASTER/lcu_master_temperature_hems_2"
166147
),
167148
temperature_hems_3: getMeasurementFallback(
168-
measurements,
169149
"LCU_MASTER/lcu_master_temperature_hems_3"
170150
),
171151
temperature_hems_4: getMeasurementFallback(
172-
measurements,
173152
"LCU_MASTER/lcu_master_temperature_hems_4"
174153
),
175154
temperature_ems_1: getMeasurementFallback(
176-
measurements,
177155
"LCU_MASTER/lcu_master_temperature_ems_1"
178156
),
179157
temperature_ems_2: getMeasurementFallback(
180-
measurements,
181158
"LCU_MASTER/lcu_master_temperature_ems_2"
182159
),
183160
temperature_ems_3: getMeasurementFallback(
184-
measurements,
185161
"LCU_MASTER/lcu_master_temperature_ems_3"
186162
),
187163
temperature_ems_4: getMeasurementFallback(
188-
measurements,
189164
"LCU_MASTER/lcu_master_temperature_ems_4"
190165
),
191166

192167
temperature_lpu_1: getMeasurementFallback(
193-
measurements,
194168
"LCU_MASTER/lcu_master_temperature_lpu_1"
195169
),
196170
temperature_lpu_2: getMeasurementFallback(
197-
measurements,
198171
"LCU_MASTER/lcu_master_temperature_lpu_2"
199172
),
200173
temperature_lpu_3: getMeasurementFallback(
201-
measurements,
202174
"LCU_MASTER/lcu_master_temperature_lpu_3"
203175
),
204176
temperature_lpu_4: getMeasurementFallback(
205-
measurements,
206177
"LCU_MASTER/lcu_master_temperature_lpu_4"
207178
),
208179
slave_temperature_lpu_5: getMeasurementFallback(
209-
measurements,
210180
"LCU_MASTER/lcu_master_slave_temperature_lpu_5"
211181
),
212182
slave_temperature_lpu_6: getMeasurementFallback(
213-
measurements,
214183
"LCU_MASTER/lcu_master_slave_temperature_lpu_6"
215184
),
216185
slave_temperature_lpu_7: getMeasurementFallback(
217-
measurements,
218186
"LCU_MASTER/lcu_master_slave_temperature_lpu_7"
219187
),
220188
slave_temperature_lpu_8: getMeasurementFallback(
221-
measurements,
222189
"LCU_MASTER/lcu_master_slave_temperature_lpu_8"
223190
),
224191

225192
battery_voltage_1: getMeasurementFallback(
226-
measurements,
227193
"LCU_MASTER/lcu_master_battery_voltage_1"
228194
),
229195
battery_voltage_2: getMeasurementFallback(
230-
measurements,
231196
"LCU_MASTER/lcu_master_battery_voltage_2"
232197
),
233198
slave_battery_voltage_3: getMeasurementFallback(
234-
measurements,
235199
"LCU_MASTER/lcu_master_slave_battery_voltage_3"
236200
),
237201
slave_battery_voltage_4: getMeasurementFallback(
238-
measurements,
239202
"LCU_MASTER/lcu_master_slave_battery_voltage_4"
240203
),
241204

242205
reference_current_1: getMeasurementFallback(
243-
measurements,
244206
"LCU_MASTER/lcu_master_reference_current_hems_1"
245207
),
246208
reference_current_2: getMeasurementFallback(
247-
measurements,
248209
"LCU_MASTER/lcu_master_reference_current_hems_2"
249210
),
250211
reference_current_3: getMeasurementFallback(
251-
measurements,
252212
"LCU_MASTER/lcu_master_reference_current_hems_3"
253213
),
254214
reference_current_4: getMeasurementFallback(
255-
measurements,
256215
"LCU_MASTER/lcu_master_reference_current_hems_4"
257216
),
258217
slave_reference_current_5: getMeasurementFallback(
259-
measurements,
260218
"LCU_MASTER/lcu_master_reference_current_ems_1"
261219
),
262220
slave_reference_current_6: getMeasurementFallback(
263-
measurements,
264221
"LCU_MASTER/lcu_master_reference_current_ems_2"
265222
),
266223
slave_reference_current_7: getMeasurementFallback(
267-
measurements,
268224
"LCU_MASTER/lcu_master_reference_current_ems_3"
269225
),
270226
slave_reference_current_8: getMeasurementFallback(
271-
measurements,
272227
"LCU_MASTER/lcu_master_reference_current_ems_4"
273228
),
274229

275230
rot_x: getMeasurementFallback(
276-
measurements,
277231
"LCU_MASTER/lcu_master_rot_x"
278232
),
279233
rot_y: getMeasurementFallback(
280-
measurements,
281234
"LCU_MASTER/lcu_master_rot_y"
282235
),
283236
rot_z: getMeasurementFallback(
284-
measurements,
285237
"LCU_MASTER/lcu_master_rot_z"
286238
),
287239

0 commit comments

Comments
 (0)