From c687aff175201cb22e32256e5eccb6a3698e4670 Mon Sep 17 00:00:00 2001
From: hg <devnull@localhost>
Date: Sat, 15 Nov 2014 23:07:02 +0100
Subject: [PATCH] fixes

---
 ModbusThermometer.cpp | 4 ----
 Thermometer.cpp       | 4 ++--
 Thermometer.h         | 2 +-
 ads1210.cpp           | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ModbusThermometer.cpp b/ModbusThermometer.cpp
index da185cf..6e7a1c4 100644
--- a/ModbusThermometer.cpp
+++ b/ModbusThermometer.cpp
@@ -59,10 +59,6 @@ struct {
 } modbusHoldingRegisters;
 
 
-float pt1000(float r) {
-  return (r / PT1000_R0 - 1) / PT1000_Coeff;
-}
-
 void setup() {  
   delay(100);
   led.begin(LED_PIN);
diff --git a/Thermometer.cpp b/Thermometer.cpp
index e413ce1..2285318 100644
--- a/Thermometer.cpp
+++ b/Thermometer.cpp
@@ -1,6 +1,6 @@
 #include "Thermometer.h"
 
-using Thermometer;
+using namespace nsThermometer;
 
 Thermometer::Thermometer() {
 	
@@ -16,4 +16,4 @@ void Thermometer::exec(float r) {
 	temperatureRaw = (r / PT1000_R0 - 1) / PT1000_Coeff;
 
 	
-}
\ No newline at end of file
+}
diff --git a/Thermometer.h b/Thermometer.h
index bc6e706..026b6b4 100644
--- a/Thermometer.h
+++ b/Thermometer.h
@@ -4,7 +4,7 @@
 #include <Arduino.h>
 #include <stdint.h>
 
-namespace {
+namespace nsThermometer {
 	const float R_REF = 3000.0;
 	const float PT1000_R0 = 1000.0;
 	const float PT1000_Coeff = 3.85e-3;
diff --git a/ads1210.cpp b/ads1210.cpp
index ea57c3d..72e5c4c 100644
--- a/ads1210.cpp
+++ b/ads1210.cpp
@@ -76,8 +76,8 @@ void ADS1210::exec() {
 
 		value = res.out;
 		
-		u = ((float)(value / V_MAX)) * U_REF;
-		r = (((float)(V_MAX / value)) - 1.0) * R_REF;
+		u = (((float)value) / ((float)V_MAX)) * U_REF;
+		r = ((((float)V_MAX) / ((float)value)) - 1.0) * R_REF;
 
 		if (value == 0) {
 			// fatal(2);