Cleanup

Author: mikaelpatel

examples/Alarm/Alarm.ino

@@ -12,8 +12,8 @@ void setup()
   Serial.begin(57600);
   while (!Serial);
 
-  // Set sensor alarm triggers (20..25 C) and resolution (10 bits)
-  // Iterate though all thermometers and configure.
+  // Set thermometer sensor alarm triggers (20..25 C) and resolution
+  // (10 bits). Iterate all sensors and write configuration.
   uint8_t* rom = sensor.rom();
   int8_t last = owi.FIRST;
   do {
@@ -28,8 +28,9 @@ void setup()
 void loop()
 {
   // Check if any thermometer sersors have exceeded thresholds.
-  // Broadcast a convert request to all thermometer sensors.
-  // Print timestamp and sensor identity and temperature.
+  // Broadcast a convert request to all sensors: Print timestamp,
+  // sensor identity (rom) and temperature for all that report an
+  // alarm
 
   int8_t last = owi.FIRST;
   uint8_t* rom = sensor.rom();

src/Driver/DS18B20.h

@@ -137,7 +137,7 @@ class DS18B20 : public OWI::Device {
   }
 
   /**
-   * Return remaining convertion time in milliseconds.
+   * Return remaining conversion time in milliseconds.
    * @return milliseconds remaining.
    */
   uint16_t conversion_time()
@@ -150,6 +150,18 @@ class DS18B20 : public OWI::Device {
     return (0);
   }
 
+  /**
+   * Check if the temperature conversion is completed.
+   * @return true(1) if ready otherwise false(0).
+   */
+  bool convert_ready()
+  {
+    if (!m_converting) return (true);
+    bool res = m_owi.read(1);
+    if (res) m_converting = false;
+    return (res);
+  }
+
   /**
    * Delay until the temperature conversion is completed
    * by polling the sensors.
@@ -158,16 +170,15 @@ class DS18B20 : public OWI::Device {
   bool convert_await()
   {
     if (!m_converting) return (false);
-    while (m_owi.read(1) == 0) delayMicroseconds(100);
-    m_converting = false;
+    while (!convert_ready()) delay(1);
     return (true);
   }
 
   /**
-   * Read the contents of the scratchpad to local memory. An internal
-   * delay will occur if a convert_request() is pending. The delay is
-   * at most max conversion time (750 ms). Call with match parameter
-   * false if used with search_rom().
+   * Read the contents of the scratchpad to local memory. Call
+   * convert_ready(), convert_await() or delay with amount from
+   * conversion_time() before reading. Call with match parameter false
+   * if used with search_rom().
    * @param[in] match rom code (default true).
    * @return true(1) if successful otherwise false(0).
    */
@@ -180,7 +191,9 @@ class DS18B20 : public OWI::Device {
 
   /**
    * Write the contents of the scratchpad triggers and configuration
-   * (3 bytes) to device.
+   * (3 bytes) to device. Call with match parameter false if used with
+   * search_rom().
+   * @param[in] match rom code (default true).
    * @return true(1) if successful otherwise false(0).
    */
   bool write_scratchpad(bool match = true)
@@ -192,23 +205,26 @@ class DS18B20 : public OWI::Device {
 
   /**
    * Copy device scratchpad triggers and configuration data to device
-   * EEPROM.
+   * EEPROM. Call with match parameter false if used with search_rom().
+   * @param[in] match rom code (default true).
    * @return true(1) if successful otherwise false(0).
    */
-  bool copy_scratchpad()
+  bool copy_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(COPY_SCRATCHPAD);
     return (true);
   }
 
   /**
    * Recall the alarm triggers and configuration from device EEPROM.
+   * Call with match parameter false if used with search_rom().
+   * @param[in] match rom code (default true).
    * @return true(1) if successful otherwise false(0).
    */
-  bool recall()
+  bool recall(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(RECALL_E);
     return (true);
   }