Merge pull request #170 from adafruit/protobuf-update-7bb8007cb0b5aa2c0ce46cbf2856ac0fe776756b

BREAKING .proto file wrappers updated

Author: brentru

src/Wippersnapper.cpp

@@ -534,24 +534,24 @@ bool cbDecodeSignalRequestI2C(pb_istream_t *stream, const pb_field_t *field,
       wippersnapper_signal_v1_I2CResponse_init_zero;
   if (field->tag == wippersnapper_signal_v1_I2CRequest_req_i2c_init_tag) {
     WS_DEBUG_PRINTLN("I2C Init Request Found!");
-    // Decode I2CInitRequest
-    wippersnapper_i2c_v1_I2CInitRequest msgI2cInitRequest =
-        wippersnapper_i2c_v1_I2CInitRequest_init_zero;
-    if (!pb_decode(stream, wippersnapper_i2c_v1_I2CInitRequest_fields,
-                   &msgI2cInitRequest)) {
+    // Decode I2CBusInitRequest
+    wippersnapper_i2c_v1_I2CBusInitRequest msgI2CBusInitRequest =
+        wippersnapper_i2c_v1_I2CBusInitRequest_init_zero;
+    if (!pb_decode(stream, wippersnapper_i2c_v1_I2CBusInitRequest_fields,
+                   &msgI2CBusInitRequest)) {
       WS_DEBUG_PRINTLN(
-          "ERROR: Could not decode wippersnapper_i2c_v1_I2CInitRequest");
+          "ERROR: Could not decode wippersnapper_i2c_v1_I2CBusInitRequest");
       return false; // fail out
     }
 
     // Create a new I2C Component
-    if (msgI2cInitRequest.i2c_port_number == 0) {
-      WS._i2cPort0 = new WipperSnapper_Component_I2C(&msgI2cInitRequest);
+    if (msgI2CBusInitRequest.i2c_port_number == 0) {
+      WS._i2cPort0 = new WipperSnapper_Component_I2C(&msgI2CBusInitRequest);
       WS.i2cComponents.push_back(WS._i2cPort0);
       // did we init. the port successfully?
       is_success = WS._i2cPort0->isInitialized();
-    } else if (msgI2cInitRequest.i2c_port_number == 1) {
-      WS._i2cPort1 = new WipperSnapper_Component_I2C(&msgI2cInitRequest);
+    } else if (msgI2CBusInitRequest.i2c_port_number == 1) {
+      WS._i2cPort1 = new WipperSnapper_Component_I2C(&msgI2CBusInitRequest);
       // did we init. the port successfully?
       is_success = WS._i2cPort1->isInitialized();
       WS.i2cComponents.push_back(WS._i2cPort1);
@@ -573,13 +573,13 @@ bool cbDecodeSignalRequestI2C(pb_istream_t *stream, const pb_field_t *field,
              wippersnapper_signal_v1_I2CRequest_req_i2c_scan_tag) {
     WS_DEBUG_PRINTLN("I2C Scan Request");
 
-    // Decode I2CScanRequest
-    wippersnapper_i2c_v1_I2CScanRequest msgScanReq =
-        wippersnapper_i2c_v1_I2CScanRequest_init_zero;
-    if (!pb_decode(stream, wippersnapper_i2c_v1_I2CScanRequest_fields,
+    // Decode I2CBusScanRequest
+    wippersnapper_i2c_v1_I2CBusScanRequest msgScanReq =
+        wippersnapper_i2c_v1_I2CBusScanRequest_init_zero;
+    if (!pb_decode(stream, wippersnapper_i2c_v1_I2CBusScanRequest_fields,
                    &msgScanReq)) {
       WS_DEBUG_PRINTLN(
-          "ERROR: Could not decode wippersnapper_i2c_v1_I2CScanRequest");
+          "ERROR: Could not decode wippersnapper_i2c_v1_I2CBusScanRequest");
       return false; // fail out if we can't decode the request
     }
 
@@ -591,8 +591,8 @@ bool cbDecodeSignalRequestI2C(pb_istream_t *stream, const pb_field_t *field,
     }
 
     // Perform I2C scan
-    wippersnapper_i2c_v1_I2CScanResponse scanResp =
-        wippersnapper_i2c_v1_I2CScanResponse_init_zero;
+    wippersnapper_i2c_v1_I2CBusScanResponse scanResp =
+        wippersnapper_i2c_v1_I2CBusScanResponse_init_zero;
     if (msgScanReq.i2c_port_number == 0) {
       scanResp = WS._i2cPort0->scanAddresses();
     } else {

src/components/i2c/WipperSnapper_I2C.cpp

@@ -24,7 +24,7 @@
 */
 /***************************************************************************************************************/
 WipperSnapper_Component_I2C::WipperSnapper_Component_I2C(
-    wippersnapper_i2c_v1_I2CInitRequest *msgInitRequest) {
+    wippersnapper_i2c_v1_I2CBusInitRequest *msgInitRequest) {
   WS_DEBUG_PRINTLN("EXEC: New I2C Port ");
   WS_DEBUG_PRINT("\tPort #: ");
   WS_DEBUG_PRINTLN(msgInitRequest->i2c_port_number);
@@ -84,16 +84,16 @@ bool WipperSnapper_Component_I2C::isInitialized() { return _isInit; }
 /*!
     @brief    Scans all I2C addresses on the bus between 0x08 and 0x7F
               inclusive and returns an array of the devices found.
-    @returns  wippersnapper_i2c_v1_I2CScanResponse
+    @returns  wippersnapper_i2c_v1_I2CBusScanResponse
 */
 /************************************************************************/
-wippersnapper_i2c_v1_I2CScanResponse
+wippersnapper_i2c_v1_I2CBusScanResponse
 WipperSnapper_Component_I2C::scanAddresses() {
   WS_DEBUG_PRINT("EXEC: I2C Scan");
 
   // Create response
-  wippersnapper_i2c_v1_I2CScanResponse scanResp =
-      wippersnapper_i2c_v1_I2CScanResponse_init_zero;
+  wippersnapper_i2c_v1_I2CBusScanResponse scanResp =
+      wippersnapper_i2c_v1_I2CBusScanResponse_init_zero;
 
   // Scan all I2C addresses between 0x08 and 0x7F inclusive and return a list of
   // those that respond.
@@ -127,31 +127,31 @@ bool WipperSnapper_Component_I2C::attachI2CDevice(
   // AHTX0 Sensor
   if (msgDeviceInitReq->has_aht_init) {
     // TODO: Implement handling in future release
-/*     uint16_t addr = (uint16_t)msgDeviceInitReq->aht_init.address;
-    WS_DEBUG_PRINTLN("Requesting to initialize AHTx sensor");
-    WS_DEBUG_PRINT("\tSensor Addr: ");
-    WS_DEBUG_PRINTLN(addr, HEX);
-    WS_DEBUG_PRINT("\tTemperature sensor enabled? ");
-    WS_DEBUG_PRINTLN(msgDeviceInitReq->aht_init.enable_temperature);
-    WS_DEBUG_PRINT("\tHumidity sensor enabled? ");
-    WS_DEBUG_PRINTLN(msgDeviceInitReq->aht_init.enable_humidity);
+    /*     uint16_t addr = (uint16_t)msgDeviceInitReq->aht_init.address;
+        WS_DEBUG_PRINTLN("Requesting to initialize AHTx sensor");
+        WS_DEBUG_PRINT("\tSensor Addr: ");
+        WS_DEBUG_PRINTLN(addr, HEX);
+        WS_DEBUG_PRINT("\tTemperature sensor enabled? ");
+        WS_DEBUG_PRINTLN(msgDeviceInitReq->aht_init.enable_temperature);
+        WS_DEBUG_PRINT("\tHumidity sensor enabled? ");
+        WS_DEBUG_PRINTLN(msgDeviceInitReq->aht_init.enable_humidity);
 
-    // TODO: Create I2C Driver using the an AHT driver sub-class!
-    I2C_Driver *aht = new I2C_Driver(addr, this->_i2c);
-    // Attempt to initialize the sensor driver
-    if (!aht->initAHTX0()) {
-      attachSuccess = false;
-      return attachSuccess;
-    }
-    // Initialize device-specific sensors
-    if (msgDeviceInitReq->aht_init.enable_temperature == true) {
-      aht->enableAHTX0Temperature();
-    }
-    if (msgDeviceInitReq->aht_init.enable_humidity == true) {
-      aht->enableAHTX0Humidity();
-    }
-    // Push to vector for sensor drivers
-    activeDrivers.push_back(aht); */
+        // TODO: Create I2C Driver using the an AHT driver sub-class!
+        I2C_Driver *aht = new I2C_Driver(addr, this->_i2c);
+        // Attempt to initialize the sensor driver
+        if (!aht->initAHTX0()) {
+          attachSuccess = false;
+          return attachSuccess;
+        }
+        // Initialize device-specific sensors
+        if (msgDeviceInitReq->aht_init.enable_temperature == true) {
+          aht->enableAHTX0Temperature();
+        }
+        if (msgDeviceInitReq->aht_init.enable_humidity == true) {
+          aht->enableAHTX0Humidity();
+        }
+        // Push to vector for sensor drivers
+        activeDrivers.push_back(aht); */
     attachSuccess = true;
   } else {
     WS_DEBUG_PRINTLN("ERROR: Sensor not found")

src/components/i2c/WipperSnapper_I2C.h

@@ -33,9 +33,9 @@ class I2C_Driver;
 class WipperSnapper_Component_I2C {
 public:
   WipperSnapper_Component_I2C(
-      wippersnapper_i2c_v1_I2CInitRequest *msgInitRequest);
+      wippersnapper_i2c_v1_I2CBusInitRequest *msgInitRequest);
   ~WipperSnapper_Component_I2C();
-  wippersnapper_i2c_v1_I2CScanResponse scanAddresses();
+  wippersnapper_i2c_v1_I2CBusScanResponse scanAddresses();
   bool
   attachI2CDevice(wippersnapper_i2c_v1_I2CDeviceInitRequest *msgDeviceInitReq);
   bool isInitialized();

src/wippersnapper/description/v1/description.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:29:56 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/description/v1/description.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/wippersnapper/description/v1/description.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:29:56 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #ifndef PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED
 #define PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED

src/wippersnapper/i2c/v1/i2c.pb.c

@@ -1,24 +1,24 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:29:56 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/i2c/v1/i2c.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(wippersnapper_i2c_v1_I2CInitRequest, wippersnapper_i2c_v1_I2CInitRequest, AUTO)
+PB_BIND(wippersnapper_i2c_v1_I2CBusInitRequest, wippersnapper_i2c_v1_I2CBusInitRequest, AUTO)
 
 
-PB_BIND(wippersnapper_i2c_v1_I2CInitResponse, wippersnapper_i2c_v1_I2CInitResponse, AUTO)
+PB_BIND(wippersnapper_i2c_v1_I2CBusInitResponse, wippersnapper_i2c_v1_I2CBusInitResponse, AUTO)
 
 
-PB_BIND(wippersnapper_i2c_v1_I2CSetFrequency, wippersnapper_i2c_v1_I2CSetFrequency, AUTO)
+PB_BIND(wippersnapper_i2c_v1_I2CBusSetFrequency, wippersnapper_i2c_v1_I2CBusSetFrequency, AUTO)
 
 
-PB_BIND(wippersnapper_i2c_v1_I2CScanRequest, wippersnapper_i2c_v1_I2CScanRequest, AUTO)
+PB_BIND(wippersnapper_i2c_v1_I2CBusScanRequest, wippersnapper_i2c_v1_I2CBusScanRequest, AUTO)
 
 
-PB_BIND(wippersnapper_i2c_v1_I2CScanResponse, wippersnapper_i2c_v1_I2CScanResponse, 2)
+PB_BIND(wippersnapper_i2c_v1_I2CBusScanResponse, wippersnapper_i2c_v1_I2CBusScanResponse, 2)
 
 
 PB_BIND(wippersnapper_i2c_v1_I2CDeviceInitRequest, wippersnapper_i2c_v1_I2CDeviceInitRequest, AUTO)