X-Git-Url: http://git.smho.de/gw/?a=blobdiff_plain;f=DS18B20_MAX44009%2FDS18B20_MAX44009.c;h=1ebcf7cf7c81a51a94175e449a0e5e9a8091f7be;hb=81a79648a168a1167c5ad97d4068621c1751a353;hp=edf1be33b43464ce03340cf2663c2ba25352a477;hpb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67;p=owSlave2.git

diff --git a/DS18B20_MAX44009/DS18B20_MAX44009.c b/DS18B20_MAX44009/DS18B20_MAX44009.c
index edf1be3..1ebcf7c 100644
--- a/DS18B20_MAX44009/DS18B20_MAX44009.c
+++ b/DS18B20_MAX44009/DS18B20_MAX44009.c
@@ -1,5 +1,5 @@
 
-// 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
@@ -40,25 +40,13 @@
 #include <avr/pgmspace.h>
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/MAX44009.h"
+#include "../common/owSlave_tools.h"
 
-
-extern void OWINIT();
-
-extern void EXTERN_SLEEP();
-
-
+OWST_EXTERN_VARS
+//-D__4MHZ__
 uint8_t owid[8]={0x28, 0xA2, 0xD9, 0x84, 0x00, 0x16, 0x77, 0x6B};/**/
-uint8_t config_info[16]={0x03,0x04, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+uint8_t config_info[26]={0x03,0x04, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,15,0x00,0x00,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;
-
 
 uint8_t max_adr=0;
 
@@ -84,7 +72,7 @@ volatile pack_t pack;
 
 
 int main(void){
-    PRR|=(1<<PRADC);  // adc for save Power
+	OWST_INIT_USI_ON
 	pack.temp=0x0550;
 	pack.config=0x7F;
 	pack.TH=75;
@@ -92,14 +80,9 @@ int main(void){
 	pack.rrFF=0xFF;
 	pack.rr00=0;
 	pack.rr10=0x10;
-	PORTA=0xFF;
-	PORTB=0xFF;
-	OWINIT();
-
-	MCUCR &=~(1<<PUD); //All Pins Pullup...
-	MCUCR |=(1<<BODS);
 
-	MCUSR=0;
+	OWINIT();
+	OWST_EN_PULLUP
 	USI_TWI_Master_Initialise();
 	if (checkMAX44009(0)) max_adr=0; else max_adr=1 ;
 	
@@ -108,7 +91,7 @@ int main(void){
 	sei();
     while(1)   {
 	
-		if (gcontrol) {
+		if ((gcontrol&1)==1) {
 			//PORTB|=(1<<PINB1); //Dauer 2.3ms
 			volatile double l=MAX44009getlux(max_adr);		
 			if (l<0.030) l=0.030; //Darf nicht 0 sein. minimum -35°C Sensor minimum 0.045
@@ -124,27 +107,13 @@ int main(void){
 			//pack.temp++;
 			alarmflag=af;
 			sei();	
+			gcontrol=0;
 			EXTERN_SLEEP();		
 			//PORTB&=~(1<<PINB1);
 		}
 
 		
-#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
    }