Fixed read_scratchpad after search_rom

Author: mikaelpatel

README.md

@@ -1,28 +1,33 @@
 # Arduino-OWI
 The OWI library has been developed to support the implementation of
 1-wire bus managers and device drivers. The library includes a GPIO
-based software and DS2482 based hardware bus manager, and device
-driver for DS18B20.
+based software and DS2482 based hardware bus manager, Slave device
+support class, and device driver for DS18B20.
 
 The examples directory contains device search, bus scanner,
 thermometer alarm search, and example sketches for DS18B20 and
 DS1990A.
 
-Version: 1.7
+Version: 1.8
 
 ## Classes
 
 * [Abstract One-Wire Bus Manager and Device Interface, OWI](./src/OWI.h)
 * [Software One-Wire Bus Manager, GPIO, Software::OWI](./src/Software/OWI.h)
+* [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)
 
 ## Example Sketches
 
-* [DS18B20](./examples/DS18B20)
-* [DS1990A](./examples/DS1990A)
 * [Alarm](./examples/Alarm)
-* [Scanner](./examples/Scanner)
 * [Search](./examples/Search)
+* [Scanner](./examples/Scanner)
+* [DS18B20](./examples/DS18B20)
+* [DS1990A](./examples/DS1990A)
+
+[ATtiny](./examples/ATtiny) and [DS2482](./examples/DS2482)
+variants. And example of [Slave](./examples/Slave) device.
 
 ## Dependencies
 

examples/Alarm/Alarm.ino

@@ -21,7 +21,7 @@ void setup()
     if (last == owi.ERROR) break;
     sensor.resolution(10);
     sensor.set_trigger(20, 25);
-    ASSERT(sensor.write_scratchpad());
+    ASSERT(sensor.write_scratchpad(false));
   } while (last != owi.LAST);
 }
 
@@ -45,7 +45,7 @@ void loop()
     Serial.print('.');
     Serial.print(id++);
     Serial.print(F(":rom="));
-    for (size_t i = 1; i < owi.ROM_MAX; i++) {
+    for (size_t i = 0; i < owi.ROM_MAX; i++) {
       if (rom[i] < 0x10) Serial.print(0);
       Serial.print(rom[i], HEX);
     }

examples/DS18B20/DS18B20.ino

@@ -60,13 +60,13 @@ void loop()
     Serial.print(sensor.resolution());
 
     // Print alarm trigger threshols
-    Serial.print(F(",trigger=["));
+    Serial.print(F(",trigger="));
     Serial.print(low);
     Serial.print(F(".."));
     Serial.print(high);
 
     // And temperature
-    Serial.print(F("],temperature="));
+    Serial.print(F(",temperature="));
     Serial.println(sensor.temperature());
   } while (last != owi.LAST);
 

library.properties

@@ -1,9 +1,9 @@
 name=Arduino-OWI
-version=1.7
+version=1.8
 author=Mikael Patel
 maintainer=Mikael Patel <[email protected]>
 sentence=One-Wire Interface (OWI) library for Arduino.
-paragraph=The OWI library has been developed to support the implementation of 1-wire device drivers. Includes abstract OWI bus manager class, GPIO based Software::OWI bus manager, DS2482 based Hardware::OWI bus manager, and device driver for DS18B20.
+paragraph=The OWI library has been developed to support the implementation of 1-wire device drivers. Includes abstract OWI bus manager class, GPIO based Software::OWI bus manager, DS2482 based Hardware::OWI bus manager, support for Slave devices, and device driver for DS18B20.
 category=Communication
 url=https://github.com/mikaelpatel/Arduino-OWI
 architectures=avr,sam

mainpage.dox

@@ -3,9 +3,9 @@
 The OWI library has been developed to support the implementation of
 1-wire device drivers. Includes abstract OWI bus manager class, GPIO
 based Software::OWI bus manager, DS2482 based Hardware::OWI bus
-manager, and device driver for DS18B20.
+manager, Slave::OWI for slave devices, and device driver for DS18B20.
 
-Version: 1.7
+Version: 1.8
 */
 
 /** @page License

src/Driver/DS18B20.h

@@ -181,9 +181,9 @@ class DS18B20 : public OWI::Device {
    * (3 bytes) to device.
    * @return true(1) if successful otherwise false(0).
    */
-  bool write_scratchpad()
+  bool write_scratchpad(bool match = true)
   {
-    if (!m_owi.match_rom(m_rom)) return (false);
+    if (match && !m_owi.match_rom(m_rom)) return (false);
     m_owi.write(WRITE_SCRATCHPAD, &m_scratchpad.high_trigger, CONFIG_MAX);
     return (true);
   }

src/OWI.h

@@ -138,7 +138,8 @@ class OWI {
    * calculation. Polynomial: x^8 + x^5 + x^4 + 1 (0x8C).
    * See http://www.maxim-ic.com/appnotes.cfm/appnote_number/27
    */
-  static uint8_t crc_update(uint8_t crc, uint8_t data)
+  static inline uint8_t crc_update(uint8_t crc, uint8_t data)
+    __attribute__((always_inline))
   {
     crc = crc ^ data;
     for (uint8_t i = 0; i < 8; i++) {

src/Software/OWI.h

@@ -115,6 +115,9 @@ class OWI : public ::OWI {
     }
   }
 
+  using ::OWI::read;
+  using ::OWI::write;
+
 protected:
   /** 1-Wire bus pin. */
   GPIO<PIN> m_pin;