summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/onewire.c571
-rw-r--r--lib/onewire.h229
-rw-r--r--usb-1wire/Makefile4
-rw-r--r--usb-1wire/usb-1wire.c226
4 files changed, 999 insertions, 31 deletions
diff --git a/lib/onewire.c b/lib/onewire.c
new file mode 100644
index 0000000..b733b72
--- /dev/null
+++ b/lib/onewire.c
@@ -0,0 +1,571 @@
+/*
+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/lib/onewire.h b/lib/onewire.h
new file mode 100644
index 0000000..21be0af
--- /dev/null
+++ b/lib/onewire.h
@@ -0,0 +1,229 @@
+#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
+
+#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 _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/usb-1wire/Makefile b/usb-1wire/Makefile
index 97fbd72..099fac3 100644
--- a/usb-1wire/Makefile
+++ b/usb-1wire/Makefile
@@ -23,7 +23,7 @@
NAME := usb-1wire
BOARD_TYPE := teensy2
OBJ := $(NAME).o
-LIBS := util led lufa-descriptor-usbserial usbio
+LIBS := util led lufa-descriptor-usbserial usbio onewire
EXTERNAL_LIBS := lufa
LUFA_PATH := ../contrib/LUFA-120219
@@ -36,7 +36,7 @@ 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\"equinox\""
+LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\""
LUFA_OPTS += -D USB_PRODUCT="L\"$(NAME)\""
LUFA_COMPONENTS := USB USBCLASS
diff --git a/usb-1wire/usb-1wire.c b/usb-1wire/usb-1wire.c
index a383ef1..6fed4f5 100644
--- a/usb-1wire/usb-1wire.c
+++ b/usb-1wire/usb-1wire.c
@@ -1,8 +1,10 @@
/*
- * spreadspace avr utils
+ * spreadspace avr utils - usb-1wire example
*
*
- * Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013 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.
*
@@ -24,45 +26,211 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
-#include <avr/power.h>
+#include <util/delay.h>
#include <stdio.h>
#include "util.h"
#include "led.h"
#include "usbio.h"
+#include "onewire.h"
+
+#define MAX_OWI_DEVICES 3
+
+uint8_t owi_addr_[MAX_OWI_DEVICES][8];
+uint8_t num_owi_dev_found_;
+
+void discoverOWIBus(void)
+{
+ uint8_t d=0;
+ led_on();
+
+ printf("Searching OW 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++;
+ 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 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;
+
+ 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++)
+ {
+ 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);
+ }
+
+ switch (resolution)
+ {
+ 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;
+ }
+
+ if (owi_reset()) //reset is needed
+ printf("Sensor present\r\n");
+ else
+ printf("Sensor NOT present\r\n");
+
+ for (d=0; d<num_owi_dev_found_; d++)
+ {
+ 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])
+ {
+ 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];
+ }
+ } 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
+ }
+ celsius = raw / 16;
+
+ printf("Temperature: raw %d, celsius: %d, resolution: %d bits\r\n", raw, celsius, cfg_res);
+ }
+ led_off();
+}
+
+
void handle_cmd(uint8_t cmd)
{
- switch(cmd) {
- case '0': led_off(); break;
- case '1': led_on(); break;
- case 't': led_toggle(); break;
- case 'r': reset2bootloader(); break;
- default: printf("error\r\n"); return;
- }
- printf("ok\r\n");
+ 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 '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();
-
- for(;;) {
- int16_t BytesReceived = usbio_bytes_received();
- while(BytesReceived > 0) {
- int ReceivedByte = fgetc(stdin);
- if(ReceivedByte != EOF) {
- handle_cmd(ReceivedByte);
- }
- BytesReceived--;
- }
+ MCUSR &= ~(1 << WDRF);
+ wdt_disable();
+
+ cpu_init();
+ led_init();
+ usbio_init();
+ sei();
+ DDRC &= ~7;
+ 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();
- }
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 09:50:30 +0000