Cleanup

Author: mikaelpatel

README.md

@@ -17,18 +17,18 @@ Version: 1.8
 * [Hardware One-Wire Bus Manager, DS2482, Hardware::OWI](./src/Hardware/OWI.h)
 * [Software One-Wire Slave Device, Slave::OWI](./src/Slave/OWI.h)
 * [Programmable Resolution 1-Wire Digital Thermometer, DS18B20](./src/Driver/DS18B20.h)
-* [One-Wire Remove Arduino, Master](./src/Driver/Arduino.h)
+* [One-Wire Remote Arduino, Master](./src/Driver/Arduino.h)
 
 ## Example Sketches
 
 * [Alarm](./examples/Alarm)
-* [Arduino](./examples/Arduino)
-* [Arduino, Slave](./examples/Slave/Arduino)
 * [Search](./examples/Search)
 * [Scanner](./examples/Scanner)
-* [DS18B20](./examples/DS18B20)
+* [DS18B20, Master](./examples/DS18B20)
 * [DS18B20, Slave](./examples/Slave/DS18B20)
 * [DS1990A](./examples/DS1990A)
+* [Remote Arduino, Master](./examples/Arduino)
+* [Remote Arduino, Slave](./examples/Slave/Arduino)
 
 [ATtiny](./examples/ATtiny) and [DS2482](./examples/DS2482)
 variants.

examples/Arduino/Arduino.ino

@@ -5,7 +5,7 @@
 #include "assert.h"
 #include "benchmark.h"
 
-// One-Wire Interface Remove Arduino (Master)
+// One-Wire Interface Remote Arduino (Master)
 Software::OWI<BOARD::D7> owi;
 Arduino arduino(owi);
 
@@ -20,7 +20,7 @@ void setup()
   int pins;
 
   // Search for device and set short address (label)
-  last = owi.search_rom(arduino.FAMILY, rom, last);
+  last = owi.search_rom(arduino.FAMILY_CODE, rom, last);
   ASSERT(last != owi.ERROR);
   arduino.rom(rom);
   arduino.label_rom(id);

examples/Slave/Arduino/Arduino.ino

@@ -3,13 +3,8 @@
 #include "Slave/OWI.h"
 #include "Driver/Arduino.h"
 
-/** ROM identity code (in program memory). */
-const uint8_t ROM[OWI::ROM_MAX] PROGMEM = {
-  Arduino::FAMILY, 0x21, 0x32, 0x43, 0x54, 0x65, 0x76, 0x80
-};
-
 /** One-Wire Slave Device Bus Manager. */
-Slave::OWI<BOARD::D7> owi(ROM);
+Slave::OWI<BOARD::D7> owi(Arduino::FAMILY_CODE);
 
 /**
  * Setup One-Wire Remote Arduino Slave Device. Set alarm

examples/Slave/DS18B20/DS18B20.ino

@@ -28,13 +28,8 @@ struct scratchpad_t {
   uint8_t reserved[3];		//!< Reserved.
 } __attribute__((packed));
 
-// ROM identity for slave device
-const uint8_t ROM[OWI::ROM_MAX] PROGMEM = {
-  FAMILY_CODE, 0x12, 0x34, 0x56, 0x78, 0x89, 0x9a, 0xab
-};
-
-// Slave device one wire access
-Slave::OWI<BOARD::D7> owi(ROM);
+// Slave device one wire access; use random rom code
+Slave::OWI<BOARD::D7> owi(FAMILY_CODE);
 
 // Scratchpad with temperature, triggers and configuration
 scratchpad_t scratchpad = {

src/Driver/Arduino.h

@@ -35,10 +35,10 @@
 class Arduino : public OWI::Device {
 public:
   /** Family code. */
-  static const uint8_t FAMILY = 0x10;
+  static const uint8_t FAMILY_CODE = 0x60;
 
   /**
-   * Construct One-Wire Interface (OWI) Remove Arduino with given bus
+   * Construct One-Wire Interface (OWI) Remote Arduino with given bus
    * and device address.
    * @param[in] owi bus manager.
    * @param[in] rom code (default NULL).
@@ -216,7 +216,7 @@ class Arduino : public OWI::Device {
     return (0);
   }
 
-  /** One-Wire Interface (OWI) Remove Arduino Device function codes. */
+  /** One-Wire Interface (OWI) Remote Arduino Device function codes. */
   enum {
     PIN_MODE = 0x11,		//!< Set pin mode: 6b pin, 2b mode
     DIGITAL_READ = 0x22,	//!< Read digital pin: 6b pin, 1b return

src/Slave/OWI.h

@@ -59,6 +59,29 @@ class OWI {
     m_pin.open_drain();
   }
 
+  /**
+   * Construct one wire bus slave device connected to the given
+   * template pin parameter, and family code. Random identity code
+   * is generated.
+   * @param[in] family code
+   */
+  OWI(uint8_t family) :
+    m_timestamp(0),
+    m_label(255),
+    m_alarm(false)
+  {
+    uint8_t crc = crc_update(0, family);
+    uint8_t* p = 0;
+    m_rom[0] = family;
+    for (size_t i = 1; i < ROM_MAX - 1; i++) {
+      uint8_t data = *p++;
+      m_rom[i] = data;
+      crc = crc_update(crc, data);
+    }
+    m_rom[ROM_MAX - 1] = crc;
+    m_pin.open_drain();
+  }
+
   /**
    * Get cyclic redundancy check sum. Calculated by buffer read() and
    * write().