From 404975ec06457c1b1fe3128298e1c2728df674d6 Mon Sep 17 00:00:00 2001
From: hg <devnull@localhost>
Date: Mon, 17 Nov 2014 22:08:58 +0100
Subject: [PATCH] small fixes

---
 ModbusThermometer.cpp | 18 +++++++++---------
 Thermometer.cpp       |  2 +-
 ads1210.cpp           |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ModbusThermometer.cpp b/ModbusThermometer.cpp
index b401630..ffe0fa9 100644
--- a/ModbusThermometer.cpp
+++ b/ModbusThermometer.cpp
@@ -87,9 +87,9 @@ void setup() {
   uptimeSeconds = 0;
 
   for (uint8_t i = 0; i < NUM_OF_CHANNELS; i++) {
-    modbusHoldingRegisters.channelVariables[i].calOffset = ads1210[i].calOffset;
-    modbusHoldingRegisters.channelVariables[i].calFactor = ads1210[i].calFactor;
-    modbusHoldingRegisters.channelVariables[i].alpha = thermometer[i].alpha;
+    modbusHoldingRegisters.channelVariables[i].calOffset.in = ads1210[i].calOffset;
+    modbusHoldingRegisters.channelVariables[i].calFactor.in = ads1210[i].calFactor;
+    modbusHoldingRegisters.channelVariables[i].alpha.in = thermometer[i].alpha;
   }
 }
 
@@ -104,14 +104,14 @@ void loop() {
     modbusHoldingRegisters.channelVariables[i].temperatureRaw.in = thermometer[i].temperatureRaw;
     modbusHoldingRegisters.channelVariables[i].temperature.in = thermometer[i].temperature;
     
-    if (modbusHoldingRegisters.channelVariables[i].calOffset != ads1210[i].calOffset) {
-      ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calOffset;
+    if (modbusHoldingRegisters.channelVariables[i].calOffset.in != ads1210[i].calOffset) {
+      ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calOffset.in;
     }
-    if (modbusHoldingRegisters.channelVariables[i].calFactor != ads1210[i].calFactor) {
-      ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calFactor;
+    if (modbusHoldingRegisters.channelVariables[i].calFactor.in != ads1210[i].calFactor) {
+      ads1210[i].calOffset = modbusHoldingRegisters.channelVariables[i].calFactor.in;
     }
-    if (modbusHoldingRegisters.channelVariables[i].alpha != thermometer[i].alpha) {
-      thermometer[i].calOffset = modbusHoldingRegisters.channelVariables[i].alpha;
+    if (modbusHoldingRegisters.channelVariables[i].alpha.in != thermometer[i].alpha) {
+      thermometer[i].alpha = modbusHoldingRegisters.channelVariables[i].alpha.in;
     }
 	}
 
diff --git a/Thermometer.cpp b/Thermometer.cpp
index 772426c..1516741 100644
--- a/Thermometer.cpp
+++ b/Thermometer.cpp
@@ -22,7 +22,7 @@ void Thermometer::begin(bool initializeConfig, int eepromAddr) {
 	}
 	
 	m_lastSmoothedTemperature = INVALID_TEMPERATURE;
-	alpha = Config::setFloat(m_eepromAddr + CONFIG_ALPHA);
+	alpha = Config::getFloat(m_eepromAddr + CONFIG_ALPHA);
 }
 
 
diff --git a/ads1210.cpp b/ads1210.cpp
index 9af83f8..367932d 100644
--- a/ads1210.cpp
+++ b/ads1210.cpp
@@ -112,8 +112,8 @@ void ADS1210::begin(uint8_t csPin, uint8_t drdyPin, bool initializeConfig, int e
 	
 	if (initializeConfig) {
 	  // set default values
-    Config::setFloat(m_eepromAddr + CONFIG_CAL_OFFSET, 0.0);
-    Config::setFloat(m_eepromAddr + CONFIG_CAL_FACTOR, 1.0)
+		Config::setFloat(m_eepromAddr + CONFIG_CAL_OFFSET, 0.0);
+		Config::setFloat(m_eepromAddr + CONFIG_CAL_FACTOR, 1.0);
 	}
 
 	// initialization of SPI