Match Protobuf 52c4252a7336cda1274b61cdd5292f580ef4dd3d

Author: brentru

src/components/i2c/controller.cpp

@@ -531,19 +531,26 @@ bool I2cController::Handle_I2cBusScan(pb_istream_t *stream) {
 
   _i2c_model->ClearI2cBusScanned();
   wippersnapper_i2c_I2cBusScanned* scan_results = _i2c_model->GetI2cBusScannedMsg();
-  
-  // Check default i2c bus status 
-  if (! IsBusStatusOK()) {
-    WS_DEBUG_PRINTLN("[i2c] Default I2C bus is stuck or not operational, reset the board!");
-    return false;
-  }
-  // Linearly scan the default i2c bus
-  if (!_i2c_bus_default->ScanBus(scan_results)) {
-    WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to scan default I2C bus!");
-    return false;
+
+  if (_i2c_model->GetI2cBusScanMsg()->scan_default_bus) {
+    if (! IsBusStatusOK()) {
+        WS_DEBUG_PRINTLN("[i2c] Default I2C bus is stuck or not operational, reset the board!");
+        return false;
+    }
+    // Linearly scan the default i2c bus
+    if (!_i2c_bus_default->ScanBus(scan_results)) {
+        WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to scan default I2C bus!");
+        return false;
+    }
+    // TODO: Encode message
+    // TODO: Print out the message (to verify)
+    // Future TODO: Publish scan results out to IO
+    // Return
+    return true;
   }
 
 
+
   // TODO Linear Scan Alt. I2C Bus 
   // TODO: Check if alt i2c bus ha been initialized yet, call init. directly if not
   // TODO If Muxes are present, scan them 

src/components/i2c/hardware.h

@@ -47,10 +47,10 @@ class I2cHardware {
   void TogglePowerPin();
   wippersnapper_i2c_I2cBusStatus _bus_status; ///< I2C bus status
   TwoWire *_bus = nullptr;                    ///< I2C bus
-  uint8_t _bus_sda;                          ///< SDA pin
-  uint8_t _bus_scl;                          ///< SCL pin
+  uint8_t _bus_sda;                           ///< SDA pin
+  uint8_t _bus_scl;                           ///< SCL pin
   bool _has_mux;                              ///< Is a MUX present on the bus?
   uint32_t _mux_address_register;             ///< I2C address for the MUX
-  int _mux_max_channels; ///< Maximum possible number of MUX channels
+  int _mux_max_channels;                      ///< Maximum possible number of MUX channels
 };
 #endif // WS_I2C_HARDWARE_H

src/components/i2c/model.cpp

@@ -164,6 +164,16 @@ bool I2cModel::DecodeI2cBusScan(pb_istream_t *stream) {
                    &_msg_i2c_bus_scan);
 }
 
+/**********************************************************************/
+/*!
+    @brief    Returns a pointer to the I2cBusScan message.
+    @returns  Pointer to a I2cBusScan message.
+*/
+/**********************************************************************/
+wippersnapper_i2c_I2cBusScan *GetI2cBusScanMsg() {
+    return &_msg_i2c_bus_scan;
+}
+
 /**********************************************************************/
 /*!
     @brief    Returns a pointer to the I2cBusScanned message.

src/components/i2c/model.h

@@ -45,6 +45,7 @@ class I2cModel {
   wippersnapper_i2c_I2cDeviceAddOrReplace *GetI2cDeviceAddOrReplaceMsg();
   wippersnapper_i2c_I2cDeviceAddedOrReplaced *GetMsgI2cDeviceAddedOrReplaced();
   wippersnapper_i2c_I2cDeviceEvent *GetI2cDeviceEvent();
+  wippersnapper_i2c_I2cBusScan *GetI2cBusScanMsg();
   wippersnapper_i2c_I2cBusScanned *GetI2cBusScannedMsg();
   // I2cBusScanned Message API
   void ClearI2cBusScanned();

src/protos/i2c.pb.c

@@ -9,6 +9,12 @@
 PB_BIND(wippersnapper_i2c_I2cDeviceDescriptor, wippersnapper_i2c_I2cDeviceDescriptor, AUTO)
 
 
+PB_BIND(wippersnapper_i2c_I2cMuxDescriptor, wippersnapper_i2c_I2cMuxDescriptor, AUTO)
+
+
+PB_BIND(wippersnapper_i2c_I2cBusDescriptor, wippersnapper_i2c_I2cBusDescriptor, AUTO)
+
+
 PB_BIND(wippersnapper_i2c_I2cBusScan, wippersnapper_i2c_I2cBusScan, AUTO)