Skip to content

[Control Station] Fix Booster GUI measurements names #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msanlli merged 2 commits into from
Jun 27, 2025
Merged

[Control Station] Fix Booster GUI measurements names #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f599bc
Added board prefix to measurements
JFisica Jun 27, 2025
d611648
Use bcu master nested state
JFisica Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions control-station/src/components/GuiModules/Module.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ interface CellProps {

const Module: React.FC<{ id: string | number }> = ({ id }) => {
const moduleMinCell = useMeasurementsStore(
(state) => (state.getNumericMeasurementInfo(`module_${id}_min_cell`)?.getUpdate() ?? 0)
(state) => (state.getNumericMeasurementInfo(`HVSCU-Cabinet/module_${id}_min_cell`)?.getUpdate() ?? 0)
);
const moduleMaxCell = useMeasurementsStore(
(state) => (state.getNumericMeasurementInfo(`module_${id}_max_cell`)?.getUpdate() ?? 0)
(state) => (state.getNumericMeasurementInfo(`HVSCU-Cabinet/module_${id}_max_cell`)?.getUpdate() ?? 0)
);

const moduleTotalVoltage = useMeasurementsStore(
(state) => (state.getNumericMeasurementInfo(`module_${id}_voltage`)?.getUpdate() ?? 0)
(state) => (state.getNumericMeasurementInfo(`HVSCU-Cabinet/module_${id}_voltage`)?.getUpdate() ?? 0)
);

// Estado para las celdas
Expand All @@ -28,7 +28,7 @@ const Module: React.FC<{ id: string | number }> = ({ id }) => {
const intervalId = setInterval(() => {
setCellValues(() =>
Array.from({ length: 48 }, (_, i) => {
const variableName = `module_${id}_cell_${i + 1}_voltage`;
const variableName = `HVSCU-Cabinet/module_${id}_cell_${i + 1}_voltage`;
return useMeasurementsStore.getState().getNumericMeasurementInfo(variableName)?.getUpdate() ?? 0;
})
);
Expand Down
10 changes: 5 additions & 5 deletions control-station/src/pages/VehiclePage/GuiBoosterPage/GuiPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ const modules: ModuleData[] = [
export function GuiPage() {
// Medidas
const totalSupercapsVoltageInfo = useMeasurementsStore((state) =>
state.getNumericMeasurementInfo("total_supercaps_voltage")
state.getNumericMeasurementInfo("HVSCU-Cabinet/total_supercaps_voltage")
);
const currentMeasurementInfo = useMeasurementsStore((state) =>
state.getNumericMeasurementInfo("output_current")
state.getNumericMeasurementInfo("HVSCU-Cabinet/output_current")
);
const temperatureMeasurementInfo = useMeasurementsStore((state) =>
state.getNumericMeasurementInfo("temperature_total")
state.getNumericMeasurementInfo("HVSCU-Cabinet/temperature_total")
);

// Enums
const contactorsStateInfo = useMeasurementsStore((state) =>
state.getMeasurement("contactors_state")
state.getMeasurement("HVSCU-Cabinet/contactors_state")
);
const bcuGeneralStateInfo = useMeasurementsStore((state) =>
state.getMeasurement("bcu_general_state")
state.getMeasurement("HVSCU-Cabinet/BCU_state_master_nested")
);

// Estados
Expand Down