From d6770ca39c487a4a383abce536636fcf8330f083 Mon Sep 17 00:00:00 2001 From: hg Date: Mon, 17 Nov 2014 19:20:07 +0100 Subject: [PATCH] small fixes --- Config.h | 6 +++--- ModbusThermometer.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Config.h b/Config.h index c29fc36..4aadae0 100644 --- a/Config.h +++ b/Config.h @@ -21,8 +21,8 @@ namespace Config { const int MAGIC = 0; const int ADC1START = 4; const int ADC2START = 12; - const int THERMO1ALPHA = 20; - const int THERMO2ALPHA = 24; + const int THERMO1START = 20; + const int THERMO2START = 24; void initialize(); bool isInitialized(); @@ -35,4 +35,4 @@ namespace Config { } -#endif // _config_h_ \ No newline at end of file +#endif // _config_h_ diff --git a/ModbusThermometer.cpp b/ModbusThermometer.cpp index 67551fe..503157f 100644 --- a/ModbusThermometer.cpp +++ b/ModbusThermometer.cpp @@ -102,8 +102,8 @@ void loop() { modbusHoldingRegisters.adc1U.in = ads1210_1.u; modbusHoldingRegisters.adc1R.in = ads1210_1.r; thermometer1.exec(ads1210_1.r); - modbusHoldingRegisters.temperature1Raw = thermometer1.temperatureRaw; - modbusHoldingRegisters.temperature1 = thermometer1.temperatur; + modbusHoldingRegisters.temperature1Raw.in = thermometer1.temperatureRaw; + modbusHoldingRegisters.temperature1.in = thermometer1.temperature; ads1210_2.exec(); @@ -111,8 +111,8 @@ void loop() { modbusHoldingRegisters.adc2U.in = ads1210_2.u; modbusHoldingRegisters.adc2R.in = ads1210_2.r; thermometer2.exec(ads1210_2.r); - modbusHoldingRegisters.temperature2Raw = thermometer2.temperatureRaw; - modbusHoldingRegisters.temperature2 = thermometer2.temperatur; + modbusHoldingRegisters.temperature2Raw.in = thermometer2.temperatureRaw; + modbusHoldingRegisters.temperature2.in = thermometer2.temperature; if (secondTick.check() == 1) { led.toggle();