From cb329623af7a0fb72401046e33f2c2abcf026adf Mon Sep 17 00:00:00 2001
From: hg <devnull@localhost>
Date: Sun, 16 Nov 2014 18:45:13 +0100
Subject: [PATCH] fixes in config stuff

---
 .cproject             | 2 ++
 .project              | 5 +++++
 Config.cpp            | 3 ++-
 ModbusThermometer.cpp | 4 ++--
 ads1210.cpp           | 3 ++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.cproject b/.cproject
index 70c1e34..0995c85 100644
--- a/.cproject
+++ b/.cproject
@@ -26,6 +26,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/EEPROM}&quot;"/>
 								</option>
 								<inputType id="it.baeyens.arduino.compiler.cpp.sketch.input.1599065484" name="CPP source files" superClass="it.baeyens.arduino.compiler.cpp.sketch.input"/>
 							</tool>
@@ -34,6 +35,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/SPI}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/core}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/arduino/variant}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/ModbusThermometer/Libraries/EEPROM}&quot;"/>
 								</option>
 								<inputType id="it.baeyens.arduino.compiler.c.sketch.input.487192470" name="C Source Files" superClass="it.baeyens.arduino.compiler.c.sketch.input"/>
 							</tool>
diff --git a/.project b/.project
index e9759fa..fa6e6ec 100644
--- a/.project
+++ b/.project
@@ -26,6 +26,11 @@
 		<nature>it.baeyens.arduinonature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Libraries/EEPROM</name>
+			<type>2</type>
+			<locationURI>ArduinoHardwareLibPath/EEPROM</locationURI>
+		</link>
 		<link>
 			<name>Libraries/SPI</name>
 			<type>2</type>
diff --git a/Config.cpp b/Config.cpp
index 13e7ae4..054ef39 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -1,3 +1,4 @@
+#include <EEPROM.h>
 #include "Config.h"
 
 
@@ -17,7 +18,7 @@ void Config::setFloat(int pos, float value) {
   }
 }
 
-unsigned int Config::getUInt32(int pos) {
+uint32_t Config::getUInt32(int pos) {
   u_uint32 u;
   for (uint8_t i = 0; i < sizeof(uint32_t); i++) {
     u.e[i] = EEPROM.read(pos + i);
diff --git a/ModbusThermometer.cpp b/ModbusThermometer.cpp
index bf0982a..a19eace 100644
--- a/ModbusThermometer.cpp
+++ b/ModbusThermometer.cpp
@@ -64,8 +64,8 @@ void setup() {
   delay(100);
   Config::initialize();
   led.begin(LED_PIN);
-  ads1210_1.begin(ADC_1_CS_PIN, ADC_1_RDY_PIN);
-  ads1210_2.begin(ADC_2_CS_PIN, ADC_2_RDY_PIN);
+  ads1210_1.begin(ADC_1_CS_PIN, ADC_1_RDY_PIN, Config::ADC1START);
+  ads1210_2.begin(ADC_2_CS_PIN, ADC_2_RDY_PIN, Config::ADC2START);
   modbus_configure(&Serial, MODBUS_BAUD, SERIAL_8N2, MODBUS_ID, MODBUS_TX_ENABLE_PIN,
                    sizeof(modbusHoldingRegisters), (uint16_t*)(&modbusHoldingRegisters));
   uptimeSeconds = 0;
diff --git a/ads1210.cpp b/ads1210.cpp
index f1b342c..071e756 100644
--- a/ads1210.cpp
+++ b/ads1210.cpp
@@ -97,11 +97,12 @@ void ADS1210::setGain(uint8_t gain) const {
 	writeRegister(ADDR_CMR2, cmr);
 }
 
-void ADS1210::begin(uint8_t csPin, uint8_t drdyPin) {
+void ADS1210::begin(uint8_t csPin, uint8_t drdyPin, int eepromAddr) {
 	static bool onlyOnce = false;
 
 	m_csPin = csPin;
 	m_drdyPin = drdyPin;
+	m_eepromAddr = eepromAddr;
 
 	// initialization of SPI
 	// Serial << "Start SPI initialization ... ";