X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_BMP280_DS2438_SHT%2FDS18B20_DS2438.c;h=4dc0ba0153a5b04dbacdf7d0bedddf747e00986a;hp=e379db819dec80dd555dc40ce4b56792511c1ebd;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
index e379db8..4dc0ba0 100644
--- a/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
+++ b/DS18B20_BMP280_DS2438_SHT/DS18B20_DS2438.c
@@ -37,13 +37,13 @@
 #include <avr/wdt.h>
 #include <avr/sleep.h>
 #include <avr/pgmspace.h>
-#include "../common/I2C/USI_TWI_Master.h"
-#include "../common/I2C/SHT2x.h"
+#include "../common/I2C/TWI_Master.h"
+#include "../common/I2C/SHT2xV2.h"
 #include "../common/I2C/BMP280.h"
 #include "../common/calibr.h"
+#include "../common/owSlave_tools.h"
 
-extern void OWINIT();
-extern void EXTERN_SLEEP();
+OWST_EXTERN_VARS
 
 
 uint8_t owid1[8]={0x28, 0xA3, 0xD9, 0x84, 0x00, 0x16, 0x05, 0x18};/**/
@@ -53,37 +53,8 @@ uint8_t config_info1[26]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,14,0x
 uint8_t config_info2[26]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x02,7,0x00,7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
 	
-#if (owid>128) 
-#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=3;
-
-
-#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 
-	//sleep_disable();          // Disable Sleep on Wakeup
-	wdcounter++;
-	if (reset_indicator==1) reset_indicator++;
-	else if (reset_indicator==2) mode=0;
-/*	if (timeout==2) {
-		DIS_TIMER;
-		EN_OWINT;
-		mode=OWM_SLEEP;
-	}
-	timeout++;*/
-	//sleep_enable();           // Enable Sleep Mode
-
-}
 
+OWST_WDT_ISR
 
 typedef union {
 	volatile uint8_t bytes[8];
@@ -132,43 +103,23 @@ volatile pack2_t pack2;
 
 
 
-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
 
-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);
-	
-	
-}
 
 uint8_t userRegister[1];
 int16_t sRH,sT;
-volatile double temperatureC,humidityRH;
+double temperatureC,humidityRH;
 volatile double l;
 	uint32_t P;
 	int32_t t;
 
 int main(void){
-    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
-	
+	 OWST_INIT_USI_ON
+   
 	pack1.temp=0x0550;
 	pack1.config=0x7F;
 	pack1.TH=75;
@@ -179,69 +130,53 @@ int main(void){
 	PORTA=0xFF;
 	PORTB=0xFF;
 	OWINIT();
+	OWST_EN_PULLUP
 
-	ACSR|=(1<<ACD);  //Disable Comparator
-	ADCSRB|=(1<<ACME); //Disable Analog multiplexer
-	MCUCR &=~(1<<PUD); //All Pins Pullup...
-	//MCUCR &=~(1<<BODS);
-
+	OWST_WDR_CONFIG8
 	
-	WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)
-	WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt
-	(1<<WDP3) | (1<<WDP0);   // Set Timeout to ~8 seconds
 	if (testSW()) {
-		config_info2[5]=8;
+		config_info2[5]=12;
 		}else{
 		config_info2[5]=7;
 	}
 	pack2.page3[0]=0xF1;
 
 	MCUSR=0;
-	USI_TWI_Master_Initialise();
+	TWI_Master_Initialise();
 	
-	SHT2x_SoftReset();
-	SHT2x_ReadUserRegister(userRegister);
-	//(userRegister & ~SHT2x_RES_MASK) | SHT2x_RES_10_13BIT;
-	SHT2x_WriteUserRegister(userRegister); //write changed user reg
-	// --- measure humidity with "Hold Master Mode (HM)" ---
-	//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);
+	initSHT2x();
+	_delay_ms(10);
 	bmp280Init();
 	gcontrol=1;
 	sei();
     while(1)   {
+		 
 		if (gcontrol) {
-			wdcounter=3;
+			wdcounter=2;
 			
 		}
 
 		if (wdcounter>2) {
-			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);
-			humidityRH=calibr_hum(temperatureC,-0.45,humidityRH)*10.0;
-			temperatureC=temperatureC*10.0-4.5;
+				getSHT2xHumTemp(&temperatureC,&humidityRH);
+				double RH=calibr_hum(temperatureC,-0.2,humidityRH)*10.0;
+				double TC =temperatureC *10.0-2;
+
 			 if (testSW()) {
-				 am2302_hum= humidityRH*10.0;
-				 am2302_temp=temperatureC*25.6;
+					DS2438_2_VAD=RH;
+					DS2438_2_TEMP=(double)TC*25.6;
 				 //am2302_temp=am2302_temp-20;
-				 config_info2[5]=8;
+				 config_info2[5]=12;
+				 DS2438_2_VDD=0x01F4;
 				 
 				 }else{
 				 
-				 double hhum=(1.0546-0.000216*temperatureC)*(humidityRH);
+				 double 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;
+				 DS2438_2_VAD=0.31*hhum +80;
+				 DS2438_2_TEMP=TC*25.6;
 				 //am2302_temp=am2302_temp-20;
 				 config_info2[5]=7;
+				 DS2438_2_VDD=0x01F4;
 			 }
 			wdcounter=0;
 		}
@@ -269,23 +204,7 @@ int main(void){
 			
 		}
 
-		
-#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);
-		}
-		//MCUCR&=~(1<<ISC01);
-		asm("SLEEP");
+		OWST_MAIN_END	
    }