updated avr utils

fixed gitignore

13 files changed, 1058 insertions, 489 deletions

diff --git a/.gitignore b/.gitignore
index d1bf9e6..28f0c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,13 @@ hardware/*/*-cache.lib
 hardware/*/$savepcb.brd
 hardware/*/*.000
 contrib/contiki-2.6/
+contrib/LUFA-120219*
 software/dustmap-node/contiki-avr-zigbit.*
 software/dustmap-node/dustmap-node.avr-zigbit*
 software/dustmap-node/obj_avr-zigbit/
-sortware/nodectl/*.a
-sortware/nodectl/*.o
-sortware/nodectl/*.d
-sortware/nodectl/*.d.*
-sortware/nodectl/*.hex
-sortware/nodectl/*.elf
+software/nodectl/*.a
+software/nodectl/*.o
+software/nodectl/*.d
+software/nodectl/*.d.*
+software/nodectl/*.hex
+software/nodectl/*.elf
diff --git a/software/defines.mk b/software/defines.mk
index 2d506bc..ba30ee8 100644
--- a/software/defines.mk
+++ b/software/defines.mk
@@ -112,6 +112,14 @@ ifeq ($(BOARD_TYPE),slowpandongle2)
   PROG := DFU
   LUFA_BOARD = NONE
 endif
+ifeq ($(BOARD_TYPE),teenstep)
+  MCU := atmega32u4
+  ARCH = AVR8
+  F_CPU := 16000000
+  F_USB = $(F_CPU)
+  PROG := DFU
+  LUFA_BOARD = NONE
+endif
 ifeq ($(BOARD_TYPE),arduinoUno)
   MCU := atmega328p
   ARCH = AVR8
diff --git a/software/lib/anyio.c b/software/lib/anyio.c
index 1ad4e96..aaa5f47 100644
--- a/software/lib/anyio.c
+++ b/software/lib/anyio.c
@@ -83,8 +83,13 @@ void anyio_init(const uint32_t baudrate, const uint8_t doublespeed)
 
 void anyio_task(void)
 {
-  CDC_Device_USBTask(&VirtualSerial_CDC_Interface); 
-  USB_USBTask(); 
+  if(USB_DeviceState == DEVICE_STATE_Unattached && USB_VBUS_GetStatus()) {
+    USB_Disable();
+    USB_Init();
+  }
+
+  CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+  USB_USBTask();
 }
 
 int16_t anyio_bytes_received(void)
@@ -95,7 +100,7 @@ int16_t anyio_bytes_received(void)
     return (int16_t)Serial_IsCharReceived();
 }
 
-void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)  
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
   if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
     stdin = stdout = stderr = &usb_stream;
diff --git a/software/lib/crc8.c b/software/lib/crc8.c
deleted file mode 100644
index ef30f71..0000000
--- a/software/lib/crc8.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* please read copyright-notice at EOF */

-

-#include <stdint.h>

-

-#define CRC8INIT    0x00

-#define CRC8POLY    0x18              //0X18 = X^8+X^5+X^4+X^0

-

-uint8_t crc8( uint8_t *data, uint16_t number_of_bytes_in_data )

-{

-	uint8_t  crc;

-	uint16_t loop_count;

-	uint8_t  bit_counter;

-	uint8_t  b;

-	uint8_t  feedback_bit;

-	

-	crc = CRC8INIT;

-

-	for (loop_count = 0; loop_count != number_of_bytes_in_data; loop_count++)

-	{

-		b = data[loop_count];

-		

-		bit_counter = 8;

-		do {

-			feedback_bit = (crc ^ b) & 0x01;

-	

-			if ( feedback_bit == 0x01 ) {

-				crc = crc ^ CRC8POLY;

-			}

-			crc = (crc >> 1) & 0x7F;

-			if ( feedback_bit == 0x01 ) {

-				crc = crc | 0x80;

-			}

-		

-			b = b >> 1;

-			bit_counter--;

-		

-		} while (bit_counter > 0);

-	}

-	

-	return crc;

-}

-

-/*

-This code is from Colin O'Flynn - Copyright (c) 2002 

-only minor changes by M.Thomas 9/2004

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of

-this software and associated documentation files (the "Software"), to deal in

-the Software without restriction, including without limitation the rights to

-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of

-the Software, and to permit persons to whom the Software is furnished to do so,

-subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR

-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-*/

diff --git a/software/lib/crc8.h b/software/lib/crc8.h
deleted file mode 100644
index c84f8f3..0000000
--- a/software/lib/crc8.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CRC8_H_

-#define CRC8_H_

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#include <stdint.h>

-

-uint8_t crc8( uint8_t* data, uint16_t number_of_bytes_in_data );

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-/*

-This is based on code from :

-

-Copyright (c) 2002 Colin O'Flynn

-

-Permission is hereby granted, free of charge, to any person obtaining a copy of

-this software and associated documentation files (the "Software"), to deal in

-the Software without restriction, including without limitation the rights to

-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of

-the Software, and to permit persons to whom the Software is furnished to do so,

-subject to the following conditions:

-

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR

-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-*/

-

diff --git a/software/lib/ds1820.c b/software/lib/ds1820.c
new file mode 100644
index 0000000..ca1ff16
--- /dev/null
+++ b/software/lib/ds1820.c
@@ -0,0 +1,167 @@
+/*
+ *  spreadspace avr utils - usb-1wire example
+ *
+ *
+ *  Copyright (C) 2013 Bernhard Tittelbach <xro@realraum.at>
+ *  based on 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 "ds1820.h"
+#include "onewire.h"
+#include "util/delay.h"
+
+uint8_t owi_ds1820_addr_[MAX_OWI_DEVICES][8];
+uint8_t num_ds1820_found_;
+
+uint8_t ds1820_discover(void)
+{
+    uint8_t d=0;
+    num_ds1820_found_ = 0;
+    if (! owi_reset()) //if no devices on bus, return now
+        return 0;
+    owi_reset_search();
+    _delay_ms(250);
+
+    //Search only for DS1820 temp sensors
+    owi_target_search(DS1820_FAMILY_ID);
+
+    while ( owi_search(owi_ds1820_addr_[ d ]))
+    {
+        d++;
+        if ( d >= MAX_OWI_DEVICES)
+            break;
+    }
+    num_ds1820_found_ = d;
+    return num_ds1820_found_;
+}
+
+void ds1820_set_resolution(uint8_t d, uint8_t bits)
+{
+    uint8_t resolution;
+    if (d >= num_ds1820_found_ || bits < 9 || bits > 12)
+        return;
+
+    owi_reset();
+    owi_select(owi_ds1820_addr_[d]);
+
+    owi_write(DS1820_WRITE_SCRATCHPAD, 0);
+    owi_write(0xFF, 0);
+    owi_write(0x7F, 0);
+
+    resolution = (bits - 9) << 5;
+    owi_write(resolution | 0x1F, 0);
+}
+
+void ds1820_start_measuring(uint8_t d)
+{
+    owi_reset();
+    owi_select(owi_ds1820_addr_[d]);
+    owi_write(DS1820_START_CONVERSION, 1);
+}
+
+uint16_t ds1820_get_conversion_time_ms(uint8_t bits)
+{
+    switch (bits)
+    {
+        case 9: return DS1820_TCONV_MS_9BITS;
+        case 10: return DS1820_TCONV_MS_10BITS;
+        case 11: return DS1820_TCONV_MS_11BITS;
+        default: return DS1820_TCONV_MS_12BITS;
+    }
+}
+
+void ds1820_wait_conversion_time(uint8_t bits)
+{
+    switch (bits)
+    {
+        case 9: _delay_ms(DS1820_TCONV_MS_9BITS); break;
+        case 10: _delay_ms(DS1820_TCONV_MS_10BITS); break;
+        case 11: _delay_ms(DS1820_TCONV_MS_11BITS); break;
+        default: _delay_ms(DS1820_TCONV_MS_12BITS); break;
+    }
+}
+
+int16_t ds1820_read_temperature(uint8_t d)
+{
+    uint8_t data[9];
+    int16_t raw = 0;
+    uint8_t type_s=0;
+    uint8_t cfg, i;
+
+    owi_reset();
+    owi_select(owi_ds1820_addr_[d]);
+    owi_write(DS1820_READ_SCRATCHPAD, 0);         // Read Scratchpad
+    for (i = 0; i < 9; i++) {          // we need 9 bytes
+        data[i] = owi_read();
+    }
+    #if (ONEWIRE_CRC == 1)
+    uint8_t crc_result = owi_crc8(data,8);
+    if (crc_result != data[8])
+        return DS1820_ERROR;
+    #endif
+
+    // the first ROM byte indicates which chip
+    switch (owi_ds1820_addr_[d][0])
+    {
+        case 0x10:
+            type_s = 1;
+            break;
+        case 0x28:
+        case 0x22:
+            type_s = 0;
+            break;
+        default:
+            break;
+    }
+
+    // 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];
+        }
+    } else {
+        cfg = (data[4] & 0x60);
+        // at lower res, the low bits are undefined, so let's zero them
+        if (cfg == DS1820_RESOLUTION_9BITS)
+            raw = raw & ~7;  // 9 bit resolution, 93.75 ms
+        else if (cfg == DS1820_RESOLUTION_10BITS)
+            raw = raw & ~3; // 10 bit res, 187.5 ms
+        else if (cfg == DS1820_RESOLUTION_11BITS)
+            raw = raw & ~1; // 11 bit res, 375 ms
+    //// default is 12 bit resolution, 750 ms conversion time
+    }
+
+    return raw;
+}
+
+float ds1820_raw_temp_to_celsius(int16_t t)
+{
+    if ( t == DS1820_ERROR )
+        return DS1820_ERROR;
+    else
+        return ((float) t) / 16.0;
+}
diff --git a/software/lib/ds1820.h b/software/lib/ds1820.h
new file mode 100644
index 0000000..4c29d07
--- /dev/null
+++ b/software/lib/ds1820.h
@@ -0,0 +1,61 @@
+/*
+ *  spreadspace avr utils - usb-1wire example
+ *
+ *
+ *  Copyright (C) 2013 Bernhard Tittelbach <xro@realraum.at>
+ *  based on 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/>.
+ */
+
+#ifndef __DS1820__
+#define __DS1820__
+
+#include	<stdint.h>
+
+#define DS1820_FAMILY_ID                0x10
+#define DS1820_START_CONVERSION         0x44
+#define DS1820_READ_SCRATCHPAD          0xbe
+#define DS1820_WRITE_SCRATCHPAD          0x4e
+#define DS1820_ERROR                    -1000   // Return code. Outside temperature range.
+#define DS1820_RESOLUTION_9BITS  0x00
+#define DS1820_RESOLUTION_10BITS  0x20
+#define DS1820_RESOLUTION_11BITS  0x40
+#define DS1820_RESOLUTION_12BITS  0x60
+#define DS1820_TCONV_MS_9BITS  96
+#define DS1820_TCONV_MS_10BITS  195
+#define DS1820_TCONV_MS_11BITS  390
+#define DS1820_TCONV_MS_12BITS  800
+
+#define DS2890_FAMILY_ID                0x2c
+#define DS2890_WRITE_CONTROL_REGISTER   0X55
+#define DS2890_RELEASE_CODE             0x96
+#define DS2890_WRITE_POSITION           0x0f
+
+#ifndef MAX_OWI_DEVICES
+#define MAX_OWI_DEVICES 8
+#endif
+
+uint8_t ds1820_discover(void);
+void ds1820_set_resolution(uint8_t d, uint8_t bits);
+void ds1820_start_measuring(uint8_t d);
+uint16_t ds1820_get_conversion_time_ms(uint8_t bits);
+void ds1820_wait_conversion_time(uint8_t bits);
+int16_t ds1820_read_temperature(uint8_t d);
+float ds1820_raw_temp_to_celsius(int16_t t);
+
+#endif
\ No newline at end of file
diff --git a/software/lib/led.c b/software/lib/led.c
index bc62431..593d97b 100644
--- a/software/lib/led.c
+++ b/software/lib/led.c
@@ -26,10 +26,10 @@
 
 #if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
 #define NUM_LEDS 2
-#elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) \
-  || defined(__BOARD_arduinoNG__) ||  defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) \
-  || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) \
-  || defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__)
+#elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
+      defined(__BOARD_arduinoNG__) ||  defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) || \
+      defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
+      defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
 #define NUM_LEDS 1
 #else
 #define NUM_LEDS 0
@@ -41,7 +41,8 @@
 #define LED_DIR 1
 #endif
 
-#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__)
+#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
+    defined(__BOARD_teenstep__)
 #define LED_PORT PORTD
 #define LED_DDR DDRD
 #define LED_PINNUM 6
diff --git a/software/lib/onewire.c b/software/lib/onewire.c
index ba1a681..f28ef41 100644
--- a/software/lib/onewire.c
+++ b/software/lib/onewire.c
@@ -1,274 +1,571 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013 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/>.

- */

-

-/* 

-   This is inspired by 

-

-   DS18x20 Demo-Program

-   

-   V 0.9.2, 2/2011

-   

-   by Martin Thomas <eversmith@heizung-thomas.de>

-   http://www.siwawi.arubi.uni-kl.de/avr-projects

-*/

-

-#include <avr/io.h>

-#include <util/delay.h>

-#include <util/atomic.h>

-

-#include "onewire.h"

-

-#define ONEWIRE_GET_IN(bus)   ( *(bus->in) & (1 << bus->pin) )

-#define ONEWIRE_OUT_LOW(bus)  ( *(bus->out) &= (uint8_t) ~(1 << bus->pin) )

-#define ONEWIRE_OUT_HIGH(bus) ( *(bus->out) |= (uint8_t)  (1 << bus->pin) )

-#define ONEWIRE_DIR_IN(bus)   ( *(bus->ddr) &= (uint8_t) ~(1 << bus->pin) )

-#define ONEWIRE_DIR_OUT(bus)  ( *(bus->ddr) |= (uint8_t)  (1 << bus->pin) )

-

-void onewire_init(onewire_bus_t* bus)

-{

-  onewire_reset(bus);

-}

-

-uint8_t onewire_input_pin_state(onewire_bus_t* bus)

-{

-  return ONEWIRE_GET_IN(bus);

-}

-

-void onewire_parasite_enable(onewire_bus_t* bus)

-{

-  ONEWIRE_OUT_HIGH(bus);

-  ONEWIRE_DIR_OUT(bus);

-}

-

-void onewire_parasite_disable(onewire_bus_t* bus)

-{

-  ONEWIRE_DIR_IN(bus);

-#if (!ONEWIRE_USE_INTERNAL_PULLUP)

-  ONEWIRE_OUT_LOW(bus);

-#endif

-}

-

-uint8_t onewire_reset(onewire_bus_t* bus)

-{

-  uint8_t err;

-  

-  ONEWIRE_OUT_LOW(bus);

-  ONEWIRE_DIR_OUT(bus);            // pull OW-Pin low for 480us

-  _delay_us(480);

-  

-  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {

-    // set Pin as input - wait for clients to pull low

-    ONEWIRE_DIR_IN(bus); // input

-#if ONEWIRE_USE_INTERNAL_PULLUP

-    ONEWIRE_OUT_HIGH(bus);

-#endif

-    

-    _delay_us(64);       // was 66

-    err = ONEWIRE_GET_IN(bus);   // no presence detect

-    // if err!=0: nobody pulled to low, still high

-  }

-  

-  // after a delay the clients should release the line

-  // and input-pin gets back to high by pull-up-resistor

-  _delay_us(480 - 64);       // was 480-66

-  if(ONEWIRE_GET_IN(bus) == 0) {

-    err = 1;             // short circuit, expected low but got high

-  }

-  

-  return err;

-}

-

-

-/* Timing issue when using runtime-bus-selection (!ONEWIRE_ONE_BUS):

-   The master should sample at the end of the 15-slot after initiating

-   the read-time-slot. The variable bus-settings need more

-   cycles than the constant ones so the delays had to be shortened 

-   to achive a 15uS overall delay 

-   Setting/clearing a bit in I/O Register needs 1 cyle in ONEWIRE_ONE_BUS

-   but around 14 cyles in configureable bus (us-Delay is 4 cyles per uS) */

-static uint8_t onewire_bit_io_intern(onewire_bus_t* bus, uint8_t b, uint8_t with_parasite_enable)

-{

-  ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {

-#if ONEWIRE_USE_INTERNAL_PULLUP

-    ONEWIRE_OUT_LOW(bus);

-#endif

-    ONEWIRE_DIR_OUT(bus);    // drive bus low

-    _delay_us(2);    // T_INT > 1usec accoding to timing-diagramm

-    if(b) {

-      ONEWIRE_DIR_IN(bus); // to write "1" release bus, resistor pulls high

-#if ONEWIRE_USE_INTERNAL_PULLUP

-      ONEWIRE_OUT_HIGH(bus);

-#endif

-    }

-    

-    // "Output data from the DS18B20 is valid for 15usec after the falling

-    // edge that initiated the read time slot. Therefore, the master must 

-    // release the bus and then sample the bus state within 15ussec from 

-    // the start of the slot."

-    _delay_us(15-2-ONEWIRE_CONF_DELAYOFFSET);

-    

-    if(ONEWIRE_GET_IN(bus) == 0)

-      b = 0;  // sample at end of read-timeslot

-    

-    _delay_us(60-15-2+ONEWIRE_CONF_DELAYOFFSET);

-#if ONEWIRE_USE_INTERNAL_PULLUP

-    ONEWIRE_OUT_HIGH(bus);

-#endif

-    ONEWIRE_DIR_IN(bus);

-    

-    if(with_parasite_enable) {

-      onewire_parasite_enable(bus);

-    }

-    

-  } /* ATOMIC_BLOCK */

-  

-  _delay_us(ONEWIRE_RECOVERY_TIME); // may be increased for longer wires

-

-  return b;

-}

-

-uint8_t onewire_bit_io(onewire_bus_t* bus, uint8_t b)

-{

-  return onewire_bit_io_intern(bus, b & 1, 0);

-}

-

-uint8_t onewire_byte_wr(onewire_bus_t* bus, uint8_t b)

-{

-  uint8_t i = 8, j;

-  

-  do {

-    j = onewire_bit_io(bus, b & 1);

-    b >>= 1;

-    if( j ) {

-      b |= 0x80;

-    }

-  } while( --i );

-  

-  return b;

-}

-

-uint8_t onewire_byte_wr_with_parasite_enable(onewire_bus_t* bus, uint8_t b)

-{

-  uint8_t i = 8, j;

-  

-  do {

-    if (i != 1) {

-      j = onewire_bit_io_intern(bus, b & 1, 0);

-    } else {

-      j = onewire_bit_io_intern(bus, b & 1, 1);

-    }

-    b >>= 1;

-    if(j) {

-      b |= 0x80;

-    }

-  } while(--i);

-  

-  return b;

-}

-

-uint8_t onewire_byte_rd(onewire_bus_t* bus)

-{

-  // read by sending only "1"s, so bus gets released

-  // after the init low-pulse in every slot

-  return onewire_byte_wr(bus, 0xFF); 

-}

-

-

-uint8_t onewire_rom_search(onewire_bus_t* bus, uint8_t diff, uint8_t *id )

-{

-  uint8_t i, j, next_diff;

-  uint8_t b;

-  

-  if(onewire_reset(bus)) {

-    return ONEWIRE_PRESENCE_ERR;         // error, no device found <--- early exit!

-  }

-  

-  onewire_byte_wr(ONEWIRE_SEARCH_ROM);        // ROM search command

-  next_diff = ONEWIRE_LAST_DEVICE;         // unchanged on last device

-  

-  i = ONEWIRE_ROMCODE_SIZE * 8;            // 8 bytes

-  

-  do {

-    j = 8;                          // 8 bits

-    do {

-      b = onewire_bit_io(bus, 1);         // read bit

-      if(onewire_bit_io(bus, 1)) {      // read complement bit

-	if(b) {               // 0b11

-	  return ONEWIRE_DATA_ERR; // data error <--- early exit!

-	}

-      }

-      else {

-	if(!b) {              // 0b00 = 2 devices

-	  if(diff > i || ((*id & 1) && diff != i)) {

-	    b = 1;          // now 1

-	    next_diff = i;  // next pass 0

-	  }

-	}

-      }

-      onewire_bit_io(bus, b);             // write bit

-      *id >>= 1;

-      if(b) *id |= 0x80;            // store bit

-      i--;

-      

-    } while(--j);

-    id++;                           // next byte

-  } while(i);

-  

-  return next_diff;                   // to continue search

-}

-

-

-static void onewire_command_intern(onewire_bus_t* bus, uint8_t command, uint8_t *id, uint8_t with_parasite_enable)

-{

-  uint8_t i;

-  

-  onewire_reset(bus);

-  

-  if( id ) {

-    onewire_byte_wr(bus, ONEWIRE_MATCH_ROM);     // to a single device

-    i = ONEWIRE_ROMCODE_SIZE;

-    do {

-      onewire_byte_wr(bus, *id);

-      id++;

-    } while(--i);

-  } 

-  else {

-    onewire_byte_wr(bus, ONEWIRE_SKIP_ROM);      // to all devices

-  }

-  

-  if(with_parasite_enable) {

-    onewire_byte_wr_with_parasite_enable(bus, command);

-  } else {

-    onewire_byte_wr(bus, command);

-  }

-}

-

-void onewire_command(onewire_bus_t* bus, uint8_t command, uint8_t *id )

-{

-  onewire_command_intern(bus, command, id, 0);

-}

-

-void onewire_command_with_parasite_enable(onewire_bus_t* bus, uint8_t command, uint8_t *id)

-{

-  onewire_command_intern(bus, command, id, 1);

-}

-

+/*
+Copyright (c) 2007, Jim Studt  (original old version - many contributors since)
+refactored from C++ to C by Bernhard Tittelbach
+
+The latest version of this library may be found at:
+  http://www.pjrc.com/teensy/td_libs_OneWire.html
+
+OneWire has been maintained by Paul Stoffregen (paul@pjrc.com) since
+January 2010.  At the time, it was in need of many bug fixes, but had
+been abandoned the original author (Jim Studt).  None of the known
+contributors were interested in maintaining OneWire.  Paul typically
+works on OneWire every 6 to 12 months.  Patches usually wait that
+long.  If anyone is interested in more actively maintaining OneWire,
+please contact Paul.
+
+Version 2.2:
+  Teensy 3.0 compatibility, Paul Stoffregen, paul@pjrc.com
+  Arduino Due compatibility, http://arduino.cc/forum/index.php?topic=141030
+  Fix DS18B20 example negative temperature
+  Fix DS18B20 example's low res modes, Ken Butcher
+  Improve reset timing, Mark Tillotson
+  Add const qualifiers, Bertrik Sikken
+  Add initial value input to crc16, Bertrik Sikken
+  Add target_search() function, Scott Roberts
+
+Version 2.1:
+  Arduino 1.0 compatibility, Paul Stoffregen
+  Improve temperature example, Paul Stoffregen
+  DS250x_PROM example, Guillermo Lovato
+  PIC32 (chipKit) compatibility, Jason Dangel, dangel.jason AT gmail.com
+  Improvements from Glenn Trewitt:
+  - crc16() now works
+  - check_crc16() does all of calculation/checking work.
+  - Added read_bytes() and write_bytes(), to reduce tedious loops.
+  - Added ds2408 example.
+  Delete very old, out-of-date readme file (info is here)
+
+Version 2.0: Modifications by Paul Stoffregen, January 2010:
+http://www.pjrc.com/teensy/td_libs_OneWire.html
+  Search fix from Robin James
+    http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+  Use direct optimized I/O in all cases
+  Disable interrupts during timing critical sections
+    (this solves many random communication errors)
+  Disable interrupts during read-modify-write I/O
+  Reduce RAM consumption by eliminating unnecessary
+    variables and trimming many to 8 bits
+  Optimize both crc8 - table version moved to flash
+
+Modified to work with larger numbers of devices - avoids loop.
+Tested in Arduino 11 alpha with 12 sensors.
+26 Sept 2008 -- Robin James
+http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+
+Updated to work with arduino-0008 and to include skip() as of
+2007/07/06. --RJL20
+
+Modified to calculate the 8-bit CRC directly, avoiding the need for
+the 256-byte lookup table to be loaded in RAM.  Tested in arduino-0010
+-- Tom Pollard, Jan 23, 2008
+
+Jim Studt's original library was modified by Josh Larios.
+
+Tom Pollard, pollard@alum.mit.edu, contributed around May 20, 2008
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Much of the code was inspired by Derek Yerger's code, though I don't
+think much of that remains.  In any event that was..
+    (copyleft) 2006 by Derek Yerger - Free to distribute freely.
+
+The CRC code was excerpted and inspired by the Dallas Semiconductor
+sample code bearing this copyright.
+//---------------------------------------------------------------------------
+// Copyright (C) 2000 Dallas Semiconductor Corporation, All Rights Reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY,  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL DALLAS SEMICONDUCTOR BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of Dallas Semiconductor
+// shall not be used except as stated in the Dallas Semiconductor
+// Branding Policy.
+//--------------------------------------------------------------------------
+*/
+
+#include "onewire.h"
+#include <util/delay.h>
+#include <avr/interrupt.h>
+
+
+IO_REG_TYPE owi_bitmask;
+volatile IO_REG_TYPE *owi_baseReg;
+#if ONEWIRE_SEARCH
+// global search state
+unsigned char ROM_NO[8];
+uint8_t owi_LastDiscrepancy;
+uint8_t owi_LastFamilyDiscrepancy;
+uint8_t owi_LastDeviceFlag;
+#endif
+
+
+void owi_init(uint8_t pin, volatile IO_REG_TYPE *pin_read_port)
+{
+    owi_bitmask = _BV(pin);
+  owi_baseReg = pin_read_port;
+    DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask);
+#if ONEWIRE_SEARCH
+  owi_reset_search();
+#endif
+}
+
+
+// Perform the onewire reset function.  We will wait up to 250uS for
+// the bus to come high, if it doesn't then it is broken or shorted
+// and we return a 0;
+//
+// Returns 1 if a device asserted a presence pulse, 0 otherwise.
+//
+uint8_t owi_reset(void)
+{
+  IO_REG_TYPE mask = owi_bitmask;
+  register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg;
+  uint8_t r;
+  uint8_t retries = 125;
+
+  cli();
+  DIRECT_MODE_INPUT(reg, mask);
+  sei();
+  // wait until the wire is high... just in case
+  do {
+    if (--retries == 0) return 0;
+    _delay_us(2);
+  } while ( !DIRECT_READ(reg, mask));
+
+  cli();
+  DIRECT_WRITE_LOW(reg, mask);
+  DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+  sei();
+  _delay_us(480);
+  cli();
+  DIRECT_MODE_INPUT(reg, mask);	// allow it to float
+  _delay_us(70);
+  r = !DIRECT_READ(reg, mask);
+  sei();
+  _delay_us(410);
+  return r;
+}
+
+//
+// Write a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+void owi_write_bit(uint8_t v)
+{
+  IO_REG_TYPE mask=owi_bitmask;
+  register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg;
+
+  if (v & 1) {
+    cli();
+    DIRECT_WRITE_LOW(reg, mask);
+    DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+    _delay_us(10);
+    DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+    sei();
+    _delay_us(55);
+  } else {
+    cli();
+    DIRECT_WRITE_LOW(reg, mask);
+    DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+    _delay_us(65);
+    DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+    sei();
+    _delay_us(5);
+  }
+}
+
+//
+// Read a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+uint8_t owi_read_bit(void)
+{
+  IO_REG_TYPE mask=owi_bitmask;
+  register volatile IO_REG_TYPE *reg IO_REG_ASM = owi_baseReg;
+  uint8_t r;
+
+  cli();
+  DIRECT_MODE_OUTPUT(reg, mask);
+  DIRECT_WRITE_LOW(reg, mask);
+  _delay_us(3);
+  DIRECT_MODE_INPUT(reg, mask);	// let pin float, pull up will raise
+  _delay_us(10);
+  r = DIRECT_READ(reg, mask);
+  sei();
+  _delay_us(53);
+  return r;
+}
+
+//
+// Write a byte. The writing code uses the active drivers to raise the
+// pin high, if you need power after the write (e.g. DS18S20 in
+// parasite power mode) then set 'power' to 1, otherwise the pin will
+// go tri-state at the end of the write to avoid heating in a short or
+// other mishap.
+//
+void owi_write(uint8_t v, uint8_t power /* = 0 */) {
+    uint8_t bitMask;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+  owi_write_bit( (bitMask & v)?1:0);
+    }
+    if ( !power) {
+  cli();
+  DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask);
+  DIRECT_WRITE_LOW(owi_baseReg, owi_bitmask);
+  sei();
+    }
+}
+
+void owi_write_bytes(const uint8_t *buf, uint16_t count, bool power /* = 0 */) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    owi_write(buf[i],0);
+  if (!power) {
+    cli();
+    DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask);
+    DIRECT_WRITE_LOW(owi_baseReg, owi_bitmask);
+    sei();
+  }
+}
+
+//
+// Read a byte
+//
+uint8_t owi_read() {
+    uint8_t bitMask;
+    uint8_t r = 0;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+  if ( owi_read_bit()) r |= bitMask;
+    }
+    return r;
+}
+
+void owi_read_bytes(uint8_t *buf, uint16_t count) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    buf[i] = owi_read();
+}
+
+//
+// Do a ROM select
+//
+void owi_select(const uint8_t rom[8])
+{
+    uint8_t i;
+
+    owi_write(0x55,0);           // Choose ROM
+
+    for (i = 0; i < 8; i++) owi_write(rom[i],0);
+}
+
+//
+// Do a ROM skip
+//
+void owi_skip()
+{
+    owi_write(0xCC,0);           // Skip ROM
+}
+
+void owi_depower()
+{
+  cli();
+  DIRECT_MODE_INPUT(owi_baseReg, owi_bitmask);
+  sei();
+}
+
+#if ONEWIRE_SEARCH
+
+//
+// You need to use this function to start a search again from the beginning.
+// You do not need to do it for the first search, though you could.
+//
+void owi_reset_search()
+{
+  // reset the search state
+  owi_LastDiscrepancy = 0;
+  owi_LastDeviceFlag = FALSE;
+  owi_LastFamilyDiscrepancy = 0;
+  for(int i = 7; ; i--) {
+    ROM_NO[i] = 0;
+    if ( i == 0) break;
+  }
+}
+
+// Setup the search to find the device type 'family_code' on the next call
+// to search(*newAddr) if it is present.
+//
+void owi_target_search(uint8_t family_code)
+{
+   // set the search state to find SearchFamily type devices
+   ROM_NO[0] = family_code;
+   for (uint8_t i = 1; i < 8; i++)
+      ROM_NO[i] = 0;
+   owi_LastDiscrepancy = 64;
+   owi_LastFamilyDiscrepancy = 0;
+   owi_LastDeviceFlag = FALSE;
+}
+
+//
+// Perform a search. If this function returns a '1' then it has
+// enumerated the next device and you may retrieve the ROM from the
+// owi_address variable. If there are no devices, no further
+// devices, or something horrible happens in the middle of the
+// enumeration then a 0 is returned.  If a new device is found then
+// its address is copied to newAddr.  Use owi_reset_search() to
+// start over.
+//
+// --- Replaced by the one from the Dallas Semiconductor web site ---
+//--------------------------------------------------------------------------
+// Perform the 1-Wire Search Algorithm on the 1-Wire bus using the existing
+// search state.
+// Return TRUE  : device found, ROM number in ROM_NO buffer
+//        FALSE : device not found, end of search
+//
+uint8_t owi_search(uint8_t *newAddr)
+{
+   uint8_t id_bit_number;
+   uint8_t last_zero, rom_byte_number, search_result;
+   uint8_t id_bit, cmp_id_bit;
+
+   unsigned char rom_byte_mask, search_direction;
+
+   // initialize for search
+   id_bit_number = 1;
+   last_zero = 0;
+   rom_byte_number = 0;
+   rom_byte_mask = 1;
+   search_result = 0;
+
+   // if the last call was not the last one
+   if (!owi_LastDeviceFlag)
+   {
+      // 1-Wire reset
+      if (!owi_reset())
+      {
+         // reset the search
+         owi_LastDiscrepancy = 0;
+         owi_LastDeviceFlag = FALSE;
+         owi_LastFamilyDiscrepancy = 0;
+         return FALSE;
+      }
+
+      // issue the search command
+      owi_write(0xF0,0);
+
+      // loop to do the search
+      do
+      {
+         // read a bit and its complement
+         id_bit = owi_read_bit();
+         cmp_id_bit = owi_read_bit();
+
+         // check for no devices on 1-wire
+         if ((id_bit == 1) && (cmp_id_bit == 1))
+            break;
+         else
+         {
+            // all devices coupled have 0 or 1
+            if (id_bit != cmp_id_bit)
+               search_direction = id_bit;  // bit write value for search
+            else
+            {
+               // if this discrepancy if before the Last Discrepancy
+               // on a previous next then pick the same as last time
+               if (id_bit_number < owi_LastDiscrepancy)
+                  search_direction = ((ROM_NO[rom_byte_number] & rom_byte_mask) > 0);
+               else
+                  // if equal to last pick 1, if not then pick 0
+                  search_direction = (id_bit_number == owi_LastDiscrepancy);
+
+               // if 0 was picked then record its position in LastZero
+               if (search_direction == 0)
+               {
+                  last_zero = id_bit_number;
+
+                  // check for Last discrepancy in family
+                  if (last_zero < 9)
+                     owi_LastFamilyDiscrepancy = last_zero;
+               }
+            }
+
+            // set or clear the bit in the ROM byte rom_byte_number
+            // with mask rom_byte_mask
+            if (search_direction == 1)
+              ROM_NO[rom_byte_number] |= rom_byte_mask;
+            else
+              ROM_NO[rom_byte_number] &= ~rom_byte_mask;
+
+            // serial number search direction write bit
+            owi_write_bit(search_direction);
+
+            // increment the byte counter id_bit_number
+            // and shift the mask rom_byte_mask
+            id_bit_number++;
+            rom_byte_mask <<= 1;
+
+            // if the mask is 0 then go to new SerialNum byte rom_byte_number and reset mask
+            if (rom_byte_mask == 0)
+            {
+                rom_byte_number++;
+                rom_byte_mask = 1;
+            }
+         }
+      }
+      while(rom_byte_number < 8);  // loop until through all ROM bytes 0-7
+
+      // if the search was successful then
+      if (!(id_bit_number < 65))
+      {
+         // search successful so set owi_LastDiscrepancy,owi_LastDeviceFlag,search_result
+         owi_LastDiscrepancy = last_zero;
+
+         // check for last device
+         if (owi_LastDiscrepancy == 0)
+            owi_LastDeviceFlag = TRUE;
+
+         search_result = TRUE;
+      }
+   }
+
+   // if no device found then reset counters so next 'search' will be like a first
+   if (!search_result || !ROM_NO[0])
+   {
+      owi_LastDiscrepancy = 0;
+      owi_LastDeviceFlag = FALSE;
+      owi_LastFamilyDiscrepancy = 0;
+      search_result = FALSE;
+   }
+   for (int i = 0; i < 8; i++) newAddr[i] = ROM_NO[i];
+   return search_result;
+  }
+
+#endif
+
+#if ONEWIRE_CRC
+// The 1-Wire CRC scheme is described in Maxim Application Note 27:
+// "Understanding and Using Cyclic Redundancy Checks with Maxim iButton Products"
+//
+
+#if ONEWIRE_CRC8_TABLE
+// This table comes from Dallas sample code where it is freely reusable,
+// though Copyright (C) 2000 Dallas Semiconductor Corporation
+const uint8_t PROGMEM dscrc_table[] = {
+      0, 94,188,226, 97, 63,221,131,194,156,126, 32,163,253, 31, 65,
+    157,195, 33,127,252,162, 64, 30, 95,  1,227,189, 62, 96,130,220,
+     35,125,159,193, 66, 28,254,160,225,191, 93,  3,128,222, 60, 98,
+    190,224,  2, 92,223,129, 99, 61,124, 34,192,158, 29, 67,161,255,
+     70, 24,250,164, 39,121,155,197,132,218, 56,102,229,187, 89,  7,
+    219,133,103, 57,186,228,  6, 88, 25, 71,165,251,120, 38,196,154,
+    101, 59,217,135,  4, 90,184,230,167,249, 27, 69,198,152,122, 36,
+    248,166, 68, 26,153,199, 37,123, 58,100,134,216, 91,  5,231,185,
+    140,210, 48,110,237,179, 81, 15, 78, 16,242,172, 47,113,147,205,
+     17, 79,173,243,112, 46,204,146,211,141,111, 49,178,236, 14, 80,
+    175,241, 19, 77,206,144,114, 44,109, 51,209,143, 12, 82,176,238,
+     50,108,142,208, 83, 13,239,177,240,174, 76, 18,145,207, 45,115,
+    202,148,118, 40,171,245, 23, 73,  8, 86,180,234,105, 55,213,139,
+     87,  9,235,181, 54,104,138,212,149,203, 41,119,244,170, 72, 22,
+    233,183, 85, 11,136,214, 52,106, 43,117,151,201, 74, 20,246,168,
+    116, 42,200,150, 21, 75,169,247,182,232, 10, 84,215,137,107, 53};
+
+//
+// Compute a Dallas Semiconductor 8 bit CRC. These show up in the ROM
+// and the registers.  (note: this might better be done without to
+// table, it would probably be smaller and certainly fast enough
+// compared to all those delayMicrosecond() calls.  But I got
+// confused, so I use this table from the examples.)
+//
+uint8_t owi_crc8(const uint8_t *addr, uint8_t len)
+{
+  uint8_t crc = 0;
+
+  while (len--) {
+    crc = pgm_read_byte(dscrc_table + (crc ^ *addr++));
+  }
+  return crc;
+}
+#else
+//
+// Compute a Dallas Semiconductor 8 bit CRC directly.
+// this is much slower, but much smaller, than the lookup table.
+//
+uint8_t owi_crc8(const uint8_t *addr, uint8_t len)
+{
+  uint8_t crc = 0;
+
+  while (len--) {
+    uint8_t inbyte = *addr++;
+    for (uint8_t i = 8; i; i--) {
+      uint8_t mix = (crc ^ inbyte) & 0x01;
+      crc >>= 1;
+      if (mix) crc ^= 0x8C;
+      inbyte >>= 1;
+    }
+  }
+  return crc;
+}
+#endif
+
+#if ONEWIRE_CRC16
+bool owi_check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc)
+{
+    crc = ~owi_crc16(input, len, crc);
+    return (crc & 0xFF) == inverted_crc[0] && (crc >> 8) == inverted_crc[1];
+}
+
+uint16_t owi_crc16(const uint8_t* input, uint16_t len, uint16_t crc)
+{
+    static const uint8_t oddparity[16] =
+        { 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 };
+
+    for (uint16_t i = 0 ; i < len ; i++) {
+      // Even though we're just copying a byte from the input,
+      // we'll be doing 16-bit computation with it.
+      uint16_t cdata = input[i];
+      cdata = (cdata ^ crc) & 0xff;
+      crc >>= 8;
+
+      if (oddparity[cdata & 0x0F] ^ oddparity[cdata >> 4])
+          crc ^= 0xC001;
+
+      cdata <<= 6;
+      crc ^= cdata;
+      cdata <<= 1;
+      crc ^= cdata;
+    }
+    return crc;
+}
+#endif
+
+#endif
diff --git a/software/lib/onewire.h b/software/lib/onewire.h
index ecd8207..1410fde 100644
--- a/software/lib/onewire.h
+++ b/software/lib/onewire.h
@@ -1,92 +1,206 @@
-/*

- *  spreadspace avr utils

- *

- *

- *  Copyright (C) 2013 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/>.

- */

-

-/* 

-   This is inspired by 

-

-   DS18x20 Demo-Program

-   

-   V 0.9.2, 2/2011

-   

-   by Martin Thomas <eversmith@heizung-thomas.de>

-   http://www.siwawi.arubi.uni-kl.de/avr-projects

-*/

-

-

-#ifndef SPREADAVR_onewire_h_INCLUDED

-#define SPREADAVR_onewire_h_INCLUDED

-

-typedef struct {

-  uint8_t* in;

-  uint8_t* out;

-  uint8_t* ddr;

-  uint8_t pin;

-} onewire_bus_t;

-

-#define OW_CONF_CYCLESPERACCESS 13

-#define OW_CONF_DELAYOFFSET ( (uint16_t)( ((OW_CONF_CYCLESPERACCESS) * 1000000L) / F_CPU ) )

-

-// Recovery time (T_Rec) minimum 1usec - increase for long lines 

-// 5 usecs is a value give in some Maxim AppNotes

-// 30u secs seem to be reliable for longer lines

-//#define OW_RECOVERY_TIME        5  /* usec */

-//#define OW_RECOVERY_TIME      300 /* usec */

-#define OW_RECOVERY_TIME         10 /* usec */

-

-// Use AVR's internal pull-up resistor instead of external 4,7k resistor.

-// Based on information from Sascha Schade. Experimental but worked in tests

-// with one DS18B20 and one DS18S20 on a rather short bus (60cm), where both 

-// sensores have been parasite-powered.

-#define OW_USE_INTERNAL_PULLUP     1  /* 0=external, 1=internal */

-

-/*******************************************/

-

-

-#define OW_MATCH_ROM    0x55

-#define OW_SKIP_ROM     0xCC

-#define OW_SEARCH_ROM   0xF0

-

-#define OW_SEARCH_FIRST 0xFF        // start new search

-#define OW_PRESENCE_ERR 0xFF

-#define OW_DATA_ERR     0xFE

-#define OW_LAST_DEVICE  0x00        // last device found

-

-// rom-code size including CRC

-#define OW_ROMCODE_SIZE 8

-

-void onewire_init(onewire_bus_t* bus);

-uint8_t onewire_reset(onewire_bus_t* bus);

-

-extern uint8_t onewire_bit_io(onewire_bus_t* bus, uint8_t b);

-extern uint8_t onewire_byte_wr(onewire_bus_t* bus, uint8_t b);

-extern uint8_t onewire_byte_rd(onewire_bus_t* bus);

-

-extern uint8_t onewire_rom_search(onewire_bus_t* bus, uint8_t diff, uint8_t *id);

-

-extern void onewire_command(onewire_bus_t* bus, uint8_t command, uint8_t *id);

-extern void onewire_command_with_parasite_enable(onewire_bus_t* bus, uint8_t command, uint8_t *id);

-

-extern void onewire_parasite_enable(onewire_bus_t* bus);

-extern void onewire_parasite_disable(onewire_bus_t* bus);

-extern uint8_t onewire_input_pin_state(onewire_bus_t* bus);

-

-#endif

+#ifndef OneWire_h
+#define OneWire_h
+
+#include <inttypes.h>
+#include <stdbool.h>
+#include <avr/pgmspace.h>
+
+// You can exclude certain features from OneWire.  In theory, this
+// might save some space.  In practice, the compiler automatically
+// removes unused code (technically, the linker, using -fdata-sections
+// and -ffunction-sections when compiling, and Wl,--gc-sections
+// when linking), so most of these will not result in any code size
+// reduction.  Well, unless you try to use the missing features
+// and redesign your program to not need them!  ONEWIRE_CRC8_TABLE
+// is the exception, because it selects a fast but large algorithm
+// or a small but slow algorithm.
+
+// you can exclude onewire_search by defining that to 0
+#ifndef ONEWIRE_SEARCH
+#define ONEWIRE_SEARCH 1
+#endif
+
+// You can exclude CRC checks altogether by defining this to 0
+#ifndef ONEWIRE_CRC
+#define ONEWIRE_CRC 1
+#endif
+
+// Select the table-lookup method of computing the 8-bit CRC
+// by setting this to 1.  The lookup table enlarges code size by
+// about 250 bytes.  It does NOT consume RAM (but did in very
+// old versions of OneWire).  If you disable this, a slower
+// but very compact algorithm is used.
+#ifndef ONEWIRE_CRC8_TABLE
+#define ONEWIRE_CRC8_TABLE 1
+#endif
+
+// You can allow 16-bit CRC checks by defining this to 1
+// (Note that ONEWIRE_CRC must also be 1.)
+#ifndef ONEWIRE_CRC16
+#define ONEWIRE_CRC16 1
+#endif
+
+#define FALSE 0
+#define TRUE  1
+
+// Platform specific I/O definitions
+
+#if defined(__AVR__)
+#define PIN_TO_BASEREG(pin)             (portInputRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM __asm__("r30")
+#define DIRECT_READ(base, mask)         (((*(base)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+1)) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+2)) &= ~(mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+2)) |= (mask))
+
+#elif defined(__MK20DX128__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (1)
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (*((base)+512))
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+640) = 0)
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+640) = 1)
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+256) = 1)
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+128) = 1)
+
+#elif defined(__SAM3X8E__)
+// Arduino 1.5.1 may have a bug in delayMicroseconds() on Arduino Due.
+// http://arduino.cc/forum/index.php/topic,141030.msg1076268.html#msg1076268
+// If you have trouble with OneWire on Arduino Due, please check the
+// status of delayMicroseconds() before reporting a bug in OneWire!
+#define PIN_TO_BASEREG(pin)             (&(digitalPinToPort(pin)->PIO_PER))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*((base)+15)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+5)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+4)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+13)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+12)) = (mask))
+#ifndef PROGMEM
+#define PROGMEM
+#endif
+#ifndef pgm_read_byte
+#define pgm_read_byte(addr) (*(const uint8_t *)(addr))
+#endif
+
+#elif defined(__PIC32MX__)
+#define PIN_TO_BASEREG(pin)             (portModeRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*(base+4)) & (mask)) ? 1 : 0)  //PORTX + 0x10
+#define DIRECT_MODE_INPUT(base, mask)   ((*(base+2)) = (mask))            //TRISXSET + 0x08
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*(base+1)) = (mask))            //TRISXCLR + 0x04
+#define DIRECT_WRITE_LOW(base, mask)    ((*(base+8+1)) = (mask))          //LATXCLR  + 0x24
+#define DIRECT_WRITE_HIGH(base, mask)   ((*(base+8+2)) = (mask))          //LATXSET + 0x28
+
+#else
+#error "Please define I/O register types here"
+#endif
+
+#ifndef _BV
+#define _BV(bit) (1 << (bit))
+#endif
+
+void owi_init(uint8_t pin, volatile IO_REG_TYPE *pin_read_port);
+
+uint8_t owi_reset(void);
+void owi_select(const uint8_t rom[8]);
+
+// Issue a 1-Wire rom skip command, to address all on bus.
+void owi_skip(void);
+
+// Write a byte. If 'power' is one then the wire is held high at
+// the end for parasitically powered devices. You are responsible
+// for eventually depowering it by calling depower() or doing
+// another read or write.
+void owi_write(uint8_t v, uint8_t power);
+
+void owi_write_bytes(const uint8_t *buf, uint16_t count, bool power);
+
+// Read a byte.
+uint8_t owi_read(void);
+
+void owi_read_bytes(uint8_t *buf, uint16_t count);
+
+// Write a bit. The bus is always left powered at the end, see
+// note in write() about that.
+void owi_write_bit(uint8_t v);
+
+// Read a bit.
+uint8_t owi_read_bit(void);
+
+// Stop forcing power onto the bus. You only need to do this if
+// you used the 'power' flag to write() or used a write_bit() call
+// and aren't about to do another read or write. You would rather
+// not leave this powered if you don't have to, just in case
+// someone shorts your bus.
+void owi_depower(void);
+
+#if ONEWIRE_SEARCH
+// Clear the search state so that if will start from the beginning again.
+void owi_reset_search(void);
+
+// Setup the search to find the device type 'family_code' on the next call
+// to search(*newAddr) if it is present.
+void owi_target_search(uint8_t family_code);
+
+// Look for the next device. Returns 1 if a new address has been
+// returned. A zero might mean that the bus is shorted, there are
+// no devices, or you have already retrieved all of them.  It
+// might be a good idea to check the CRC to make sure you didn't
+// get garbage.  The order is deterministic. You will always get
+// the same devices in the same order.
+uint8_t owi_search(uint8_t *newAddr);
+#endif
+
+#if ONEWIRE_CRC
+// Compute a Dallas Semiconductor 8 bit CRC, these are used in the
+// ROM and scratchpad registers.
+uint8_t owi_crc8(const uint8_t *addr, uint8_t len);
+
+#if ONEWIRE_CRC16
+// Compute the 1-Wire CRC16 and compare it against the received CRC.
+// Example usage (reading a DS2408):
+//    // Put everything in a buffer so we can compute the CRC easily.
+//    uint8_t buf[13];
+//    buf[0] = 0xF0;    // Read PIO Registers
+//    buf[1] = 0x88;    // LSB address
+//    buf[2] = 0x00;    // MSB address
+//    WriteBytes(net, buf, 3);    // Write 3 cmd bytes
+//    ReadBytes(net, buf+3, 10);  // Read 6 data bytes, 2 0xFF, 2 CRC16
+//    if (!CheckCRC16(buf, 11, &buf[11])) {
+//        // Handle error.
+//    }
+//
+// @param input - Array of bytes to checksum.
+// @param len - How many bytes to use.
+// @param inverted_crc - The two CRC16 bytes in the received data.
+//                       This should just point into the received data,
+//                       *not* at a 16-bit integer.
+// @param crc - The crc starting value (optional)
+// @return True, iff the CRC matches.
+bool owi_check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc);
+
+// Compute a Dallas Semiconductor 16 bit CRC.  This is required to check
+// the integrity of data received from many 1-Wire devices.  Note that the
+// CRC computed here is *not* what you'll get from the 1-Wire network,
+// for two reasons:
+//   1) The CRC is transmitted bitwise inverted.
+//   2) Depending on the endian-ness of your processor, the binary
+//      representation of the two-byte return value may have a different
+//      byte order than the two bytes you get from 1-Wire.
+// @param input - Array of bytes to checksum.
+// @param len - How many bytes to use.
+// @param crc - The crc starting value (optional)
+// @return The CRC16, as defined by Dallas Semiconductor.
+uint16_t owi_crc16(const uint8_t* input, uint16_t len, uint16_t crc);
+#endif
+#endif
+
+#endif
diff --git a/software/lib/usbio.c b/software/lib/usbio.c
index 371f9e7..6a7f76e 100644
--- a/software/lib/usbio.c
+++ b/software/lib/usbio.c
@@ -83,8 +83,13 @@ void usbio_init(void)
 
 void usbio_task(void)
 {
-  CDC_Device_USBTask(&VirtualSerial_CDC_Interface); 
-  USB_USBTask(); 
+  if(USB_DeviceState == DEVICE_STATE_Unattached && USB_VBUS_GetStatus()) {
+    USB_Disable();
+    USB_Init();
+  }
+
+  CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
+  USB_USBTask();
 }
 
 int16_t usbio_bytes_received(void)
@@ -95,7 +100,7 @@ int16_t usbio_bytes_received(void)
     return 0;
 }
 
-void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)  
+void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
   if(CDCInterfaceInfo->State.ControlLineStates.HostToDevice & CDC_CONTROL_LINE_OUT_DTR)
     stdin = stdout = stderr = &usb_stream;
diff --git a/software/lib/util.c b/software/lib/util.c
index 0e99a93..8b74dfb 100644
--- a/software/lib/util.c
+++ b/software/lib/util.c
@@ -37,6 +37,17 @@ void cpu_init(void)
   CPU_PRESCALE(0);
 }
 
+void jtag_disable(void)
+{
+  uint8_t tempreg;
+  __asm __volatile("in %[tempreg], %[mcucr]" "\n\t"
+                   "ori %[tempreg], %[jtd]" "\n\t"
+                   "out %[mcucr], %[tempreg]" "\n\t"
+                   "out %[mcucr], %[tempreg]"
+                   : [tempreg] "=d" (tempreg)
+                   : [mcucr] "I" (_SFR_IO_ADDR(MCUCR)), [jtd] "M" (_BV(JTD)));
+}
+
 #if defined(__BOARD_teensy1__)
   #define BOOTLOADER_VEC 0x3E00
 #elif defined(__BOARD_teensy2__)
@@ -51,7 +62,7 @@ void cpu_init(void)
   #define BOOTLOADER_VEC 0x3800
 #elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__)
   #define BOOTLOADER_VEC 0x3800
-#elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__)
+#elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
   #define BOOTLOADER_VEC 0x3800
 #else
   #define BOOTLOADER_VEC 0x0000
@@ -64,7 +75,7 @@ void reset2bootloader(void)
 {
 #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
     defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
-    defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || \
+    defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || \
     defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
   cli();
   // disable watchdog, if enabled
@@ -103,7 +114,8 @@ void reset2bootloader(void)
     TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
     DDRB = 0; DDRC = 0; DDRD = 0;
     PORTB = 0; PORTC = 0; PORTD = 0;
-  #elif defined(__BOARD_hhd70dongle2__) || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__)
+  #elif defined(__BOARD_hhd70dongle2__) || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
+        defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
     EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
     TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
     DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
diff --git a/software/lib/util.h b/software/lib/util.h
index b8403b3..18c1eca 100644
--- a/software/lib/util.h
+++ b/software/lib/util.h
@@ -24,6 +24,7 @@
 #define SPREADAVR_util_h_INCLUDED
 
 void cpu_init(void);
+void jtag_disable(void);
 void reset2bootloader(void);
 
 #endif