Merge pull request #7 from Sensirion/fix-low-level-error

Fix low level error
Sensirion · Apr 30, 2024 · 7c74d1b · 7c74d1b
2 parents 36c288d + 2a7aaf3
commit 7c74d1b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,6 +9,12 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 `Unreleased`_
 -------------
 
+`0.7.1`_ 2024-04-30
+-------------------
+
+- Add undefined low level error to avoid fallback to "Frame already contains data" error.
+- Fix missing low level error when not enough data available for I2C.
+
 
 `0.7.0`_ 2024-04-09
 -------------------

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Sensirion Core
-version=0.7.0
+version=0.7.1
 author=Sensirion
 maintainer=Sensirion
 sentence=Library containing code base for Sensirion Sensor Libraries.

diff --git a/src/SensirionErrors.cpp b/src/SensirionErrors.cpp
@@ -55,6 +55,10 @@ void errorToString(uint16_t error, char errorMessage[],
             break;
         case HighLevelError::WriteError:
             switch (lowLevelError) {
+                case LowLevelError::Undefined:
+                    strncpy(errorMessage, "Write error",
+                            errorMessageSize);
+                    return;
                 case LowLevelError::SerialWriteError:
                     strncpy(errorMessage, "Error writing to serial",
                             errorMessageSize);
@@ -81,6 +85,9 @@ void errorToString(uint16_t error, char errorMessage[],
             break;
         case HighLevelError::ReadError:
             switch (lowLevelError) {
+                case LowLevelError::Undefined:
+                    strncpy(errorMessage, "Read error", errorMessageSize);
+                    return;
                 case LowLevelError::NonemptyFrameError:
                     strncpy(errorMessage, "Frame already contains data",
                             errorMessageSize);
@@ -117,6 +124,9 @@ void errorToString(uint16_t error, char errorMessage[],
         }
         case HighLevelError::TxFrameError:
             switch (lowLevelError) {
+                case LowLevelError::Undefined:
+                    strncpy(errorMessage, "Tx frame error", errorMessageSize);
+                    return;
                 case LowLevelError::BufferSizeError:
                     strncpy(errorMessage, "Not enough space in buffer",
                             errorMessageSize);
@@ -125,6 +135,9 @@ void errorToString(uint16_t error, char errorMessage[],
             break;
         case HighLevelError::RxFrameError:
             switch (lowLevelError) {
+                case LowLevelError::Undefined:
+                    strncpy(errorMessage, "Rx frame error", errorMessageSize);
+                    return;
                 case LowLevelError::BufferSizeError:
                     strncpy(errorMessage, "Not enough space in buffer",
                             errorMessageSize);

diff --git a/src/SensirionErrors.h b/src/SensirionErrors.h
@@ -50,8 +50,9 @@ enum HighLevelError : uint16_t {
     SensorSpecificError = 0x8000,
 };
 
-enum LowLevelError : uint16_t {
+enum LowLevelError : uint8_t {
     // general errors
+    Undefined = 0,
     NonemptyFrameError,
     NoDataError,
     BufferSizeError,

diff --git a/src/SensirionI2CCommunication.cpp b/src/SensirionI2CCommunication.cpp
@@ -104,7 +104,7 @@ uint16_t SensirionI2CCommunication::receiveFrame(uint8_t address,
         uint8_t available = i2cBus.requestFrom(address, bytesToRead,
                                                static_cast<uint8_t>(stop));
         if (bytesToRead != available) {
-            return ReadError;
+            return ReadError | NotEnoughDataError;
         }
         while (available > 0) {
             frame._buffer[i++] = i2cBus.read();