From 87fca90a6bc67b544eed897fb87c3dc5e5029bf5 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Tue, 4 Mar 2025 15:33:57 +0000 Subject: [PATCH 1/3] Update units to disambiguate in SD log Fixes #707 --- src/provisioning/sdcard/ws_sdcard.cpp | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/provisioning/sdcard/ws_sdcard.cpp b/src/provisioning/sdcard/ws_sdcard.cpp index 0bf7657a7..6526f1004 100644 --- a/src/provisioning/sdcard/ws_sdcard.cpp +++ b/src/provisioning/sdcard/ws_sdcard.cpp @@ -1108,11 +1108,11 @@ const char *SensorTypeToSIUnit(wippersnapper_sensor_SensorType sensorType) { case wippersnapper_sensor_SensorType_SENSOR_TYPE_GYROSCOPE: return "rad/s"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_LIGHT: - return "none"; + return "none (Light)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PRESSURE: return "hPa"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PROXIMITY: - return "none"; + return "none (Prox)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_GRAVITY: return "m/s^2"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_LINEAR_ACCELERATION: @@ -1122,31 +1122,31 @@ const char *SensorTypeToSIUnit(wippersnapper_sensor_SensorType sensorType) { case wippersnapper_sensor_SensorType_SENSOR_TYPE_RELATIVE_HUMIDITY: return "\x25"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE: - return "C"; + return "C (Ambiant)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE: - return "C"; + return "C (Object)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_VOLTAGE: return "V"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_CURRENT: return "mA"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_COLOR: - return "none"; + return "none (Color)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_RAW: - return "none"; + return "none (Raw)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM10_STD: - return "ppm"; + return "ppm (PM1.0 Std)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM25_STD: - return "ppm"; + return "ppm (PM2.5 Std)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM100_STD: - return "ppm"; + return "ppm (PM10.0 Std)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM10_ENV: - return "ppm"; + return "ppm (PM1.0 Env)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM25_ENV: - return "ppm"; + return "ppm (PM2.5 Env)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_PM100_ENV: - return "ppm"; + return "ppm (PM10.0 Env)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_CO2: - return "ppm"; + return "ppm (CO2)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_GAS_RESISTANCE: return "\u03A9"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_ALTITUDE: @@ -1154,19 +1154,19 @@ const char *SensorTypeToSIUnit(wippersnapper_sensor_SensorType sensorType) { case wippersnapper_sensor_SensorType_SENSOR_TYPE_LUX: return "lux"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_ECO2: - return "ppm"; + return "ppm (eCO2)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_UNITLESS_PERCENT: return "\x25"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE_FAHRENHEIT: - return "F"; + return "F (Ambient)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE_FAHRENHEIT: - return "F"; + return "F (Object)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_VOC_INDEX: - return "VOC"; + return "VOC Index"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_NOX_INDEX: - return "NOX"; + return "NOX Index"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_TVOC: - return "ppb"; + return "ppb (TVOC)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_BYTES: return "bytes"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_BOOLEAN: From 9ab4ee646d69507f9809587082e558e8702ff3c7 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 26 Sep 2025 17:11:47 +0100 Subject: [PATCH 2/3] chore(typo): Fix typo in ambient temperature label --- src/provisioning/sdcard/ws_sdcard.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/provisioning/sdcard/ws_sdcard.cpp b/src/provisioning/sdcard/ws_sdcard.cpp index 6526f1004..5503d2ed2 100644 --- a/src/provisioning/sdcard/ws_sdcard.cpp +++ b/src/provisioning/sdcard/ws_sdcard.cpp @@ -1122,7 +1122,7 @@ const char *SensorTypeToSIUnit(wippersnapper_sensor_SensorType sensorType) { case wippersnapper_sensor_SensorType_SENSOR_TYPE_RELATIVE_HUMIDITY: return "\x25"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_AMBIENT_TEMPERATURE: - return "C (Ambiant)"; + return "C (Ambient)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_OBJECT_TEMPERATURE: return "C (Object)"; case wippersnapper_sensor_SensorType_SENSOR_TYPE_VOLTAGE: @@ -1676,4 +1676,4 @@ void ws_sdcard::waitForSerialConfig() { _serialInput.trim(); WS_DEBUG_PRINTLN("[SD] JSON string received!"); } -#endif \ No newline at end of file +#endif From 61ffbfce02e3c3966bedda184d78c80956fe1972 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 26 Sep 2025 19:05:05 +0100 Subject: [PATCH 3/3] Update serial wait messages to include unit qualifier '(Raw)' --- tests/scenarios/offline/test-log-analogin.scenario.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scenarios/offline/test-log-analogin.scenario.yaml b/tests/scenarios/offline/test-log-analogin.scenario.yaml index f5f4844c8..7862e091e 100644 --- a/tests/scenarios/offline/test-log-analogin.scenario.yaml +++ b/tests/scenarios/offline/test-log-analogin.scenario.yaml @@ -11,10 +11,10 @@ steps: - wait-serial: 'Period: 5000.00' - wait-serial: 'Read Mode: 18' - delay: 5s - - wait-serial: '{"timestamp":0,"pin":"A14","value":0,"si_unit":"none"}' + - wait-serial: '{"timestamp":0,"pin":"A14","value":0,"si_unit":"none (Raw)"}' - set-control: part-id: pot1 control: position value: 0.5 - delay: 3s - - wait-serial: '{"timestamp":1,"pin":"A14","value":16384,"si_unit":"none"}' \ No newline at end of file + - wait-serial: '{"timestamp":1,"pin":"A14","value":16384,"si_unit":"none (Raw)"}'