From d961e73806ad8adc42f2c9466ff9e9fb33571add Mon Sep 17 00:00:00 2001 From: ricd99 Date: Sat, 18 Jul 2026 14:37:13 -0700 Subject: [PATCH] localization updates for sunbeam c2 core stages --- .../influxdb_language_localization.toml | 17 +++++++++------- .../localization/language_localization.py | 14 +++++++++++-- .../sunbeamdb_language_localization.toml | 20 ++++++++++++++++--- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/data_tools/localization/influxdb_language_localization.toml b/data_tools/localization/influxdb_language_localization.toml index 307dc36..ad210c0 100644 --- a/data_tools/localization/influxdb_language_localization.toml +++ b/data_tools/localization/influxdb_language_localization.toml @@ -1,19 +1,22 @@ +# CanonicalName = [InfluxDB Signal, Device Name, Units, Frequency] [2024-01-01] # 2024-07-12 – 2024-07-20 VehicleSpeed = ["VehicleVelocity", "MDI", "m/s", 5] -PackVoltage = ["TotalPackVoltage", "BMS", "V", 1] +PackVoltage = ["TotalPackVoltage", "BMS", "V", 1] PackCurrent = ["PackCurrent", "ECU", "A", 5] MotorCurrent = ["BatteryCurrent", "MC", "A", 5] +MotorCurrentDirection = ["BatteryCurrentDirection", "MC", "", 5] AcceleratorPosition = ["AcceleratorPosition", "MC", "", 10] -MinimumModuleVoltage = ["VoltageofLeast", "BMS","V", 1] +MinimumModuleVoltage = ["VoltageofLeast", "BMS","V", 1] MaximumModuleVoltage = ["VoltageofHighest", "BMS", "V", 1] BrakePressed = ["MechBrakePressed", "MCB", "", 10] -MotorCurrentDirection = ["BatteryCurrentDirection", "MC", "", 5] MPPTInputVoltageA = ["VoltSensor1", "AMB", "V", 4] MPPTInputVoltageB = ["VoltSensor2", "AMB", "V", 4] MPPTInputCurrentA = ["CurrentSensor1", "AMB", "A", 4] MPPTInputCurrentB = ["CurrentSensor2", "AMB", "A", 4] +LatitudeRaw = ["GPSLatitude", "TEL", "", 3] +LongitudeRaw = ["GPSLongitude", "TEL", "", 3] [2025-01-01] # 2025-04-01 – 2025-07-23 VehicleSpeed = ["MotorRotatingSpeed", "MC", "km/h", 10] @@ -40,8 +43,8 @@ MPPTInputCurrentA = ["InputCurrentA", "MPPT", "A", 3] MPPTInputCurrentB = ["InputCurrentB", "MPPT", "A", 3] MPPTInputCurrentC = ["InputCurrentC", "MPPT", "A", 3] -GPSLatitude = ["GPSLatitude", "TEL", "", 3] -GPSLongitude = ["GPSLongitude", "TEL", "", 3] +LatitudeRaw = ["GPSLatitude", "TEL", "", 3] +LongitudeRaw = ["GPSLongitude", "TEL", "", 3] Acceleration_X = ["Acceleration_X", "TEL", "", 10] Acceleration_Y = ["Acceleration_Y", "TEL", "", 10] @@ -73,8 +76,8 @@ MPPTInputCurrentA = ["InputCurrentA", "MPPT", "A", 3] MPPTInputCurrentB = ["InputCurrentB", "MPPT", "A", 3] MPPTInputCurrentC = ["InputCurrentC", "MPPT", "A", 3] -GPSLatitude = ["GPSLatitude", "TEL", "", 4] -GPSLongitude = ["GPSLongitude", "TEL", "", 4] +LatitudeRaw = ["GPSLatitude", "TEL", "", 3] +LongitudeRaw = ["GPSLongitude", "TEL", "", 3] Acceleration_X = ["Acceleration_X", "TEL", "", 10] Acceleration_Y = ["Acceleration_Y", "TEL", "", 10] diff --git a/data_tools/localization/language_localization.py b/data_tools/localization/language_localization.py index 5f1cc42..f29c4f1 100644 --- a/data_tools/localization/language_localization.py +++ b/data_tools/localization/language_localization.py @@ -37,8 +37,8 @@ class CanonicalName(StrEnum): MPPTInputCurrentB = "MPPTInputCurrentB" MPPTInputCurrentC = "MPPTInputCurrentC" - GPSLatitude = "GPSLatitude" - GPSLongitude = "GPSLongitude" + LatitudeRaw = "LatitudeRaw" + LongitudeRaw = "LongitudeRaw" Acceleration_X = "Acceleration_X" Acceleration_Y = "Acceleration_Y" @@ -46,3 +46,13 @@ class CanonicalName(StrEnum): MotorPower = "MotorPower" MotorEfficiency = "MotorEfficiency" + + ArrayPower = "ArrayPower" + PackPower = "PackPower" + + IntegratedPackPower = "IntegratedPackPower" + EnergyVOLExtrapolated = "EnergyVOLExtrapolated" + EnergyFromIntegratedPower = "EnergyFromIntegratedPower" + + LatitudeFiltered = "LatitudeFiltered" + LongitudeFiltered = "LongitudeFiltered" diff --git a/data_tools/localization/sunbeamdb_language_localization.toml b/data_tools/localization/sunbeamdb_language_localization.toml index 2564095..511e554 100644 --- a/data_tools/localization/sunbeamdb_language_localization.toml +++ b/data_tools/localization/sunbeamdb_language_localization.toml @@ -1,20 +1,34 @@ +# CanonicalName = [SunbeamDB Signal, stage_name, unit, frequency] [2024-01-01] # 2024-07-12 – 2024-07-20 VehicleSpeed = ["VehicleSpeed", "Ingress", "m/s", 5] PackVoltage = ["PackVoltage", "Ingress", "V", 1] PackCurrent = ["PackCurrent", "Ingress", "A", 5] MotorCurrent = ["MotorCurrent", "Ingress", "A", 5] +MotorCurrentDirection = ["MotorCurrentDirection", "Ingress", "", 5] AcceleratorPosition = ["AcceleratorPosition", "Ingress", "", 10] MinimumModuleVoltage = ["MinimumModuleVoltage", "Ingress","V", 1] MaximumModuleVoltage = ["MaximumModuleVoltage", "Ingress", "V", 1] BrakePressed = ["BrakePressed", "Ingress", "", 10] -MotorCurrentDirection = ["MotorCurrentDirection", "Ingress", "", 5] +MotorEfficiency = ["MotorEfficiency", "Efficiency", "", 1] + MPPTInputVoltageA = ["MPPTInputVoltageA", "Ingress", "V", 4] MPPTInputVoltageB = ["MPPTInputVoltageB", "Ingress", "V", 4] MPPTInputCurrentA = ["MPPTInputCurrentA", "Ingress", "A", 4] MPPTInputCurrentB = ["MPPTInputCurrentB", "Ingress", "A", 4] -MotorPower = ["MotorPower", "Power", "W", 10] -MotorEfficiency = ["MotorEfficiency", "Efficiency", "", 1] +ArrayPower = ["ArrayPower", "Array", "W", 4] +MotorPower = ["MotorPower", "MotorPower", "W", 10] +PackPower = ["PackPower", "PackPower","W", 5] + +IntegratedPackPower = ["IntegratedPackPower", "IntegratedPackPower", "Wh", 5] +EnergyVOLExtrapolated = ["EnergyVOLExtrapolated", "EnergyVOLExtrapolated", "Wh", 10] +EnergyFromIntegratedPower = ["EnergyFromIntegratedPower", "EnergyFromIntegratedPower", "Wh", 5] + +LatitudeRaw = ["LatitudeRaw", "TEL", "", 3] +LongitudeRaw = ["LongitudeRaw", "TEL", "", 3] +LatitudeFiltered = ["LatitudeFiltered", "LatitudeLongitude", "", 3] +LongitudeFiltered = ["LongitudeFiltered", "LatitudeLongitude", "", 3] + #[2025-01-01] # 2025-04-01 – 2025-07-23