Many changes from 2018

[owSlave2.git] / DS18B20_BMP280 / DS18B20_BMP280.c

diff --git a/DS18B20_BMP280/DS18B20_BMP280.c b/DS18B20_BMP280/DS18B20_BMP280.c
index 261c78d..8cfc5a6 100644 (file)
--- a/DS18B20_BMP280/DS18B20_BMP280.c
+++ b/DS18B20_BMP280/DS18B20_BMP280.c
@@ -1,5 +1,4 @@
-\r
-// Copyright (c) 2015, Tobias Mueller tm(at)tm3d.de\r
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de\r
 // All rights reserved.\r
 //\r
 // Redistribution and use in source and binary forms, with or without\r
@@ -40,25 +39,22 @@
 #include <avr/pgmspace.h>\r
 #include "../common/I2C/USI_TWI_Master.h"\r
 #include "../common/I2C/BMP280.h"\r
+#include "../common/owSlave_tools.h"\r
 \r
 \r
-extern void OWINIT();\r
-extern void EXTERN_SLEEP();\r
+#define OWST_EXTERN_VARS\r
 \r
 \r
 \r
 \r
 uint8_t owid[8]={0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40};/**/\r
-uint8_t config_info[16]={0x02,0x03, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+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};\r
        \r
 #if (owid>128) \r
 #error "Variable not correct"\r
 #endif\r
 \r
-extern uint8_t mode;\r
-extern uint8_t gcontrol;\r
-extern uint8_t reset_indicator;\r
-extern uint8_t alarmflag;\r
+\r
 \r
 \r
 \r
@@ -85,7 +81,8 @@ volatile pack_t pack;
 \r
 \r
 int main(void){\r
-    PRR|=(1<<PRADC);  // adc for save Power\r
+    OWST_INIT_USI_ON\r
+       \r
        pack.temp=0x0550;\r
        pack.config=0x7F;\r
        pack.TH=75;\r
@@ -93,15 +90,14 @@ int main(void){
        pack.rrFF=0xFF;\r
        pack.rr00=0;\r
        pack.rr10=0x10;\r
-       PORTA=0xFF;\r
-       PORTB=0xFF;\r
+       \r
        OWINIT();\r
 \r
-       MCUCR &=~(1<<PUD); //All Pins Pullup...\r
-       MCUCR |=(1<<BODS);\r
-\r
-       MCUSR=0;\r
+       OWST_EN_PULLUP\r
        USI_TWI_Master_Initialise();\r
+       _delay_ms(500);\r
+       bmp280Init();\r
+       _delay_ms(50);\r
        bmp280Init();\r
        //DDRB|=(1<<PINB1);\r
        gcontrol=1;\r
@@ -129,23 +125,8 @@ int main(void){
                        //PORTB&=~(1<<PINB1);\r
                }\r
 \r
-               \r
-#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)\r
-                       if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))\r
-#endif                 \r
-#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)\r
-                       if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))\r
-#endif\r
-                         {\r
+               OWST_MAIN_END\r
 \r
-                       MCUCR|=(1<<SE)|(1<<SM1);\r
-                       MCUCR&=~(1<<ISC01);\r
-               } else {\r
-                       MCUCR|=(1<<SE);\r
-                       MCUCR&=~(1<<SM1);\r
-               }\r
-               //MCUCR&=~(1<<ISC01);\r
-               asm("SLEEP");\r
    }\r
 \r
 \r