[fix]: I2C not setting which_value type per event

Author: tyeth

src/components/i2c/model.cpp

@@ -221,14 +221,7 @@ GetValueFromSensorsEventOrientation(wippersnapper_sensor_SensorType sensor_type,
 */
 bool GetValueFromSensorsEventBoolean(
     wippersnapper_sensor_SensorType sensor_type, sensors_event_t *event) {
-  bool value = false;
-  WS_DEBUG_PRINTLN("[i2c] Getting boolean event value...");
-  WS_DEBUG_PRINT("[i2c] Event data[0]: ");
-  WS_DEBUG_PRINTLN(event->data[0]);
-  value = event->data[0] > 0.0f;
-  WS_DEBUG_PRINT("[i2c] Boolean value (x>0): ");
-  WS_DEBUG_PRINTLN(value);
-  return value;
+  return event->data[0] > 0.0f;
 }
 
 /*!
@@ -477,6 +470,9 @@ bool I2cModel::AddI2cDeviceSensorEvent(
     _msg_i2c_device_event
         .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
         .value.vector_value.z = value_vect.z;
+    _msg_i2c_device_event
+        .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
+        .which_value = wippersnapper_sensor_SensorEvent_vector_value_tag;
   } else if (sensor_type ==
                  wippersnapper_sensor_SensorType_SENSOR_TYPE_ORIENTATION ||
              sensor_type ==
@@ -492,18 +488,27 @@ bool I2cModel::AddI2cDeviceSensorEvent(
     _msg_i2c_device_event
         .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
         .value.orientation_value.pitch = value_vect.pitch;
+    _msg_i2c_device_event
+        .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
+        .which_value = wippersnapper_sensor_SensorEvent_orientation_value_tag;
     // TODO: Add color RGB(A) vector support
   } else if (sensor_type ==
              wippersnapper_sensor_SensorType_SENSOR_TYPE_BOOLEAN) {
     bool value = GetValueFromSensorsEventBoolean(sensor_type, &event);
     _msg_i2c_device_event
         .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
         .value.bool_value = value;
+    _msg_i2c_device_event
+        .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
+        .which_value = wippersnapper_sensor_SensorEvent_bool_value_tag;
   } else {
     float value = GetValueFromSensorsEvent(sensor_type, &event);
     _msg_i2c_device_event
         .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
         .value.float_value = value;
+    _msg_i2c_device_event
+        .i2c_device_events[_msg_i2c_device_event.i2c_device_events_count]
+        .which_value = wippersnapper_sensor_SensorEvent_float_value_tag;
   }
 
   _msg_i2c_device_event.i2c_device_events_count++;

src/provisioning/sdcard/ws_sdcard.cpp

@@ -1382,23 +1382,24 @@ bool ws_sdcard::LogEventDs18x(wippersnapper_ds18x20_Ds18x20Event *event_msg) {
 */
 bool ws_sdcard::LogEventI2c(
     wippersnapper_i2c_I2cDeviceEvent *msg_device_event) {
-  JsonDocument doc;
+  JsonDocument baseDoc;
   // Pull the DeviceDescriptor out
   wippersnapper_i2c_I2cDeviceDescriptor descriptor =
       msg_device_event->i2c_device_description;
   char hex_addr[5];
   snprintf(hex_addr, sizeof(hex_addr), "0x%02X", descriptor.i2c_device_address);
-  doc["i2c_address"] = hex_addr;
+  baseDoc["i2c_address"] = hex_addr;
 
   // Using I2C MUX?
   if (descriptor.i2c_mux_address != 0x00) {
     snprintf(hex_addr, sizeof(hex_addr), "0x%02X", descriptor.i2c_mux_address);
-    doc["i2c_mux_addr"] = hex_addr;
-    doc["i2c_mux_ch"] = descriptor.i2c_mux_channel;
+    baseDoc["i2c_mux_addr"] = hex_addr;
+    baseDoc["i2c_mux_ch"] = descriptor.i2c_mux_channel;
   }
 
   // Log each event
   for (pb_size_t i = 0; i < msg_device_event->i2c_device_events_count; i++) {
+    JsonDocument doc = baseDoc; // no stale vectors/values
     doc["timestamp"] = GetTimestamp();
     // if mag/vector/colour etc log all value elements
     if (msg_device_event->i2c_device_events[i].type ==