From 24a1b19d6b6671284f05c63b03e420a408828bb9 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 21 Jun 2015 22:47:21 +0200
Subject: dos2unix for all files

---
 usb-1wire/Makefile    |  94 +++++++-------
 usb-1wire/usb-1wire.c | 336 +++++++++++++++++++++++++-------------------------
 2 files changed, 215 insertions(+), 215 deletions(-)

(limited to 'usb-1wire')

diff --git a/usb-1wire/Makefile b/usb-1wire/Makefile
index 70cb4a2..7b12bd2 100644
--- a/usb-1wire/Makefile
+++ b/usb-1wire/Makefile
@@ -1,47 +1,47 @@
-##
-##  spreadspace avr utils
-##
-##
-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
-##
-##  This file is part of spreadspace avr utils.
-##
-##  spreadspace avr utils is free software: you can redistribute it and/or modify
-##  it under the terms of the GNU General Public License as published by
-##  the Free Software Foundation, either version 3 of the License, or
-##  any later version.
-##
-##  spreadspace avr utils is distributed in the hope that it will be useful,
-##  but WITHOUT ANY WARRANTY; without even the implied warranty of
-##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##  GNU General Public License for more details.
-##
-##  You should have received a copy of the GNU General Public License
-##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
-##
-
-NAME := usb-1wire
-BOARD_TYPE := teensy2
-OBJ := $(NAME).o
-LIBS := util led lufa-descriptor-usbserial usbio onewire ds1820
-EXTERNAL_LIBS := lufa
-SPREADAVR_PATH := ..
-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
-RESET_PARAM := 'r'
-
-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
-LUFA_OPTS  = -D USB_DEVICE_ONLY
-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
-LUFA_OPTS += -D ORDERED_EP_CONFIG
-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
-
-LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3
-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_LEN=29
-
-LUFA_COMPONENTS := USB USBCLASS
-
-include $(SPREADAVR_PATH)/include.mk
+##
+##  spreadspace avr utils
+##
+##
+##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+##
+##  This file is part of spreadspace avr utils.
+##
+##  spreadspace avr utils is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  spreadspace avr utils is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+##
+
+NAME := usb-1wire
+BOARD_TYPE := teensy2
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio onewire ds1820
+EXTERNAL_LIBS := lufa
+SPREADAVR_PATH := ..
+RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
+RESET_PARAM := 'r'
+
+LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
+LUFA_OPTS  = -D USB_DEVICE_ONLY
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
+
+LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3
+LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-1wire example\"" -D USB_PRODUCT_LEN=29
+
+LUFA_COMPONENTS := USB USBCLASS
+
+include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-1wire/usb-1wire.c b/usb-1wire/usb-1wire.c
index a94067c..9a044f0 100644
--- a/usb-1wire/usb-1wire.c
+++ b/usb-1wire/usb-1wire.c
@@ -1,168 +1,168 @@
-/*
- *  spreadspace avr utils - usb-1wire example
- *
- *
- *  Copyright (C) 2013-2014 Bernhard Tittelbach <xro@realraum.at>
- *  basically this is refactored and enhanced code from:
- *   http://www.pjrc.com/teensy/td_libs_OneWire.html
- *
- *  This file is part of spreadspace avr utils.
- *
- *  spreadspace avr utils is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  any later version.
- *
- *  spreadspace avr utils is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stdio.h>
-
-#include "util.h"
-#include "led.h"
-#include "usbio.h"
-
-#define MAX_OWI_DEVICES 8
-
-#include "onewire.h"
-#include "ds1820.h"
-
-
-uint8_t owi_addr_[MAX_OWI_DEVICES][8];
-uint8_t num_owi_dev_found_ = 0;
-uint8_t num_temp_sensors_ = 0;
-
-void discoverOWIBus(void)
-{
-    uint8_t d=0;
-    led_on();
-
-    printf("Searching 1W Bus ");
-    num_owi_dev_found_ = 0;
-    if (owi_reset())
-        printf(" !something is there! ");
-    owi_reset_search();
-    _delay_ms(250);
-
-    while ( owi_search(owi_addr_[ d ]))
-    {
-        d++;
-        printf("%d. found, ", d);
-        led_toggle();
-        if ( d >= MAX_OWI_DEVICES)
-            break;
-    }
-    num_owi_dev_found_ = d;
-    printf(" done \r\n");
-    printf("%d devices found\r\n", d);
-
-    for (d=0; d<num_owi_dev_found_; d++)
-    {
-        printf("OW Dev #%d: addr = ", d);
-        for (uint8_t a=0;  a<8; a++)
-            printf("%02x ", owi_addr_[d][a]);
-        if (owi_crc8(owi_addr_[d], 7) == owi_addr_[d][7])
-            printf("  CRC OK");
-        else
-            printf("  CRC ERROR");
-        printf("\r\n");
-    }
-    led_off();
-}
-
-void tempToUSB(uint8_t bit_resolution)
-{
-    uint8_t sensor_index = 0;
-    uint16_t raw_temp = 0;
-    double temp=0.0;
-
-    led_on();
-
-    if (num_temp_sensors_ == 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_);
-
-    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
-    {
-        ds1820_set_resolution(sensor_index, bit_resolution);
-        ds1820_start_measuring(sensor_index);
-    }
-
-    ds1820_wait_conversion_time(bit_resolution);
-
-    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
-    {
-        raw_temp = ds1820_read_temperature(sensor_index);
-        printf("DS1820 #%d: ", sensor_index);
-        if (raw_temp == DS1820_ERROR)
-        {
-            printf("CRC comm error\r\n");
-        } else {
-            temp = ds1820_raw_temp_to_celsius( raw_temp );
-            printf("raw: %d, celsius (float): %f, celsius (int): %d.%02d, %d bit resolution\r\n",
-                raw_temp,
-                temp ,
-                raw_temp / 16, (raw_temp <0 ? -1 : 1) * 100 * (raw_temp % 16) / 16,
-                bit_resolution
-            );
-        }
-    }
-    led_off();
-}
-
-
-void handle_cmd(uint8_t cmd)
-{
-    switch(cmd) {
-        case '0': discoverOWIBus(); 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;
-    }
-    printf("ok\r\n");
-}
-
-int main(void)
-{
-    MCUSR &= ~(1 << WDRF);
-    wdt_disable();
-
-    cpu_init();
-    led_init();
-    usbio_init();
-    sei();
-    owi_init(7, &PINC);
-
-    for(;;)
-    {
-        int16_t BytesReceived = usbio_bytes_received();
-        while(BytesReceived > 0)
-        {
-            int ReceivedByte = fgetc(stdin);
-            if(ReceivedByte != EOF) {
-                handle_cmd(ReceivedByte);
-            }
-            BytesReceived--;
-        }
-
-    usbio_task();
-    }
-}
+/*
+ *  spreadspace avr utils - usb-1wire example
+ *
+ *
+ *  Copyright (C) 2013-2014 Bernhard Tittelbach <xro@realraum.at>
+ *  basically this is refactored and enhanced code from:
+ *   http://www.pjrc.com/teensy/td_libs_OneWire.html
+ *
+ *  This file is part of spreadspace avr utils.
+ *
+ *  spreadspace avr utils is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
+ *
+ *  spreadspace avr utils is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <avr/io.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "led.h"
+#include "usbio.h"
+
+#define MAX_OWI_DEVICES 8
+
+#include "onewire.h"
+#include "ds1820.h"
+
+
+uint8_t owi_addr_[MAX_OWI_DEVICES][8];
+uint8_t num_owi_dev_found_ = 0;
+uint8_t num_temp_sensors_ = 0;
+
+void discoverOWIBus(void)
+{
+    uint8_t d=0;
+    led_on();
+
+    printf("Searching 1W Bus ");
+    num_owi_dev_found_ = 0;
+    if (owi_reset())
+        printf(" !something is there! ");
+    owi_reset_search();
+    _delay_ms(250);
+
+    while ( owi_search(owi_addr_[ d ]))
+    {
+        d++;
+        printf("%d. found, ", d);
+        led_toggle();
+        if ( d >= MAX_OWI_DEVICES)
+            break;
+    }
+    num_owi_dev_found_ = d;
+    printf(" done \r\n");
+    printf("%d devices found\r\n", d);
+
+    for (d=0; d<num_owi_dev_found_; d++)
+    {
+        printf("OW Dev #%d: addr = ", d);
+        for (uint8_t a=0;  a<8; a++)
+            printf("%02x ", owi_addr_[d][a]);
+        if (owi_crc8(owi_addr_[d], 7) == owi_addr_[d][7])
+            printf("  CRC OK");
+        else
+            printf("  CRC ERROR");
+        printf("\r\n");
+    }
+    led_off();
+}
+
+void tempToUSB(uint8_t bit_resolution)
+{
+    uint8_t sensor_index = 0;
+    uint16_t raw_temp = 0;
+    double temp=0.0;
+
+    led_on();
+
+    if (num_temp_sensors_ == 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_);
+
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
+    {
+        ds1820_set_resolution(sensor_index, bit_resolution);
+        ds1820_start_measuring(sensor_index);
+    }
+
+    ds1820_wait_conversion_time(bit_resolution);
+
+    for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++)
+    {
+        raw_temp = ds1820_read_temperature(sensor_index);
+        printf("DS1820 #%d: ", sensor_index);
+        if (raw_temp == DS1820_ERROR)
+        {
+            printf("CRC comm error\r\n");
+        } else {
+            temp = ds1820_raw_temp_to_celsius( raw_temp );
+            printf("raw: %d, celsius (float): %f, celsius (int): %d.%02d, %d bit resolution\r\n",
+                raw_temp,
+                temp ,
+                raw_temp / 16, (raw_temp <0 ? -1 : 1) * 100 * (raw_temp % 16) / 16,
+                bit_resolution
+            );
+        }
+    }
+    led_off();
+}
+
+
+void handle_cmd(uint8_t cmd)
+{
+    switch(cmd) {
+        case '0': discoverOWIBus(); 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;
+    }
+    printf("ok\r\n");
+}
+
+int main(void)
+{
+    MCUSR &= ~(1 << WDRF);
+    wdt_disable();
+
+    cpu_init();
+    led_init();
+    usbio_init();
+    sei();
+    owi_init(7, &PINC);
+
+    for(;;)
+    {
+        int16_t BytesReceived = usbio_bytes_received();
+        while(BytesReceived > 0)
+        {
+            int ReceivedByte = fgetc(stdin);
+            if(ReceivedByte != EOF) {
+                handle_cmd(ReceivedByte);
+            }
+            BytesReceived--;
+        }
+
+    usbio_task();
+    }
+}
-- 
cgit v1.2.3