From 599985fd75005e903e602fae223449b390ae5a18 Mon Sep 17 00:00:00 2001
From: Carsten Schmiemann <carstenschmiemann@Carstens-Mac-Pro.local>
Date: Thu, 7 Feb 2019 02:44:13 +0100
Subject: [PATCH] Second Test

---
 platformio.ini |  3 ++-
 src/main.cpp   | 38 +++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index d1fad94..fde5787 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,4 +12,5 @@
 platform = atmelavr
 board = pro16MHzatmega328
 framework = arduino
-lib_deps = PMS Library, TaskScheduler
\ No newline at end of file
+lib_deps = PMS Library, TaskScheduler
+monitor_speed = 57600
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 3b2a43d..5e6cc5a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,27 +16,25 @@ Task t1(5000, TASK_FOREVER, &sensor_pms);
 //////////////// MODBUS Registers ///////////////////
 enum 
 { 
-  R00_OneWireSensors_Anzahl,
-  R01_DHT22Sensors_Anzahl,
-  R02_Temp00,
-  R03_Temp01,
-  R04_Temp02,
-  R05_Temp03,
-  R06_Temp04,
-  R07_Temp05,
+  R00_Dust_10,
+  R01_Dust_25,
+  R02_Dust_100,
   TOTAL_ERRORS,
   TOTAL_REGS_SIZE
 };
 unsigned int holdingRegs[TOTAL_REGS_SIZE]; // function 3 and 16 register array
+unsigned int PM10;
+unsigned int PM25;
+unsigned int PM100;
 //////////////////////////////////////////////////////
 
 void setup() {
-  Serial.begin(57600);
-  Serial.print("Starting up...");
+  //Serial.begin(57600);
+  //Serial.print("Starting up...");
   mhz19.begin(9600);
   pms7003.begin(9600);
   pinMode(8, OUTPUT); //MAX485 Tranmit Enable
-  //modbus_configure(&Serial, 9600, SERIAL_8N1, 6, 8, TOTAL_REGS_SIZE, 0); //Modbus via MAX485
+  modbus_configure(&Serial, 9600, SERIAL_8N1, 6, 8, TOTAL_REGS_SIZE, 0); //Modbus via MAX485
   runner.init();
   runner.addTask(t1);
   t1.enable();
@@ -44,16 +42,26 @@ void setup() {
 
 void loop() {
   runner.execute();
-}
+  holdingRegs[R00_Dust_10] = PM10;
+  holdingRegs[R01_Dust_25] = PM25;
+  holdingRegs[R02_Dust_100] = PM100;
+  holdingRegs[TOTAL_ERRORS] = modbus_update();
 
-void sensor_pms() {
-  if (pms.read(data)) {
-    Serial.print("PM 1.0 (ug/m3): ");
+    if (pms.read(data)) {
+    /*Serial.print("PM 1.0 (ug/m3): ");
     Serial.println(data.PM_AE_UG_1_0);
     Serial.print("PM 2.5 (ug/m3): ");
     Serial.println(data.PM_AE_UG_2_5);
     Serial.print("PM 10.0 (ug/m3): ");
     Serial.println(data.PM_AE_UG_10_0);
     Serial.println();
+    */
+   PM10 = data.PM_AE_UG_1_0;
+   PM25 = data.PM_AE_UG_2_5;
+   PM100 = data.PM_AE_UG_10_0;
   }
+}
+
+void sensor_pms() {
+
 }
\ No newline at end of file