X-Git-Url: http://git.smho.de/?a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%2FDS18B20_DS2438.c;h=f097198149734ba3d3f2f175ea263f83e4df914f;hb=22b81b6c288ca56f58d064627c310e437f9453a4;hp=3e1aafc465797ac7af501bde4b1798aaa47570bb;hpb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;p=owSlave2.git

diff --git a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
index 3e1aafc..f097198 100644
--- a/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_VOC_DS2438_SHT/DS18B20_DS2438.c
@@ -1,5 +1,4 @@
-	
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -31,6 +30,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+//!!!!!Max Program size 7551 Byte
+
 #define F_CPU 8000000UL
 #include <avr/io.h>
 #include <avr/interrupt.h>
@@ -50,8 +51,8 @@ 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[16]={0x08,0x01, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
-volatile uint8_t config_info2[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x07,0x08, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};	
+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_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) 
 #error "Variable not correct"
@@ -132,7 +133,7 @@ typedef union {
 		uint8_t page5[8];  //41
 		uint8_t page6[8];  //49
 		uint8_t page7[8];  //57
-		//uint8_t crc;  //65
+		
 		#endif
 	};
 } pack2_t;
@@ -158,6 +159,7 @@ uint8_t max_adr=0;
 
 uint16_t weekmaxarr[8];
 
+//Kompensieren der Abhänigkeit von RS/RO von Temperatur und Luftfeuchte
 inline double interp(double t, double h) {
 	double h2;
 	 double t2;
@@ -171,6 +173,27 @@ uint16_t mr;
 uint8_t startup=10;
 double ip;
 
+
+int testSW(void) {
+	uint8_t r;
+	DDRB&=~(1<<PORTB0);  //Eingang
+	 __asm__ __volatile__ ("nop"); 
+	 PORTB|=(1<<PORTB0); //Pullup
+	 __asm__ __volatile__ ("nop"); 
+	 __asm__ __volatile__ ("nop"); 
+	 __asm__ __volatile__ ("nop"); 
+	 __asm__ __volatile__ ("nop"); 
+	 __asm__ __volatile__ ("nop"); 
+	 r=PINB&(1<<PORTB0);
+	 __asm__ __volatile__ ("nop"); 
+	 PORTB&=~(1<<PORTB0); 
+	 __asm__ __volatile__ ("nop"); 
+	DDRB|=(1<<PORTB0);  //Eingang
+	return (r==0);  //Offen mal HIH4030
+	 
+	 
+}
+
 #define EEPROM_R0 0
 #define EEPROM_R0d 2
 #define EEPROM_R0w 4
@@ -210,8 +233,21 @@ void writeEEPROM(uint8_t addr,uint16_t val) {
 }
 
 int main(void){
-	//volatile double test=calibr_hum(20,1,20);
     PRR|=(1<<PRADC);  // adc for save Power
+	PORTA=0xFF;
+	PORTB=0xFF-(1<<PORTB0); //Schalter kann gegen Masse sein und zieht dann immer Strom
+	DDRB|=(1<<PORTB0); //Als Ausgang und 0
+	OWINIT();
+	DDRB|=(1<<PINB1);//Ausgang und 1
+	DDRA|=(1<<PINA0);
+	
+	WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)
+	WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt
+	//(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds
+	(1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds
+
+	MCUSR=0;
+
 	pack1.temp=0x0550;
 	pack1.config=0x7F;
 	pack1.TH=75;
@@ -219,17 +255,7 @@ int main(void){
 	pack1.rrFF=0xFF;
 	pack1.rr00=0;
 	pack1.rr10=0x10;
-	PORTA=0xFF;
-	PORTB=0xFF;
-	OWINIT();
-	PORTB|=(1<<PINB1);
-	DDRB|=(1<<PINB1);
-	PORTA|=(1<<PINA0);
-	DDRA|=(1<<PINA0);
-	
-	MCUCR &=~(1<<PUD); //All Pins Pullup...
-	MCUCR |=(1<<BODS);
-	
+
 	pack2.cmode=0;
 	pack2.R0=readEEPROM(EEPROM_R0,1);
 	R0=pack2.R0/100.0;
@@ -242,12 +268,12 @@ int main(void){
 		weekmaxarr[i]=pack2.r_week_max;
 	}
 
-	WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)
-	WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt
-	//(1<<WDP0) |(1<<WDP2) | (1<<WDP1);    // Set Timeout to ~2 seconds
-	(1<<WDP3) | (1<<WDP0);    // Set Timeout to ~8 seconds
+	if (testSW()) {
+		config_info2[5]=8;
+	}else{
+		config_info2[5]=7;
+	}
 
-	MCUSR=0;
 	USI_TWI_Master_Initialise();
 	
 	SHT2x_SoftReset();
@@ -290,6 +316,7 @@ int main(void){
 				weekmaxarr[7]=pack2.r_day_max;
 				for(uint8_t i=0;i<7;i++) {
 					weekmaxarr[i]=weekmaxarr[i+1];
+					//maximum of week
 					if (weekmaxarr[i]>pack2.r_week_max) pack2.r_week_max=weekmaxarr[i];
 				}
 				if (pack2.tol_d>7) {
@@ -297,7 +324,8 @@ int main(void){
 				} else {
 					pack2.R0=pack2.r_day_max;
 				}
-				R0=pack2.R0/100.0-0.5*(pack2.R0/100-R0);
+				//R0=//R0-0.5*(pack2.R0/100-R0);
+				R0=R0-(R0-pack2.R0/100.0)*0.5	;
 				pack2.R0=R0*100;
 				writeEEPROM(EEPROM_R0,pack2.R0);
 				writeEEPROM(EEPROM_R0d,pack2.r_day_max);  //Maximum des Tages
@@ -314,21 +342,31 @@ int main(void){
 			humidityRH = SHT2x_CalcRH(sRH);
 			ip=interp(temperatureC,humidityRH);
 			pack2.ip=ip*1000;
-			humidityRH=calibr_hum(temperatureC,-0.45,humidityRH)*10.0;
+			humidityRH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
 			//humidityRH=humidityRH*10.0;
-			temperatureC =temperatureC *10.0-4.5;
-			hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
-			am2302_hum=0.318*hhum +76.0;
-			am2302_temp=temperatureC*25.6;
+			temperatureC =temperatureC *10.0-2;
+
+
+			if (testSW()) {
+				 am2302_hum= humidityRH*10.0;
+				 am2302_temp=temperatureC*25.6;
+				 //am2302_temp=am2302_temp-45;
+				 config_info2[5]=8;	
+			}else{
+				hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
+				//am2302_hum=0.318*hhum +76.0;
+				am2302_hum=0.31*hhum +80;
+				am2302_temp=temperatureC*25.6;
+				config_info2[5]=7;
+			}
 			//PORTB&=~(1<<PINB1);
 			mr=0;
 //Kritische Sektion !___Ein Breakpoint in dieser Section kann den TGS8100 zerstoeren!___________________________
-			PORTB&=~(1<<PINB1);
+			PORTB&=~(1<<PINB1); //Auf 0 Ziehen
 			_delay_us(150);
 			mr+=MAX1164x_read();
 			_delay_us(150);
 			mr+=MAX1164x_read();
-			
 			PORTB|=(1<<PINB1);
 //ENDE Kritische Sektion !______________________________
 			//l=mr/2.0*2.048/4096; 
@@ -354,7 +392,6 @@ int main(void){
 				
 				
 			}
-			//hr=l*10000.0;
 			pack2.VS=mr*5/2;
 			l=mr/4000.0;
 			l=( 3/l- 1) *30;
@@ -372,13 +409,10 @@ int main(void){
 				if (l*100>pack2.r_day_max) {
 					pack2.r_day_max=l*100;
 				}
-			}
-			 l=l/R0;
-			l=log(1/l);
+			} else if (l<R0) l=R0; //negative Werte am Anfang verhintern
+			l=R0/l;
+			l=log(l);
 			l=l*160*4; //fuer DS18B20
-		//	if (l>500) {
-		//		l=100;
-		//	}
 			wdcounter=0;
 			
 		}