.vscode/extensions.json

@@ -3,8 +3,5 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
     ]
 }

include/debug.h

@@ -8,11 +8,9 @@ DebugUtils.h - Simple debugging utilities.
 #ifdef DEBUG
   #define DEBUG_PRINT(...) Serial.print(__VA_ARGS__); Serial.flush();
   #define DEBUG_PRINTLN(...) Serial.println(__VA_ARGS__); Serial.flush();
-  #define DEBUG_PRINTARR(...) for (uint8_t i=0; i<(sizeof(__VA_ARGS__)/sizeof(__VA_ARGS__[0])); i++) { Serial.print(__VA_ARGS__[i], HEX); Serial.print(" ");}; Serial.flush();
 #else
   #define DEBUG_PRINT(...)
   #define DEBUG_PRINTLN(...)
-  #define DEBUG_PRINTARR(...)
 #endif
 
 #endif

lib/HM330x/HM330x.cpp

@@ -46,11 +46,8 @@ void HM330x::initialize(void) {
   }
 
   // Wait for Sensor to get Ready
-  if (sleep_pin == 0) {
+  DEBUG_PRINTLN("HM330x::initialize Waiting for Sensor Startup");
-    DEBUG_PRINTLN("HM330x::initialize Waiting for Sensor Startup");
+  delay(30000);
-    delay(30000);
-  }
-
 
   DEBUG_PRINTLN("HM330x::initialize Trying to send Select");
   // Send select command
@@ -68,58 +65,46 @@ void HM330x::initialize(void) {
 // Read Data From Sensor and Put Them Into the Payload Array
 uint8_t HM330x::getSensorData(char *payload, uint8_t startbyte) {
   uint8_t data[HM330x_DATA_LEN] = {0};
-  uint16_t values[3] = { 0xEEEE, 0xEEEE, 0xEEEE };
+  uint16_t value = 0;
 
   DEBUG_PRINTLN("HM330x::getSensorData");
   
   // Enable Sensor and Wait for it to Settle
   if (sleep_pin > 0) {
     digitalWrite(sleep_pin, HIGH);
-    DEBUG_PRINTLN("HM330x::getSensorData Waiting for Stable Values after Sleep");
     delay(30000);
-    sendCmd(HM330x_SELECT);
   }
 
   // Initialize Payload with 0s
   for (uint8_t i=startbyte; i < startbyte+6; i++)
     payload[i] = 0xFF;
 
-  bool    dataok = false;
+  // Get Data from the Sensors
-  uint8_t tries  = 5;
+  Wire.requestFrom(HM330x_ADDR, HM330x_DATA_LEN);
+  if (Wire.available()) {
+    DEBUG_PRINT("HM330x::getSensorData reading I2C:")
+    for (uint8_t i = 0; i<HM330x_DATA_LEN; i++){
+      data[i] = Wire.read();
+      DEBUG_PRINT(" 0x");
+      DEBUG_PRINT(data[i], HEX);
+    }
+    DEBUG_PRINTLN("");
 
-  while (!dataok && tries > 0) {
+    if (calcSum(data) == data[HM330x_DATA_LEN-1]) {
-    DEBUG_PRINT("HM330x::getSensorData reading I2C Try ");
+      for (uint8_t pos = 5; pos<8; pos++) {
-    DEBUG_PRINTLN(6-tries);
+        value = bytesToUint16(data, pos);
-    // Get Data from the Sensors
+        uint16ToPayload(value, payload, startbyte);
-    Wire.requestFrom(HM330x_ADDR, HM330x_DATA_LEN);
+        startbyte += 2;
-    if (Wire.available()) {
-      DEBUG_PRINT("HM330x::getSensorData I2C data: 0x")
-      for (uint8_t i = 0; i<HM330x_DATA_LEN; i++){
-        data[i] = Wire.read();
-        DEBUG_PRINT(data[i], HEX);
-        DEBUG_PRINT(" ");
       }
-      DEBUG_PRINTLN("");
+      if (sleep_pin > 0) {
-
+        digitalWrite(sleep_pin, LOW);
-      if (calcSum(data) == data[HM330x_DATA_LEN-1]) {
-        for (uint8_t pos = 5; pos<8; pos++) {
-          values[pos-5]= bytesToUint16(data, pos);
-        }
-        dataok = true;
-      } else {
-        DEBUG_PRINTLN("HM330x::getSensorData Checksum Error")
-        delay(2000);
-        tries--;
       }
+      return startbyte;
     } else {
-      DEBUG_PRINTLN("HM330x::getSensorData I2C Not Ready")
+      for (uint8_t i=startbyte; i < startbyte+6; i++)
-      delay(2000);
+        payload[i] = 0xEE;
-      tries--;
     }
   }
-  uint16ToPayload(values[0], payload, startbyte);
-  uint16ToPayload(values[1], payload, startbyte+2);
-  uint16ToPayload(values[2], payload, startbyte+4);
   if (sleep_pin > 0) {
     digitalWrite(sleep_pin, LOW);
   }

lib/SPS30/SPS30.cpp

@@ -27,90 +27,69 @@
 #include <Arduino.h>
 #include "SPS30.h"
 
-// Read Measurements from Sensor and put them into the Paylaod
+SPS30::SPS30() {
-uint8_t SPS30::getSensorData(char *payload, uint8_t startbyte) {
+}
-  // Buffer to hold the raw I2C Return
-  uint8_t  data[30]; 
-  // Array with calculated Values.
-  // Predefined with 0xEEEE to recognize Read Errors in the Payload
-  uint16_t values[5] = {0xEEEE, 0xEEEE, 0xEEEE, 0xEEEE, 0xEEEE};
 
-  // Wakeup Sensor from Sleep
+
-  DEBUG_PRINTLN("SPS30::getSensorData - Wake Up Sensor");
+uint8_t SPS30::getSensorData(char *payload, uint8_t startbyte) {
-  Wire.beginTransmission(SPS30_I2C_ADDRESS);
+  uint8_t data[30];
-  Wire.endTransmission();
+  for (uint8_t i = 0; i < 30; i++)
-  delay(50);
+    data[i] = 0xFF;
-  write(SPS30_WAKEUP);
+  
-  delay(50);
+  uint16_t massPM1, massPM25, massPM4, massPM10, typPM;
 
   // Start Measuring, Integer Output
-  DEBUG_PRINTLN("SPS30::getSensorData - StartMeasurement");
   write(SPS30_START_MEASUREMENT, 0x0500);
-  // Wait for Stable Values
+  // Wait for Stable Values (max 30s according to datasheet)
-  DEBUG_PRINTLN("SPS30::getSensorData - WaitForStabilize");
+  delay(30000);
-  delay(SPS30_STABILIZE_TIME);
 
-  bool    dataok = false;
+  if (hasData()) {
-  uint8_t tries = 5;
+    write(SPS30_READ_MEASUREMENT);
+    Wire.requestFrom(SPS30_I2C_ADDRESS, 30);
+    if (Wire.available() != 0) {
+      for (uint8_t i = 0; i < 30; i++)
+        data[i] = 0xFE;
       
-  // Retry up to 5 times to get a Valid Measurement from the Sensor
+      Wire.readBytes(data, 30);
-  while (!dataok && tries > 0) {
-    DEBUG_PRINT("SPS30::getSensorData - Reading Sensor Data, Try ");
-    DEBUG_PRINTLN(6-tries);
-    if (hasData()) {
-      write(SPS30_READ_MEASUREMENT);
-      Wire.requestFrom(SPS30_I2C_ADDRESS, 30);
-      if (Wire.available() != 0) { 
-        Wire.readBytes(data, 30);
 
-        DEBUG_PRINT("SPS30::getSensorData - I2C-Data: ");
+      // DEBUG OUTPUT
-        DEBUG_PRINTARR(data);
+      DEBUG_PRINT("SPS30 I2C DATA: ")
-        DEBUG_PRINTLN("");
+      for (uint8_t i = 0; i < 30; i++) {
-
+        DEBUG_PRINT("0x");
-        // Get Values for PM1.0, 2.5, 4 and 10 in Order
+        DEBUG_PRINT (data[i]);
-        dataok = true;
+        DEBUG_PRINT(", ");
-        for (uint8_t i=0; i<4; i++)
-          if (data[(i*3)+2] == calcCRC(data+(i*3), 2)) {
-            values[i] = data[i*3] << 8 | data[(i*3)+1]; // Create uint16_t from Bytes
-          } else {
-            dataok = false; // Set false on Checksum Error
-          }
-        
-        // Get Typical Particle size
-        if (data[29] == calcCRC(data+27, 2)) {
-          values[4] = data[27] << 8 | data[28]; // Create uint16_t from Bytes
-        } else {
-          dataok = false; // Set false on Checksum Error
-        }
-        
-        if (!dataok) {
-          // If a Checksum error occured
-          DEBUG_PRINTLN("SPS30::getSensorData - CheckSum Error");
-          tries--;
-          delay(2000);
-        }
-      } else {
-        // No I2C Data Available
-        DEBUG_PRINTLN("SPS30::getSensorData - Error, no I2C Data available");
-        tries--;
-        delay(2000);
       }
-    } else {
+        
-      // No Data Ready from Sensor
+      DEBUG_PRINTLN("");
-      DEBUG_PRINTLN("SPS30::getSensorData - Error, Sensor Data not Ready");
+
-      tries--;
+      // PM1.0
-      delay(2000);
+      if (data[2] == calcCRC(data, 2))
+        massPM1 = data[0] << 8 | data[1];
+
+      // PM2.5
+      if (data[5] == calcCRC(data+3, 2))
+        massPM25 = data[3] << 8 | data[4];
+      
+      // PM4
+      if (data[8] == calcCRC(data+6, 2))
+        massPM4 = data[6] << 8 | data[7];
+      
+      // PM10
+      if (data[11] == calcCRC(data+9, 2))
+        massPM10 = data[9] << 8 | data[10];
+      
+      // Typical Size
+      if (data[29] == calcCRC(data+27, 2))
+        typPM = data[27] << 8 | data[28];
     }
   }
-  DEBUG_PRINTLN("SPS30::getSensorData - StopMeasurement");
   write(SPS30_STOP_MEASUREMENT);
-  delay(50);
-  DEBUG_PRINTLN("SPS30::getSensorData - SensorSleep");
-  write(SPS30_SLEEP);
 
-  // Put the Values into the Payload Array
+  uint16ToPayload(massPM1, payload, startbyte);
-  for (uint8_t i=0; i<5; i++)
+  uint16ToPayload(massPM25, payload, startbyte+2);
-    uint16ToPayload(values[i], payload, startbyte+(i*2));
+  uint16ToPayload(massPM4, payload, startbyte+4);
+  uint16ToPayload(massPM10, payload, startbyte+6);
+  uint16ToPayload(typPM, payload, startbyte+8);
 }
 
 // Check if Sensor has Data
@@ -135,7 +114,6 @@ uint16_t SPS30::readReg(uint16_t regAddr) {
   return(0);
 }
 
-// Write a 16 Bit Command without Parameters
 bool SPS30::write(uint16_t cmd) {
   Wire.beginTransmission(SPS30_I2C_ADDRESS);
   Wire.write(cmd >> 8);
@@ -145,7 +123,6 @@ bool SPS30::write(uint16_t cmd) {
   return(true);
 }
 
-// Write a 16Bit Command with 16Bit Parameters
 bool SPS30::write(uint16_t cmd, uint16_t arg){
   uint8_t crcdata[2];
   crcdata[0] = arg >> 8;

lib/SPS30/SPS30.h

@@ -32,21 +32,18 @@
 #include "../../include/debug.h"
 
 // I2C Address
-#define SPS30_I2C_ADDRESS    0x69
+#define SPS30_I2C_ADDRESS 0x69
-#define SPS30_STABILIZE_TIME 30000
 
 // I2C Commands and Registers
-#define SPS30_START_MEASUREMENT   0x0010
+#define SPS30_START_MEASUREMENT 0x0010
-#define SPS30_STOP_MEASUREMENT    0x0104
+#define SPS30_STOP_MEASUREMENT 0x0104
-#define SPS30_GET_DATA_READY      0x0202
+#define SPS30_GET_DATA_READY 0x0202
-#define SPS30_READ_MEASUREMENT    0x0300
+#define SPS30_READ_MEASUREMENT 0x0300
 #define SPS30_AUTO_CLEAN_INTERVAL 0x8004
-#define SPS30_START_FAN_CLEANING  0x5607
+#define SPS30_START_FAN_CLEANING 0x5607
-#define SPS30_READ_ARTICLE_CODE   0xD025
+#define SPS30_READ_ARTICLE_CODE 0xD025
-#define SPS30_READ_SERIAL_NUMBER  0xD033
+#define SPS30_READ_SERIAL_NUMBER 0xD033
-#define SPS30_DEVICE_RESET        0xD304
+#define SPS30_DEVICE_RESET 0xD304
-#define SPS30_SLEEP               0x1001
-#define SPS30_WAKEUP              0x1103
 
 class SPS30 : public AttSensor {
   private:
@@ -57,11 +54,11 @@ class SPS30 : public AttSensor {
     bool write(uint16_t cmd, uint16_t arg);
   
   public:
-    SPS30() {};
+    SPS30();
-    uint8_t getSensorData(char *payload, uint8_t startbyte) override;
+    uint8_t getSensorData(char *payload, uint8_t startbyte);
-    void calibrate(void) override {};
+    void calibrate(void) {};
-    void initialize(void) override {} ;
+    void initialize(void) {};
-    uint8_t numBytes(void) override { return 10; };
+    uint8_t numBytes(void) { return 10; };
 };
 
 #endif