refactor(ens161): rename class and usage to ENS16x

Author: tyeth

src/components/i2c/WipperSnapper_I2C.cpp

@@ -352,16 +352,16 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
     WS_DEBUG_PRINTLN("DS2484 Initialized Successfully!");
   } else if ((strcmp("ens160", msgDeviceInitReq->i2c_device_name) == 0) ||
              (strcmp("ens161", msgDeviceInitReq->i2c_device_name) == 0)) {
-    _ens160 = new WipperSnapper_I2C_Driver_ENS160(this->_i2c, i2cAddress);
-    if (!_ens160->begin()) {
-      WS_DEBUG_PRINTLN("ERROR: Failed to initialize ENS160!");
+    _ens16x = new WipperSnapper_I2C_Driver_ENS16x(this->_i2c, i2cAddress);
+    if (!_ens16x->begin()) {
+      WS_DEBUG_PRINTLN("ERROR: Failed to initialize ENS16x!");
       _busStatusResponse =
           wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL;
       return false;
     }
-    _ens160->configureDriver(msgDeviceInitReq);
-    drivers.push_back(_ens160);
-    WS_DEBUG_PRINTLN("ENS160 Initialized Successfully!");
+    _ens16x->configureDriver(msgDeviceInitReq);
+    drivers.push_back(_ens16x);
+    WS_DEBUG_PRINTLN("ENS16x Initialized Successfully!");
   } else if (strcmp("hdc302x", msgDeviceInitReq->i2c_device_name) == 0) {
     _hdc302x = new WipperSnapper_I2C_Driver_HDC302X(this->_i2c, i2cAddress);
     if (!_hdc302x->begin()) {

src/components/i2c/WipperSnapper_I2C.h

@@ -167,7 +167,7 @@ class WipperSnapper_Component_I2C {
   WipperSnapper_I2C_Driver_D6T1A *_d6t1a = nullptr;
   WipperSnapper_I2C_Driver_DPS310 *_dps310 = nullptr;
   WipperSnapper_I2C_Driver_DS2484 *_ds2484 = nullptr;
-  WipperSnapper_I2C_Driver_ENS160 *_ens160 = nullptr;
+  WipperSnapper_I2C_Driver_ENS16x *_ens16x = nullptr;
   WipperSnapper_I2C_Driver_SCD30 *_scd30 = nullptr;
   WipperSnapper_I2C_Driver_BH1750 *_bh1750 = nullptr;
   WipperSnapper_I2C_Driver_BME280 *_bme280 = nullptr;

src/components/i2c/drivers/WipperSnapper_I2C_Driver_ENS160.h

@@ -1,7 +1,7 @@
 /*!
- * @file WipperSnapper_I2C_Driver_ENS160.h
+ * @file WipperSnapper_I2C_Driver_ENS16X.h
  *
- * Device driver for a ENS160 MOX Gas Sensor.
+ * Device driver for a ENS160/ENS161 MOX Gas Sensor.
  *
  * Adafruit invests time and resources providing this open source code,
  * please support Adafruit and open-source hardware by purchasing
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef WipperSnapper_I2C_Driver_ENS160_H
-#define WipperSnapper_I2C_Driver_ENS160_H
+#ifndef WipperSnapper_I2C_Driver_ENS16X_H
+#define WipperSnapper_I2C_Driver_ENS16X_H
 
 #include "WipperSnapper_I2C_Driver.h"
 #include <ScioSense_ENS160.h>
@@ -23,38 +23,38 @@
 
 /**************************************************************************/
 /*!
-    @brief  Class that provides a sensor driver for the ENS160 temperature
-            and humidity sensor.
+    @brief  Class that provides a sensor driver for the ENS16x temperature
+            and humidity sensors.
 */
 /**************************************************************************/
-class WipperSnapper_I2C_Driver_ENS160 : public WipperSnapper_I2C_Driver {
+class WipperSnapper_I2C_Driver_ENS16x : public WipperSnapper_I2C_Driver {
 
 public:
   /*******************************************************************************/
   /*!
-      @brief    Constructor for an ENS160 sensor.
+      @brief    Constructor for an ENS16x sensor.
       @param    i2c
                 The I2C interface.
       @param    sensorAddress
                 7-bit device address.
   */
   /*******************************************************************************/
-  WipperSnapper_I2C_Driver_ENS160(TwoWire *i2c, uint16_t sensorAddress)
+  WipperSnapper_I2C_Driver_ENS16x(TwoWire *i2c, uint16_t sensorAddress)
       : WipperSnapper_I2C_Driver(i2c, sensorAddress) {
     _i2c = i2c;
     _sensorAddress = sensorAddress;
   }
 
   /*******************************************************************************/
   /*!
-      @brief    Destructor for an ENS160 sensor.
+      @brief    Destructor for an ENS16x sensor.
   */
   /*******************************************************************************/
-  ~WipperSnapper_I2C_Driver_ENS160() { delete _ens16x; }
+  ~WipperSnapper_I2C_Driver_ENS16x() { delete _ens16x; }
 
   /*******************************************************************************/
   /*!
-      @brief    Initializes the ENS160 sensor and begins I2C.
+      @brief    Initializes the ENS16x sensor and begins I2C.
       @returns  True if initialized successfully, False otherwise.
   */
   /*******************************************************************************/
@@ -84,7 +84,7 @@ class WipperSnapper_I2C_Driver_ENS160 : public WipperSnapper_I2C_Driver {
 
   /*******************************************************************************/
   /*!
-      @brief    Reads the ENS160's eCO2 sensor into an event.
+      @brief    Reads the ENS16x's eCO2 sensor into an event.
       @param    eco2Event
                 Pointer to an adafruit sensor event.
       @returns  True if the sensor event was obtained successfully, False
@@ -100,7 +100,7 @@ class WipperSnapper_I2C_Driver_ENS160 : public WipperSnapper_I2C_Driver {
 
   /*******************************************************************************/
   /*!
-      @brief    Reads the ENS160's TVOC sensor into an event.
+      @brief    Reads the ENS16x's TVOC sensor into an event.
       @param    tvocEvent
                 Pointer to an adafruit sensor event.
       @returns  True if the sensor event was obtained successfully, False
@@ -116,7 +116,7 @@ class WipperSnapper_I2C_Driver_ENS160 : public WipperSnapper_I2C_Driver {
 
   /*******************************************************************************/
   /*!
-      @brief    Reads the ENS160's AQI value into an event.
+      @brief    Reads the ENS16x's AQI value into an event.
       @param    rawEvent
                 Pointer to an adafruit sensor event.
       @returns  True if the sensor event was obtained successfully, False
@@ -131,7 +131,7 @@ class WipperSnapper_I2C_Driver_ENS160 : public WipperSnapper_I2C_Driver {
   }
 
 protected:
-  ScioSense_ENS160 *_ens16x; ///< ENS160/1 object
+  ScioSense_ENS160 *_ens16x; ///< ENS16x object
 };
 
-#endif // WipperSnapper_I2C_Driver_ENS160
+#endif // WipperSnapper_I2C_Driver_ENS16X_H