Second Test
This commit is contained in:
parent
d2cf8549c8
commit
599985fd75
|
@ -12,4 +12,5 @@
|
||||||
platform = atmelavr
|
platform = atmelavr
|
||||||
board = pro16MHzatmega328
|
board = pro16MHzatmega328
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps = PMS Library, TaskScheduler
|
lib_deps = PMS Library, TaskScheduler
|
||||||
|
monitor_speed = 57600
|
38
src/main.cpp
38
src/main.cpp
|
@ -16,27 +16,25 @@ Task t1(5000, TASK_FOREVER, &sensor_pms);
|
||||||
//////////////// MODBUS Registers ///////////////////
|
//////////////// MODBUS Registers ///////////////////
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
R00_OneWireSensors_Anzahl,
|
R00_Dust_10,
|
||||||
R01_DHT22Sensors_Anzahl,
|
R01_Dust_25,
|
||||||
R02_Temp00,
|
R02_Dust_100,
|
||||||
R03_Temp01,
|
|
||||||
R04_Temp02,
|
|
||||||
R05_Temp03,
|
|
||||||
R06_Temp04,
|
|
||||||
R07_Temp05,
|
|
||||||
TOTAL_ERRORS,
|
TOTAL_ERRORS,
|
||||||
TOTAL_REGS_SIZE
|
TOTAL_REGS_SIZE
|
||||||
};
|
};
|
||||||
unsigned int holdingRegs[TOTAL_REGS_SIZE]; // function 3 and 16 register array
|
unsigned int holdingRegs[TOTAL_REGS_SIZE]; // function 3 and 16 register array
|
||||||
|
unsigned int PM10;
|
||||||
|
unsigned int PM25;
|
||||||
|
unsigned int PM100;
|
||||||
//////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
Serial.begin(57600);
|
//Serial.begin(57600);
|
||||||
Serial.print("Starting up...");
|
//Serial.print("Starting up...");
|
||||||
mhz19.begin(9600);
|
mhz19.begin(9600);
|
||||||
pms7003.begin(9600);
|
pms7003.begin(9600);
|
||||||
pinMode(8, OUTPUT); //MAX485 Tranmit Enable
|
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.init();
|
||||||
runner.addTask(t1);
|
runner.addTask(t1);
|
||||||
t1.enable();
|
t1.enable();
|
||||||
|
@ -44,16 +42,26 @@ void setup() {
|
||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
runner.execute();
|
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)) {
|
||||||
if (pms.read(data)) {
|
/*Serial.print("PM 1.0 (ug/m3): ");
|
||||||
Serial.print("PM 1.0 (ug/m3): ");
|
|
||||||
Serial.println(data.PM_AE_UG_1_0);
|
Serial.println(data.PM_AE_UG_1_0);
|
||||||
Serial.print("PM 2.5 (ug/m3): ");
|
Serial.print("PM 2.5 (ug/m3): ");
|
||||||
Serial.println(data.PM_AE_UG_2_5);
|
Serial.println(data.PM_AE_UG_2_5);
|
||||||
Serial.print("PM 10.0 (ug/m3): ");
|
Serial.print("PM 10.0 (ug/m3): ");
|
||||||
Serial.println(data.PM_AE_UG_10_0);
|
Serial.println(data.PM_AE_UG_10_0);
|
||||||
Serial.println();
|
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() {
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue