wn/ModbusThermometer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
hg
2014-11-17 19:20:07 +01:00
parent 33a8a35bf8
commit d6770ca39c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Config.h
View File

@ -21,8 +21,8 @@ namespace Config {
const int MAGIC = 0; const int MAGIC = 0;
const int ADC1START = 4; const int ADC1START = 4;
const int ADC2START = 12; const int ADC2START = 12;
const int THERMO1ALPHA = 20; const int THERMO1START = 20;
const int THERMO2ALPHA = 24; const int THERMO2START = 24;
void initialize(); void initialize();
bool isInitialized(); bool isInitialized();
@ -35,4 +35,4 @@ namespace Config {
} }
#endif // _config_h_ #endif // _config_h_

8
ModbusThermometer.cpp
View File

@ -102,8 +102,8 @@ void loop() {
modbusHoldingRegisters.adc1U.in = ads1210_1.u; modbusHoldingRegisters.adc1U.in = ads1210_1.u;
modbusHoldingRegisters.adc1R.in = ads1210_1.r; modbusHoldingRegisters.adc1R.in = ads1210_1.r;
thermometer1.exec(ads1210_1.r); thermometer1.exec(ads1210_1.r);
modbusHoldingRegisters.temperature1Raw = thermometer1.temperatureRaw; modbusHoldingRegisters.temperature1Raw.in = thermometer1.temperatureRaw;
modbusHoldingRegisters.temperature1 = thermometer1.temperatur; modbusHoldingRegisters.temperature1.in = thermometer1.temperature;
ads1210_2.exec(); ads1210_2.exec();
@ -111,8 +111,8 @@ void loop() {
modbusHoldingRegisters.adc2U.in = ads1210_2.u; modbusHoldingRegisters.adc2U.in = ads1210_2.u;
modbusHoldingRegisters.adc2R.in = ads1210_2.r; modbusHoldingRegisters.adc2R.in = ads1210_2.r;
thermometer2.exec(ads1210_2.r); thermometer2.exec(ads1210_2.r);
modbusHoldingRegisters.temperature2Raw = thermometer2.temperatureRaw; modbusHoldingRegisters.temperature2Raw.in = thermometer2.temperatureRaw;
modbusHoldingRegisters.temperature2 = thermometer2.temperatur; modbusHoldingRegisters.temperature2.in = thermometer2.temperature;
if (secondTick.check() == 1) { if (secondTick.check() == 1) {
led.toggle(); led.toggle();