From be76990656840614230e406f88a8d99c1d81cc6a Mon Sep 17 00:00:00 2001
From: Bernhard Tittelbach <xro@realraum.at>
Date: Sun, 4 Aug 2013 03:12:29 +0000
Subject: ds1820 onewire lib

git-svn-id: https://svn.spreadspace.org/avr/trunk@214 aa12f405-d877-488e-9caf-2d797e2a1cc7
---
 usb-1wire/usb-1wire.c | 138 +++++++++++++-------------------------------------
 1 file changed, 35 insertions(+), 103 deletions(-)

(limited to 'usb-1wire/usb-1wire.c')

diff --git a/usb-1wire/usb-1wire.c b/usb-1wire/usb-1wire.c
index 4480a0a..e96100f 100644
--- a/usb-1wire/usb-1wire.c
+++ b/usb-1wire/usb-1wire.c
@@ -33,28 +33,28 @@
 #include "led.h"
 #include "usbio.h"
 
+#define MAX_OWI_DEVICES 8
+
 #include "onewire.h"
+#include "ds1820.h"
 
-#define MAX_OWI_DEVICES 3
 
 uint8_t owi_addr_[MAX_OWI_DEVICES][8];
-uint8_t num_owi_dev_found_;
+uint8_t num_owi_dev_found_ = 0;
+uint8_t num_temp_sensors_ = 0;
 
 void discoverOWIBus(void)
 {
     uint8_t d=0;
     led_on();
 
-    printf("Searching OW Bus ");
+    printf("Searching 1W Bus ");
     num_owi_dev_found_ = 0;
     if (owi_reset())
         printf(" !something is there! ");
     owi_reset_search();
     _delay_ms(250);
 
-    //Search only for DS1820 temp sensors
-    owi_target_search(DS1820_FAMILY_ID);
-
     while ( owi_search(owi_addr_[ d ]))
     {
         d++;
@@ -81,113 +81,45 @@ void discoverOWIBus(void)
     led_off();
 }
 
-void tempToUSB(uint8_t resolution)
+void tempToUSB(uint8_t bit_resolution)
 {
-    uint8_t data[9];
-    int16_t celsius = 0;
-    int16_t raw = 0;
-    uint8_t type_s, cfg;
-    uint8_t d=0;
-    uint8_t cfg_res=12;
-    uint8_t crc_result = 0;
+    uint8_t sensor_index = 0;
+    uint16_t raw_temp = 0;
+    double temp=0.0;
 
     led_on();
 
-    owi_reset();
-    //we assume we do NOT use parasitic power, so we can issue
-    //commands while other sensors are already busy converting
-    for (d=0; d<num_owi_dev_found_; d++)
+    if (num_temp_sensors_ == 0)
     {
-        owi_select(owi_addr_[d]);
-
-        owi_write(DS1820_WRITE_SCRATCHPAD, 0);
-        owi_write(0xFF, 0);
-        owi_write(0x7F, 0);
-        owi_write(resolution | 0x1F, 0);
-        owi_reset();
-        owi_select(owi_addr_[d]);
-        owi_write(DS1820_START_CONVERSION, 0);
+        printf("No DS1820 sensors ?? running bus discovery... \r\n");
+        num_temp_sensors_ = ds1820_discover();
     }
+    printf("%d DS18x20 sensors on the bus\r\n", num_temp_sensors_);
 
-    switch (resolution)
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
     {
-            case DS1820_RESOLUTION_9BITS: _delay_ms(DS1820_TCONV_MS_9BITS); break;
-            case DS1820_RESOLUTION_10BITS: _delay_ms(DS1820_TCONV_MS_10BITS); break;
-            case DS1820_RESOLUTION_11BITS: _delay_ms(DS1820_TCONV_MS_11BITS); break;
-            default: _delay_ms(DS1820_TCONV_MS_12BITS); break;
+        ds1820_set_resolution(sensor_index, bit_resolution);
+        ds1820_start_measuring(sensor_index);
     }
 
-    if (owi_reset()) //reset is needed
-        printf("Sensor present\r\n");
-    else
-        printf("Sensor NOT present\r\n");
+    ds1820_wait_conversion_time(bit_resolution);
 
-    for (d=0; d<num_owi_dev_found_; d++)
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
     {
-        owi_select(owi_addr_[d]);
-        owi_write(DS1820_READ_SCRATCHPAD, 0);         // Read Scratchpad
-        printf("Data: ");
-        for (uint8_t i = 0; i < 9; i++) {          // we need 9 bytes
-            data[i] = owi_read();
-            printf("%02x " , data[i]);
-        }
-        crc_result = owi_crc8(data,8);
-        printf(" crc: %x is %s\r\n" , crc_result, (crc_result == data[8])? "OK": "ERRORENOUS");
-
-        // the first ROM byte indicates which chip
-        switch (owi_addr_[d][0])
+        raw_temp = ds1820_read_temperature(sensor_index);
+        printf("DS1820 #%d: ", sensor_index);
+        if (raw_temp == DS1820_ERROR)
         {
-            case 0x10:
-                //~ Serial.println("  Chip = DS18S20");  // or old DS1820
-                type_s = 1;
-                break;
-            case 0x28:
-                //~ Serial.println("  Chip = DS18B20");
-                type_s = 0;
-                break;
-            case 0x22:
-                //~ Serial.println("  Chip = DS1822");
-                type_s = 0;
-                break;
-            default:
-                continue;
-        }
-
-        // Convert the data to actual temperature
-        // because the result is a 16 bit signed integer, it should
-        // be stored to an "int16_t" type, which is always 16 bits
-        // even when compiled on a 32 bit processor.
-        raw = (data[1] << 8) | data[0];
-        if (type_s)
-        {
-            raw = raw << 3; // 9 bit resolution default
-            if (data[7] == 0x10) {
-                // "count remain" gives full 12 bit resolution
-                raw = (raw & 0xFFF0) + 12 - data[6];
-            }
+            printf("CRC comm error\r\n");
         } else {
-            cfg = (data[4] & 0x60);
-            // at lower res, the low bits are undefined, so let's zero them
-            if (cfg == 0x00)
-            {
-                raw = raw & ~7;  // 9 bit resolution, 93.75 ms
-                cfg_res = 9;
-            }
-            else if (cfg == 0x20)
-            {
-                raw = raw & ~3; // 10 bit res, 187.5 ms
-                cfg_res = 10;
-            }
-            else if (cfg == 0x40)
-            {
-                raw = raw & ~1; // 11 bit res, 375 ms
-                cfg_res = 11;
-            }
-        //// default is 12 bit resolution, 750 ms conversion time
+            temp = ds1820_raw_temp_to_celsius( raw_temp );
+            printf("raw: %d, celsius (float): %f, celsius (int): %d.%d, %d bit resolution\r\n",
+                raw_temp,
+                temp ,
+                raw_temp / 16, 10 * (raw_temp % 16) / 16,
+                bit_resolution
+            );
         }
-        celsius = raw / 16;
-
-        printf("Temperature: raw %d, celsius: %d, resolution: %d bits\r\n", raw, celsius, cfg_res);
     }
     led_off();
 }
@@ -197,10 +129,11 @@ void handle_cmd(uint8_t cmd)
 {
     switch(cmd) {
         case '0': discoverOWIBus(); break;
-        case '1': tempToUSB(DS1820_RESOLUTION_9BITS); break;
-        case '2': tempToUSB(DS1820_RESOLUTION_10BITS); break;
-        case '3': tempToUSB(DS1820_RESOLUTION_11BITS); break;
-        case '4': tempToUSB(DS1820_RESOLUTION_12BITS); break;
+        case '1': num_temp_sensors_ = ds1820_discover(); break;
+        case '2': tempToUSB(9); break;
+        case '3': tempToUSB(10); break;
+        case '4': tempToUSB(11); break;
+        case '5': tempToUSB(12); break;
         case 'r': reset2bootloader(); break;
         default: printf("error\r\n"); return;
     }
@@ -216,7 +149,6 @@ int main(void)
     led_init();
     usbio_init();
     sei();
-    DDRC &= ~7;
     owi_init(7, &PINC);
 
     for(;;)
-- 
cgit v1.2.3