X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS18B20_BMP280%2FDS18B20_BMP280.c;h=8cfc5a68dbaf4befbd12f315e9f7e31fe308f347;hp=261c78d6ca4942c59039ec7eee87597a1e543a92;hb=refs%2Fheads%2Fmaster;hpb=a6a04f58e4afd20f206fdf4a8a7b3ce4062f1b67

diff --git a/DS18B20_BMP280/DS18B20_BMP280.c b/DS18B20_BMP280/DS18B20_BMP280.c
index 261c78d..8cfc5a6 100644
--- a/DS18B20_BMP280/DS18B20_BMP280.c
+++ b/DS18B20_BMP280/DS18B20_BMP280.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
@@ -40,25 +39,22 @@
 #include <avr/pgmspace.h>
 #include "../common/I2C/USI_TWI_Master.h"
 #include "../common/I2C/BMP280.h"
+#include "../common/owSlave_tools.h"
 
 
-extern void OWINIT();
-extern void EXTERN_SLEEP();
+#define OWST_EXTERN_VARS
 
 
 
 
 uint8_t owid[8]={0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40};/**/
-uint8_t config_info[16]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+uint8_t config_info[26]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,14,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;
+
 
 
 
@@ -85,7 +81,8 @@ 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;
@@ -93,15 +90,14 @@ 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;
+	OWST_EN_PULLUP
 	USI_TWI_Master_Initialise();
+	_delay_ms(500);
+	bmp280Init();
+	_delay_ms(50);
 	bmp280Init();
 	//DDRB|=(1<<PINB1);
 	gcontrol=1;
@@ -129,23 +125,8 @@ int main(void){
 			//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
-			  {
+		OWST_MAIN_END
 
-			MCUCR|=(1<<SE)|(1<<SM1);
-			MCUCR&=~(1<<ISC01);
-		} else {
-			MCUCR|=(1<<SE);
-			MCUCR&=~(1<<SM1);
-		}
-		//MCUCR&=~(1<<ISC01);
-		asm("SLEEP");
    }