Many changes from 2018

[owSlave2.git] / DS18B20_CDM7160 / DS18B20_CDM7160.c

diff --git a/DS18B20_CDM7160/DS18B20_CDM7160.c b/DS18B20_CDM7160/DS18B20_CDM7160.c
index b46797c..c9e90b3 100644 (file)
--- a/DS18B20_CDM7160/DS18B20_CDM7160.c
+++ b/DS18B20_CDM7160/DS18B20_CDM7160.c
@@ -37,46 +37,23 @@
 #include <avr/wdt.h>\r
 #include <avr/sleep.h>\r
 #include <avr/pgmspace.h>\r
+#include "../common/owSlave_tools.h"\r
 #include "../common/I2C/USI_TWI_Master.h"\r
 #include "../common/I2C/CDM7160.h"\r
 \r
 \r
-extern void OWINIT();\r
-\r
-extern void EXTERN_SLEEP();\r
-\r
+OWST_EXTERN_VARS\r
 \r
 uint8_t owid[8]={0x28, 0xA2, 0xD9, 0x84, 0x00, 0x16, 0x77, 0x6B};/**/\r
-uint8_t config_info[26]={10,13, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};\r
+uint8_t config_info[26]={10,21, 0x00,0x00, 0x00,0x00, 0x00,0x00, 0x02,16,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
-volatile uint8_t wdcounter=5;\r
-\r
-#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)\r
-ISR(WATCHDOG_vect) {\r
-#else\r
-ISR(WDT_vect) {\r
-#endif \r
-       wdcounter++;\r
-       if (reset_indicator==1) reset_indicator++;\r
-       else if (reset_indicator==2) mode=0;\r
 \r
-\r
-}\r
-\r
-uint8_t max_adr=0;\r
+OWST_WDT_ISR\r
 \r
 typedef union {\r
        volatile uint8_t bytes[8];\r
        struct {\r
-               uint16_t temp;  //0\r
+               int16_t temp;  //0\r
                uint8_t TH;  //2\r
                uint8_t TL;  //3\r
                uint8_t config;  //4\r
@@ -94,8 +71,10 @@ volatile pack_t pack;
 \r
 \r
 \r
-int main(void){\r
-    PRR|=(1<<PRADC);  // adc for save Power\r
+int main(void) {\r
+       OWST_INIT_USI_ON\r
+\r
+\r
        pack.temp=0x0550;\r
        pack.config=0x7F;\r
        pack.TH=75;\r
@@ -106,27 +85,25 @@ int main(void){
        PORTA=0xFF;\r
        PORTB=0xFF;\r
        OWINIT();\r
-       DDRB|=(1<<PINB1);\r
        PORTB&=~(1<<PINB1);\r
+       DDRB|=(1<<PINB1);\r
        PORTA&=~(1<<PINA0);\r
 \r
-       MCUCR &=~(1<<PUD); //All Pins Pullup...\r
-       MCUCR |=(1<<BODS);\r
-\r
-       WDTCSR |= ((1<<WDCE) );   // Enable the WD Change Bit//| (1<<WDE)\r
-       WDTCSR |=   (1<<WDIE) |              // Enable WDT Interrupt\r
-       (1<<WDP3) | (1<<WDP0);   // Set Timeout to ~8 seconds\r
+       OWST_EN_PULLUP\r
+       OWST_WDR_CONFIG8\r
 \r
-       MCUSR=0;\r
+       _delay_ms(100);\r
        USI_TWI_Master_Initialise();\r
-       //CDM7160softReset();\r
-       //_delay_ms(100);\r
-\r
+       CDM7160softReset();\r
+       _delay_ms(200);\r
+       \r
        CDM7160setMode(0); //Power Down Mode\r
+       _delay_ms(200);\r
        CDM7160setAvCount(0x3F);\r
        CDM7160setFMode(1);\r
        pack.temp=CDM7160getCO2();\r
        CDM7160setMode(1);\r
+       _delay_ms(200);\r
        gcontrol=1;\r
        //DDRB|=(1<<PINB1);\r
        //while (1)                     {volatile double l=CDM7160getCO2();}\r
@@ -145,10 +122,10 @@ int main(void){
                if (wdcounter>(PBR+1)) {\r
                        wdcounter=0;\r
                        //PORTB|=(1<<PINB1); //Dauer 2.3ms\r
-                       volatile uint16_t l=CDM7160getCO2();    \r
-                       uint16_t w=l;\r
-                       uint8_t t8=w>>4;\r
-                       uint8_t af=0;\r
+                       volatile int16_t l=(int16_t)CDM7160getCO2()-1280;       \r
+                       int16_t w=l;\r
+                       int8_t t8=w/16;\r
+                       int8_t af=0;\r
                        if (t8>pack.TH) af=1;\r
                        if (t8<=pack.TL) af=1; \r
                        cli();\r
@@ -163,22 +140,7 @@ int main(void){
                }\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
-\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
+               OWST_MAIN_END\r
    }\r
 \r
 \r