From c63132ebe08e497c85b8b8496bb45672c06c7adf Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Mon, 29 Mar 2021 17:44:55 +0200 Subject: [PATCH] Small Fix for Helper Functions --- include/attsensor.h | 6 +++++- lib/MHZ19C/MHZ19C.cpp | 2 +- lib/SENSAIRS8/SENSAIRS8.cpp | 2 +- lib/SG112A/SG112A.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/attsensor.h b/include/attsensor.h index f62f2cb..dc46e72 100644 --- a/include/attsensor.h +++ b/include/attsensor.h @@ -40,7 +40,7 @@ class AttSensor { // Return the number of Bytes added to the Payload virtual uint8_t numBytes(void) = 0; - // Helper Functions to Put Values Into the Payload Array + // Helper Functions to Put Values Into the Payload Array static void int32ToPayload(int32_t value, char *payload, uint8_t startbyte) { payload[startbyte] = (value) & 0XFF; payload[startbyte+1] = (value >> 8) & 0XFF; @@ -51,6 +51,10 @@ class AttSensor { payload[startbyte] = (value) & 0XFF; payload[startbyte+1] = (value >> 8) & 0XFF; } + static void uint16ToPayload(uint16_t value, char *payload, uint8_t startbyte) { + payload[startbyte] = (value) & 0XFF; + payload[startbyte+1] = (value >> 8) & 0XFF; + } }; #endif \ No newline at end of file diff --git a/lib/MHZ19C/MHZ19C.cpp b/lib/MHZ19C/MHZ19C.cpp index f8d60b1..00801ac 100644 --- a/lib/MHZ19C/MHZ19C.cpp +++ b/lib/MHZ19C/MHZ19C.cpp @@ -51,7 +51,7 @@ uint8_t MHZ19C::getSensorData(char * payload, uint8_t startbyte) { if (readBytes > 0) { switch(buffer[1]) { case 0x86: - int16ToPayload((buffer[2]*256) + buffer[3], payload, startbyte); + uint16ToPayload((buffer[2]*256) + buffer[3], payload, startbyte); break; } } diff --git a/lib/SENSAIRS8/SENSAIRS8.cpp b/lib/SENSAIRS8/SENSAIRS8.cpp index ba8e38d..03e739a 100644 --- a/lib/SENSAIRS8/SENSAIRS8.cpp +++ b/lib/SENSAIRS8/SENSAIRS8.cpp @@ -44,7 +44,7 @@ uint8_t SENSAIRS8::getSensorData(char *payload, uint8_t startbyte) { payload[startbyte] = 0x00; payload[startbyte+1] = 0x00; if (readBytes > 0) { - int16ToPayload((buffer[3]*256) + buffer[4], payload, startbyte); + uint16ToPayload((buffer[3]*256) + buffer[4], payload, startbyte); } return startbyte+2; } diff --git a/lib/SG112A/SG112A.cpp b/lib/SG112A/SG112A.cpp index bfbab90..9b6590c 100644 --- a/lib/SG112A/SG112A.cpp +++ b/lib/SG112A/SG112A.cpp @@ -44,7 +44,7 @@ uint8_t SG112A::getSensorData(char *payload, uint8_t startbyte) { if (readBytes > 0) { switch(buffer[2]) { case 0x15: - int16ToPayload((buffer[3]*256) + buffer[4], payload, startbyte); + uint16ToPayload((buffer[3]*256) + buffer[4], payload, startbyte); break; } }