X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2438_DHT22%2FDS2438_DHT22.c;fp=DS2438_DHT22%2FDS2438_DHT22.c;h=d2fbef2bc035b3691127a0c19d2e3482add193d1;hp=a182bed90e65f679873c0c821c56f8b44a4fd979;hb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;hpb=cd92472e6fd63693741f8e168123a4182802651b

diff --git a/DS2438_DHT22/DS2438_DHT22.c b/DS2438_DHT22/DS2438_DHT22.c
index a182bed..d2fbef2 100644
--- a/DS2438_DHT22/DS2438_DHT22.c
+++ b/DS2438_DHT22/DS2438_DHT22.c
@@ -1,301 +1,301 @@
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//  * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the
-//    distribution.
-//  * All advertising materials mentioning features or use of this
-//    software must display the following acknowledgement: This product
-//    includes software developed by tm3d.de and its contributors.
-//  * Neither the name of tm3d.de nor the names of its contributors may
-//    be used to endorse or promote products derived from this software
-//    without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#define F_CPU 8000000UL
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/wdt.h>
-#include <avr/sleep.h>
-#include <avr/pgmspace.h>
-
-
-extern void OWINIT();
-extern void EXTERN_SLEEP();
-
-uint8_t owid[8]={0x26, 0xA2, 0xD9, 0x84, 0xDD, 0xDD, 0x05, 0xCE};/**/
-uint8_t config_info[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-
-
-extern uint8_t mode;
-extern uint8_t gcontrol;
-extern uint8_t reset_indicator;
-extern uint8_t alarmflag;
-
-volatile uint8_t wdcounter;
-
-
-typedef union {
-
-	volatile uint8_t bytes[64];
-	struct {
-		uint8_t status;  //1
-		int16_t temp;  //2
-		uint16_t voltage;  //4
-		uint16_t current;  //6
-		uint8_t threshold; //8
-		
-		uint8_t page1[8]; //9
-		uint8_t page2[8]; //17
-		uint8_t page3[8]; //25
-		uint8_t page4[8];  //33
-		uint8_t page5[8];  //41
-		uint8_t page6[8];  //49
-		uint8_t page7[8];  //57
-		//uint8_t crc;  //65
-	};
-} pack_t;
-volatile pack_t pack;
-
-
-#define DDR_SENSOR   DDRA
-#define PORT_SENSOR  PORTA
-#define PIN_SENSOR   PINA
-#define SENSOR       PINA2
-
-#define SENSOR_sda_out		DDR_SENSOR |= (1 << SENSOR)
-#define SENSOR_sda_in			DDR_SENSOR &= ~(1 << SENSOR);PORT_SENSOR |= (1 << SENSOR) // release sda => hi in consequence of pullup
-#define SENSOR_sda_low    PORT_SENSOR &= ~(1 << SENSOR)
-#define SENSOR_is_hi			PIN_SENSOR & (1 << SENSOR)
-#define SENSOR_is_low		!(PIN_SENSOR & (1 << SENSOR))
-
-volatile int16_t am2302_temp;
-volatile uint16_t am2302_hum;
-
-
-uint8_t am_wait(uint8_t _time,uint8_t _signal){
-	TCNT1=0;
-	while(TCNT1==0);
-	if (_signal)
-	while((SENSOR_is_hi)&&(TCNT1<_time)) {}
-	else
-	while((SENSOR_is_low)&&(TCNT1<_time)) {}
-	
-	if (TCNT1>=_time) {return 1;}
-	return 0;
-}
-
-volatile uint8_t am2302_mode=0;
-volatile uint8_t timeout=0;
-
-
-
-
-
-
-uint8_t userRegister[1];
-int16_t sRH,sT;
-volatile double temperatureC,humidityRH;
-volatile double l;
-
-#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;
-}
-	
-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 am2302() {
-	int16_t lam2302_temp;
-	uint16_t lam2302_hum;
-	uint8_t rSREG;
-	uint8_t sensor_data[5];
-
-	TCCR1B=(1<<CS11); //Clock/8 1µs
-
-	SENSOR_sda_out;
-	SENSOR_sda_low;	// MCU start signal
-	TCNT1=0;while(TCNT1==0);while(TCNT1<250) {}// start signal (pull sda down for min 0.8ms and maximum 20ms)
-	TCNT1=0;while(TCNT1==0);while(TCNT1<250) {}// start signal (pull sda down for min 0.8ms and maximum 20ms)
-	SENSOR_sda_in;
-	if (am_wait(200,1)) return 2;
-
-	// AM2302 response signal min: 75us typ:80us max:85us or 500us different types
-	if (am_wait(100,0)) return 3;
-	if (am_wait(100,1)) return 4;
-	
-	for(uint8_t i = 0; i < 5; i++)	{
-		uint8_t sensor_byte = 0;
-		for(uint8_t j = 1; j <= 8; j++) {// get 8 bits from sensor
-			if (am_wait(88,0)) return 5;
-			
-			TCNT1=0;while(TCNT1==0);;while(TCNT1<35)		;
-			sensor_byte <<= 1; // add new lower byte
-			if (SENSOR_is_hi) {// if sda high after 30us => bit=1 else bit=0
-				sensor_byte |= 1;
-				if (am_wait(45,1)) return 6;// 30us - 75us = 45us
-			}
-		}
-		sensor_data[i] = sensor_byte;
-	}
-
-	// checksum
-	if ( ((sensor_data[0]+sensor_data[1]+sensor_data[2]+sensor_data[3]) & 0xff ) != sensor_data[4])
-	{
-		PORTB&=~(1<<PINB0);
-		return 7;
-	}
-	if (sensor_data[2]&0x80) { //minus
-		sensor_data[2]&=~(0x80);
-		lam2302_temp=-((sensor_data[2]<<8) + sensor_data[3]);
-	} else
-		lam2302_temp=((sensor_data[2]<<8) + sensor_data[3]);
-	if (!testSW()) {
-		double htemp=lam2302_temp;
-        double hhum=(1.0546-0.000216*htemp)*((sensor_data[0]<<8) + sensor_data[1]);
-		//htemp=Temperauter * 10 
-		//lam2302_hum=0.318*hhum +76;
-		lam2302_hum=0.31*hhum +80; //hhum = Hum*10 -> 5V also all *5
-		config_info[5]=7;
-	}
-	else {
-		
-		lam2302_hum=((sensor_data[0]<<8) + sensor_data[1]);
-		config_info[5]=12;
-	}
-	lam2302_temp=lam2302_temp*25.6;
-	rSREG=SREG;
-	cli();
-	am2302_hum=lam2302_hum;
-	am2302_temp=lam2302_temp;
-	SREG=rSREG;
-	return 0;
-}
-
-
-
-
-
-
-
-
-	int main(void){
-		PRR|=(1<<PRUSI)|(1<<PRADC);   // adc and usi 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();
-
-		ACSR|=(1<<ACD);  //Disable Comparator
-		ADCSRB|=(1<<ACME); //Disable Analog multiplexer
-		MCUCR &=~(1<<PUD); //All Pins Pullup...
-		MCUCR |=(1<<BODS);
-
-		
-		DDRA|=(1<<PINA1); //stromversorgung
-#define SENSON PORTA|=(1<<PINA1);
-#define SENSOFF PORTA&=~(1<<PINA1);
-
-		// Set up Watch Dog Timer for Inactivity
-		WDTCSR |= (1<<WDCE) ;   // Enable the WD Change Bit
-		WDTCSR =   (1<<WDIE) |              // Enable WDT Interrupt
-			(1<<WDP2) | (1<<WDP1);   // Set Timeout to ~2 seconds		
-		
-		if (testSW()) {
-			config_info[5]=12;  //hum *10
-			}else{
-			config_info[5]=7; //HIH4031
-		}
-		
-		uint8_t i;
-		for(i=0;i<64;i++) pack.bytes[i]=0;
-		MCUSR=0;
-		
-		uint8_t err;
-		uint8_t pn=1;
-		SENSON
-		_delay_ms(4000);
-		err =am2302();
-		
-		sei();
-		
-		while(1)   {
-			if (gcontrol) {
-				if (wdcounter>2) {
-					wdcounter=0;
-					SENSON
-				}
-				gcontrol=0;
-			}
-			if (wdcounter==2) {
-				err=am2302();
-				if (err!=0) {
-					pack.page3[pn]=err;
-					pn=pn+1;if (pn>31) pn=1;
-				}
-				SENSOFF
-				wdcounter=3;
-			}
-			if (wdcounter>=16) {
-				wdcounter=0;
-				SENSON
-			}
-			
-			
-
-			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))	  {
-				MCUCR|=(1<<SE)|(1<<SM1);
-				MCUCR&=~(1<<ISC01);
-				} else {
-				MCUCR|=(1<<SE);
-				MCUCR&=~(1<<SM1);
-			}
-			asm("SLEEP");
-		}
-
-
+// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//  * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//  * Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the
+//    distribution.
+//  * All advertising materials mentioning features or use of this
+//    software must display the following acknowledgement: This product
+//    includes software developed by tm3d.de and its contributors.
+//  * Neither the name of tm3d.de nor the names of its contributors may
+//    be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#define F_CPU 8000000UL
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <avr/wdt.h>
+#include <avr/sleep.h>
+#include <avr/pgmspace.h>
+
+
+extern void OWINIT();
+extern void EXTERN_SLEEP();
+
+uint8_t owid[8]={0x26, 0xA2, 0xD9, 0x84, 0xDD, 0xDD, 0x05, 0xCE};/**/
+uint8_t config_info[16]={0x01,0x06, 0x05,0x08, 0x04,0x07, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+
+
+extern uint8_t mode;
+extern uint8_t gcontrol;
+extern uint8_t reset_indicator;
+extern uint8_t alarmflag;
+
+volatile uint8_t wdcounter;
+
+
+typedef union {
+
+	volatile uint8_t bytes[64];
+	struct {
+		uint8_t status;  //1
+		int16_t temp;  //2
+		uint16_t voltage;  //4
+		uint16_t current;  //6
+		uint8_t threshold; //8
+		
+		uint8_t page1[8]; //9
+		uint8_t page2[8]; //17
+		uint8_t page3[8]; //25
+		uint8_t page4[8];  //33
+		uint8_t page5[8];  //41
+		uint8_t page6[8];  //49
+		uint8_t page7[8];  //57
+		//uint8_t crc;  //65
+	};
+} pack_t;
+volatile pack_t pack;
+
+
+#define DDR_SENSOR   DDRA
+#define PORT_SENSOR  PORTA
+#define PIN_SENSOR   PINA
+#define SENSOR       PINA2
+
+#define SENSOR_sda_out		DDR_SENSOR |= (1 << SENSOR)
+#define SENSOR_sda_in			DDR_SENSOR &= ~(1 << SENSOR);PORT_SENSOR |= (1 << SENSOR) // release sda => hi in consequence of pullup
+#define SENSOR_sda_low    PORT_SENSOR &= ~(1 << SENSOR)
+#define SENSOR_is_hi			PIN_SENSOR & (1 << SENSOR)
+#define SENSOR_is_low		!(PIN_SENSOR & (1 << SENSOR))
+
+volatile int16_t am2302_temp;
+volatile uint16_t am2302_hum;
+
+
+uint8_t am_wait(uint8_t _time,uint8_t _signal){
+	TCNT1=0;
+	while(TCNT1==0);
+	if (_signal)
+	while((SENSOR_is_hi)&&(TCNT1<_time)) {}
+	else
+	while((SENSOR_is_low)&&(TCNT1<_time)) {}
+	
+	if (TCNT1>=_time) {return 1;}
+	return 0;
+}
+
+volatile uint8_t am2302_mode=0;
+volatile uint8_t timeout=0;
+
+
+
+
+
+
+uint8_t userRegister[1];
+int16_t sRH,sT;
+volatile double temperatureC,humidityRH;
+volatile double l;
+
+#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;
+}
+	
+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 am2302() {
+	int16_t lam2302_temp;
+	uint16_t lam2302_hum;
+	uint8_t rSREG;
+	uint8_t sensor_data[5];
+
+	TCCR1B=(1<<CS11); //Clock/8 1µs
+
+	SENSOR_sda_out;
+	SENSOR_sda_low;	// MCU start signal
+	TCNT1=0;while(TCNT1==0);while(TCNT1<250) {}// start signal (pull sda down for min 0.8ms and maximum 20ms)
+	TCNT1=0;while(TCNT1==0);while(TCNT1<250) {}// start signal (pull sda down for min 0.8ms and maximum 20ms)
+	SENSOR_sda_in;
+	if (am_wait(200,1)) return 2;
+
+	// AM2302 response signal min: 75us typ:80us max:85us or 500us different types
+	if (am_wait(100,0)) return 3;
+	if (am_wait(100,1)) return 4;
+	
+	for(uint8_t i = 0; i < 5; i++)	{
+		uint8_t sensor_byte = 0;
+		for(uint8_t j = 1; j <= 8; j++) {// get 8 bits from sensor
+			if (am_wait(88,0)) return 5;
+			
+			TCNT1=0;while(TCNT1==0);;while(TCNT1<35)		;
+			sensor_byte <<= 1; // add new lower byte
+			if (SENSOR_is_hi) {// if sda high after 30us => bit=1 else bit=0
+				sensor_byte |= 1;
+				if (am_wait(45,1)) return 6;// 30us - 75us = 45us
+			}
+		}
+		sensor_data[i] = sensor_byte;
+	}
+
+	// checksum
+	if ( ((sensor_data[0]+sensor_data[1]+sensor_data[2]+sensor_data[3]) & 0xff ) != sensor_data[4])
+	{
+		PORTB&=~(1<<PINB0);
+		return 7;
+	}
+	if (sensor_data[2]&0x80) { //minus
+		sensor_data[2]&=~(0x80);
+		lam2302_temp=-((sensor_data[2]<<8) + sensor_data[3]);
+	} else
+		lam2302_temp=((sensor_data[2]<<8) + sensor_data[3]);
+	if (!testSW()) {
+		double htemp=lam2302_temp;
+        double hhum=(1.0546-0.000216*htemp)*((sensor_data[0]<<8) + sensor_data[1]);
+		//htemp=Temperauter * 10 
+		//lam2302_hum=0.318*hhum +76;
+		lam2302_hum=0.31*hhum +80; //hhum = Hum*10 -> 5V also all *5
+		config_info[5]=7;
+	}
+	else {
+		
+		lam2302_hum=((sensor_data[0]<<8) + sensor_data[1]);
+		config_info[5]=12;
+	}
+	lam2302_temp=lam2302_temp*25.6;
+	rSREG=SREG;
+	cli();
+	am2302_hum=lam2302_hum;
+	am2302_temp=lam2302_temp;
+	SREG=rSREG;
+	return 0;
+}
+
+
+
+
+
+
+
+
+	int main(void){
+		PRR|=(1<<PRUSI)|(1<<PRADC);   // adc and usi 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();
+
+		ACSR|=(1<<ACD);  //Disable Comparator
+		ADCSRB|=(1<<ACME); //Disable Analog multiplexer
+		MCUCR &=~(1<<PUD); //All Pins Pullup...
+		MCUCR |=(1<<BODS);
+
+		
+		DDRA|=(1<<PINA1); //stromversorgung
+#define SENSON PORTA|=(1<<PINA1);
+#define SENSOFF PORTA&=~(1<<PINA1);
+
+		// Set up Watch Dog Timer for Inactivity
+		WDTCSR |= (1<<WDCE) ;   // Enable the WD Change Bit
+		WDTCSR =   (1<<WDIE) |              // Enable WDT Interrupt
+			(1<<WDP2) | (1<<WDP1);   // Set Timeout to ~2 seconds		
+		
+		if (testSW()) {
+			config_info[5]=12;  //hum *10
+			}else{
+			config_info[5]=7; //HIH4031
+		}
+		
+		uint8_t i;
+		for(i=0;i<64;i++) pack.bytes[i]=0;
+		MCUSR=0;
+		
+		uint8_t err;
+		uint8_t pn=1;
+		SENSON
+		_delay_ms(4000);
+		err =am2302();
+		
+		sei();
+		
+		while(1)   {
+			if (gcontrol) {
+				if (wdcounter>2) {
+					wdcounter=0;
+					SENSON
+				}
+				gcontrol=0;
+			}
+			if (wdcounter==2) {
+				err=am2302();
+				if (err!=0) {
+					pack.page3[pn]=err;
+					pn=pn+1;if (pn>31) pn=1;
+				}
+				SENSOFF
+				wdcounter=3;
+			}
+			if (wdcounter>=16) {
+				wdcounter=0;
+				SENSON
+			}
+			
+			
+
+			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))	  {
+				MCUCR|=(1<<SE)|(1<<SM1);
+				MCUCR&=~(1<<ISC01);
+				} else {
+				MCUCR|=(1<<SE);
+				MCUCR&=~(1<<SM1);
+			}
+			asm("SLEEP");
+		}
+
+
 	}
\ No newline at end of file