X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%2FDS18B20_DS2438.c;h=a85c988d89838fa7c8f6c92a68ef8555d5fd5b7f;hp=f097198149734ba3d3f2f175ea263f83e4df914f;hb=a07a7e7b05471927bf3046ee265792231711f8a4;hpb=286630139d0e6355ad62c7cbb0c9fe827cbb7fa7

diff --git a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
index f097198..a85c988 100644
--- a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
@@ -41,7 +41,7 @@
 #include <avr/pgmspace.h>
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/MAX1164x.h"
-#include "../common/I2C/SHT2x.h"
+#include "../common/I2C/SHT2xV2.h"
 #include "../common/calibr.h"
 
 extern void OWINIT(void);
@@ -51,7 +51,7 @@ extern void EXTERN_SLEEP(void);
 
 volatile uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/
 volatile uint8_t owid2[8]={0x26, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x67};/**/
-volatile uint8_t config_info1[26]={0x08,0x01, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
+volatile uint8_t config_info1[26]={0x08,18, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,17,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
 volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x02,0x07,0x00,0x07,17,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
 	
 #if (owid>128) 
@@ -276,9 +276,8 @@ int main(void){
 
 	USI_TWI_Master_Initialise();
 	
-	SHT2x_SoftReset();
-	SHT2x_ReadUserRegister(userRegister);
-	SHT2x_WriteUserRegister(userRegister); //write changed user reg
+	initSHT2x();
+	_delay_ms(100);
 	MAX1164x_config(MAX1164x_S_SEL2|MAX1164x_S_SEL0,CH0_M);//#define MAX1164x_C_CS0
 	_delay_ms(30); //Internal Referenz start
 	//2970 -> 1,5V	
@@ -334,29 +333,24 @@ int main(void){
 				pack2.r_day_max=0;
 			}
 			if (startup!=0) startup--;
-			SHT2x_MeasurePoll(HUMIDITY, &sRH);
-			// --- measure temperature with "Polling Mode" (no hold master) ---
-			SHT2x_MeasurePoll(TEMP, &sT);
-			//-- calculate humidity and temperature --
-			temperatureC = SHT2x_CalcTemperatureC(sT);
-			humidityRH = SHT2x_CalcRH(sRH);
+			getSHT2xHumTemp(&temperatureC,&humidityRH);
 			ip=interp(temperatureC,humidityRH);
 			pack2.ip=ip*1000;
-			humidityRH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
+			double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
 			//humidityRH=humidityRH*10.0;
-			temperatureC =temperatureC *10.0-2;
+			double TC =temperatureC *10.0-2;
 
 
 			if (testSW()) {
-				 am2302_hum= humidityRH*10.0;
-				 am2302_temp=temperatureC*25.6;
+				 am2302_hum=RH*10.0;
+				 am2302_temp=TC*25.6;
 				 //am2302_temp=am2302_temp-45;
 				 config_info2[5]=8;	
 			}else{
-				hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
+				hhum=(1.0546-0.000216*TC)*(RH);
 				//am2302_hum=0.318*hhum +76.0;
 				am2302_hum=0.31*hhum +80;
-				am2302_temp=temperatureC*25.6;
+				am2302_temp=TC*25.6;
 				config_info2[5]=7;
 			}
 			//PORTB&=~(1<<PINB1);
@@ -410,9 +404,8 @@ int main(void){
 					pack2.r_day_max=l*100;
 				}
 			} else if (l<R0) l=R0; //negative Werte am Anfang verhintern
-			l=R0/l;
-			l=log(l);
-			l=l*160*4; //fuer DS18B20
+			l=exp((1-(l/R0))*6.05);// exp((1-($val)/55)*5.75);  (5.75 geht über 125 6.05 geht bis 240... mittlere Linie im Datenblatt)
+			l=l*8; //fuer DS18B20
 			wdcounter=0;
 			
 		}