Merge pull request #54 from Sensirion/fix-get-sensor-variant

Fix get sensor variant

Author: Rol-la

CHANGELOG.md

@@ -3,7 +3,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased] 
+## [Unreleased]
+
+### Fixed
+
+- Wrong computation of sensor variant in method getSensorVariant
+
 
 ## [1.0.0] - 2025-1-30
 

README.md

@@ -20,6 +20,7 @@ support it are listed in the API description.
 | ------------- | -------------- |
 |[SCD40](https://sensirion.com/products/catalog/SCD40)| **0x62**|
 |[SCD41](https://sensirion.com/products/catalog/SCD41)| **0x62**|
+|[SCD43](https://sensirion.com/products/catalog/SCD43)| **0x62**|
 
 The following instructions and examples use a *SCD41*.
 

src/SensirionI2cScd4x.cpp

@@ -165,24 +165,27 @@ int16_t SensirionI2cScd4x::getDataReadyStatus(bool& arg0) {
 
 int16_t
 SensirionI2cScd4x::getSensorVariant(SCD4xSensorVariant& aSensorVariant) {
+    SCD4xSensorVariant retVal = SCD4X_SENSOR_VARIANT_MASK;
     uint16_t rawSensorVariant = 0;
+    uint16_t mySensorVariant = 0;
     int16_t localError = 0;
+    retVal = SCD4X_SENSOR_VARIANT_MASK;
+    uint16_t mask = (uint16_t)(retVal);
     localError = getSensorVariantRaw(rawSensorVariant);
     if (localError != NO_ERROR) {
         return localError;
     }
-    uint16_t variant = (uint16_t)(rawSensorVariant & 4);
-    if (variant == 0) {
-        aSensorVariant = SCD4X_SENSOR_VARIANT_SCD40;
-        ;
-        return localError;
-    } else if (variant == 1) {
-        aSensorVariant = SCD4X_SENSOR_VARIANT_SCD41;
-        ;
-        return localError;
+    mySensorVariant = (uint16_t)(rawSensorVariant & mask);
+    if (mySensorVariant == (uint16_t)(SCD4X_SENSOR_VARIANT_SCD40)) {
+        retVal = SCD4X_SENSOR_VARIANT_SCD40;
+    } else if (mySensorVariant == (uint16_t)(SCD4X_SENSOR_VARIANT_SCD41)) {
+        retVal = SCD4X_SENSOR_VARIANT_SCD41;
+    } else if (mySensorVariant == (uint16_t)(SCD4X_SENSOR_VARIANT_SCD42)) {
+        retVal = SCD4X_SENSOR_VARIANT_SCD42;
+    } else if (mySensorVariant == (uint16_t)(SCD4X_SENSOR_VARIANT_SCD43)) {
+        retVal = SCD4X_SENSOR_VARIANT_SCD43;
     }
-    aSensorVariant = SCD4X_SENSOR_VARIANT_UNKNOWN;
-    ;
+    aSensorVariant = retVal;
     return localError;
 }
 
@@ -555,7 +558,8 @@ int16_t SensirionI2cScd4x::getSerialNumber(uint64_t& serialNumber) {
     if (localError != NO_ERROR) {
         return localError;
     }
-    localError |= rxFrame.getInteger(reinterpret_cast<uint8_t*>(&serialNumber), LongInteger, 6);
+    localError |= rxFrame.getInteger(reinterpret_cast<uint8_t*>(&serialNumber),
+                                     LongInteger, 6);
     return localError;
 }
 

src/SensirionI2cScd4x.h

@@ -44,6 +44,7 @@
 
 #define SCD40_I2C_ADDR_62 0x62
 #define SCD41_I2C_ADDR_62 0x62
+#define SCD43_I2C_ADDR_62 0x62
 
 typedef enum {
     SCD4X_START_PERIODIC_MEASUREMENT_CMD_ID = 0x21b1,
@@ -79,9 +80,13 @@ typedef enum {
 } SCD4xCmdId;
 
 typedef enum {
-    SCD4X_SENSOR_VARIANT_UNKNOWN = 0,
-    SCD4X_SENSOR_VARIANT_SCD40 = 1,
-    SCD4X_SENSOR_VARIANT_SCD41 = 2,
+
+    SCD4X_SENSOR_VARIANT_MASK = 0x00F000,
+    SCD4X_SENSOR_VARIANT_SCD40 = 0x000000,
+    SCD4X_SENSOR_VARIANT_SCD41 = 0x001000,
+    SCD4X_SENSOR_VARIANT_SCD42 = 0x002000,
+    SCD4X_SENSOR_VARIANT_SCD43 = 0x005000,
+
 } SCD4xSensorVariant;
 
 class SensirionI2cScd4x {