X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_VOC_DS2438_SHT%20direct%2FDS18B20_DS2438.c;h=2522a0ee013d948722ba6acc08e974506eaba1e6;hp=5b3461c4da69598b4b4cfa6f92ff60b2657401ef;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c
index 5b3461c..2522a0e 100644
--- a/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
+++ b/DS18B20_VOC_DS2438_SHT direct/DS18B20_DS2438.c	
@@ -42,9 +42,9 @@
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/SHT2xV2.h"
 #include "../common/calibr.h"
+#include "../common/owSlave_tools.h"
 
-extern void OWINIT(void);
-extern void EXTERN_SLEEP(void);
+OWST_EXTERN_VARS
 
 
 
@@ -58,24 +58,11 @@ volatile uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 11,0x08, 0x0
 #error "Variable not correct"
 #endif
 
-extern uint8_t mode;
-extern uint8_t gcontrol;
-extern uint8_t reset_indicator;
-extern uint8_t alarmflag;
-volatile uint8_t wdcounter=1;
 extern uint8_t cpsp;
 
+OWST_WDT_ISR
 
-#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
-ISR(WATCHDOG_vect) {
-	#else
-	ISR(WDT_vect) {
-		#endif
-		wdcounter++;
-		if (reset_indicator==1) reset_indicator++;
-		else if (reset_indicator==2) mode=0;
 
-}
 
 
 	typedef union {
@@ -155,12 +142,13 @@ ISR(WATCHDOG_vect) {
 
 
 
-	volatile int16_t am2302_temp;
-	volatile uint16_t am2302_hum;
+	volatile int16_t DS2438_2_TEMP;
+	volatile uint16_t DS2438_2_VAD;
+	volatile uint16_t DS2438_2_VDD=0x01F4;
+
+	OWST_TESTSW
 
 
-	uint8_t userRegister[1];
-	int16_t sRH,sT;
 	double temperatureC,humidityRH,hhum;
 	volatile double l;
 
@@ -183,25 +171,6 @@ ISR(WATCHDOG_vect) {
 	double la[4];
 	uint8_t lainit=1;
 
-	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
@@ -290,7 +259,7 @@ ISR(WATCHDOG_vect) {
 			weekmaxarr[i]=pack2.r_week_max;
 		}
 
-
+		for(uint8_t i=0;i<8;i++) pack2.page6[i]=owid1[i];
 		if (testSW()) {
 			config_info2[5]=12;
 			}else{
@@ -304,27 +273,7 @@ ISR(WATCHDOG_vect) {
 		gcontrol=1;
 		sei();
 		while(1)   {
-			/*if (pack1.config==0x1F) {  //Reset R0
-				pack1.config=0x7F;
-				R0=1;
-				pack2.R0=0;
-				writeEEPROM(EEPROM_R0,0);
-			}
-			if (pack1.config==0x05) {  //Reset all Data
-				pack1.config=0x7F;
-				pack2.r_day_max=1;
-				pack2.r_week_max=1;
-				pack2.tol_d=0;
-				pack2.tol_s8=0;  //Tag faengt mit Einschalten an
-				R0=1;
-				writeEEPROM(EEPROM_R0,0xFF);
-				writeEEPROM(EEPROM_R0d,0xFF);  //Maximum des Tages
-				writeEEPROM(EEPROM_R0w,0xFF); //Maximum der Letzten 7 Tage
-				writeEEPROM(EEPROM_dol,0xFF); //Anzahl der Betriebstage
-				for(uint8_t i=0;i<7;i++) {
-					weekmaxarr[i]=1;
-				}
-			}*/
+			
 			if ((cpsp&0x80)!=0) {
 				if ((cpsp&0x0F)==5) {
 					if (pack2.reset_code==0x01) {
@@ -390,14 +339,13 @@ ISR(WATCHDOG_vect) {
 
 
 				if (testSW()) {
-					am2302_hum=RH;
-					am2302_temp=TC*25.6;
+					DS2438_2_VAD=RH;
+					DS2438_2_TEMP=TC*25.6;
 					config_info2[5]=12;	//10V = 100%
 				}else{
 					hhum=(1.0546-0.000216*TC)*(RH);
-					//am2302_hum=0.318*hhum +76.0;
-					am2302_hum=0.31*hhum +80;
-					am2302_temp=TC*25.6;
+					DS2438_2_VAD=0.31*hhum +80;
+					DS2438_2_TEMP=TC*25.6;
 					config_info2[5]=7;
 				}
 				mr=0;
@@ -456,7 +404,7 @@ ISR(WATCHDOG_vect) {
 				
 			}
 			
-			if (gcontrol==1) {
+			if ((gcontrol&1)==1) {
 				uint16_t w=l;
 				uint8_t t8=w>>4;
 				uint8_t af=0;
@@ -469,27 +417,13 @@ ISR(WATCHDOG_vect) {
 				sei();
 				EXTERN_SLEEP();
 			}
-			if ((gcontrol==2)||(gcontrol==3)) {
+			if (gcontrol) {
 				gcontrol=0;
 				
 			}
 
 			
-			#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-			if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))
-			#endif
-			#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
-			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))
-			#endif
-			{
-
-				MCUCR|=(1<<SE)|(1<<SM1);
-				MCUCR&=~(1<<ISC01);
-			} else {
-				MCUCR|=(1<<SE);
-				MCUCR&=~(1<<SM1);
-			}
-			asm("SLEEP");
+			OWST_MAIN_END
 		}