New I2C devices

[owSlave2.git] / DS18B20_CDM7160 / DS18B20_CDM7160.c

diff --git a/DS18B20_CDM7160/DS18B20_CDM7160.c b/DS18B20_CDM7160/DS18B20_CDM7160.c
index b46797c..1c18216 100644 (file)
--- a/DS18B20_CDM7160/DS18B20_CDM7160.c
+++ b/DS18B20_CDM7160/DS18B20_CDM7160.c
@@ -47,7 +47,7 @@ extern void EXTERN_SLEEP();
 \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
@@ -76,7 +76,7 @@ uint8_t max_adr=0;
 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
@@ -95,6 +95,8 @@ volatile pack_t pack;
 \r
 \r
 int main(void){\r
+       PORTB&=~(1<<PINB1);\r
+       DDRB|=(1<<PINB1);\r
     PRR|=(1<<PRADC);  // adc for save Power\r
        pack.temp=0x0550;\r
        pack.config=0x7F;\r
@@ -106,8 +108,10 @@ int main(void){
        PORTA=0xFF;\r
        PORTB=0xFF;\r
        OWINIT();\r
-       DDRB|=(1<<PINB1);\r
        PORTB&=~(1<<PINB1);\r
+       DDRB|=(1<<PINB1);\r
+       \r
+\r
        PORTA&=~(1<<PINA0);\r
 \r
        MCUCR &=~(1<<PUD); //All Pins Pullup...\r
@@ -118,15 +122,18 @@ int main(void){
        (1<<WDP3) | (1<<WDP0);   // Set Timeout to ~8 seconds\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 +152,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