fix: Resolved merge conflicts - take two

Author: Miles Burton

DallasTemperature.cpp

@@ -1,6 +1,3 @@
-#ifndef DallasTemperature_h
-#define DallasTemperature_h
-
 /*
 MIT License
 
@@ -25,208 +22,156 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#define DALLASTEMPLIBVERSION "4.0.0"
-
-// Configuration
-#ifndef REQUIRESNEW
-#define REQUIRESNEW false
-#endif
-
-#ifndef REQUIRESALARMS
-#define REQUIRESALARMS true
-#endif
-
-// Includes
-#include <inttypes.h>
-#ifdef __STM32F1__
-#include <OneWireSTM.h>
-#else
-#include <OneWire.h>
-#endif
-
-// Constants for device models
-#define DS18S20MODEL 0x10  // also DS1820
-#define DS18B20MODEL 0x28  // also MAX31820
-#define DS1822MODEL  0x22
-#define DS1825MODEL  0x3B  // also MAX31850
-#define DS28EA00MODEL 0x42
-
-// Error Codes
-#define DEVICE_DISCONNECTED_C -127
-#define DEVICE_DISCONNECTED_F -196.6
-#define DEVICE_DISCONNECTED_RAW -7040
-
-#define DEVICE_FAULT_OPEN_C -254
-#define DEVICE_FAULT_OPEN_F -425.199982
-#define DEVICE_FAULT_OPEN_RAW -32512
-
-#define DEVICE_FAULT_SHORTGND_C -253
-#define DEVICE_FAULT_SHORTGND_F -423.399994
-#define DEVICE_FAULT_SHORTGND_RAW -32384
-
-#define DEVICE_FAULT_SHORTVDD_C -252
-#define DEVICE_FAULT_SHORTVDD_F -421.599976
-#define DEVICE_FAULT_SHORTVDD_RAW -32256
-
-// Configuration Constants
-#define MAX_CONVERSION_TIMEOUT 750
-#define MAX_INITIALIZATION_RETRIES 3
-#define INITIALIZATION_DELAY_MS 50
-
-// nullptr definition for older C++
-#if __cplusplus < 201103L
-const class {
-public:
-    template<class T>
-    operator T*() const { return 0; }
-    template<class C, class T>
-    operator T C::*() const { return 0; }
-private:
-    void operator&() const;
-} nullptr = {};
-#endif
-
-// Type definitions
-typedef uint8_t DeviceAddress[8];
-
-class DallasTemperature {
-public:
-    // Constructors
-    DallasTemperature();
-    DallasTemperature(OneWire*);
-    DallasTemperature(OneWire*, uint8_t);
-
-    // Setup & Configuration
-    void setOneWire(OneWire*);
-    void setPullupPin(uint8_t);
-    void begin(void);
-    bool verifyDeviceCount(void);  // New method for device count verification
-
-    // Device Information
-    uint8_t getDeviceCount(void);
-    uint8_t getDS18Count(void);
-    bool validAddress(const uint8_t*);
-    bool validFamily(const uint8_t* deviceAddress);
-    bool getAddress(uint8_t*, uint8_t);
-    bool isConnected(const uint8_t*);
-    bool isConnected(const uint8_t*, uint8_t*);
-
-    // Scratchpad Operations
-    bool readScratchPad(const uint8_t*, uint8_t*);
-    void writeScratchPad(const uint8_t*, const uint8_t*);
-    bool readPowerSupply(const uint8_t* deviceAddress = nullptr);
-
-    // Resolution Control
-    uint8_t getResolution();
-    void setResolution(uint8_t);
-    uint8_t getResolution(const uint8_t*);
-    bool setResolution(const uint8_t*, uint8_t, bool skipGlobalBitResolutionCalculation = false);
-
-    // Conversion Configuration
-    void setWaitForConversion(bool);
-    bool getWaitForConversion(void);
-    void setCheckForConversion(bool);
-    bool getCheckForConversion(void);
-
-    // Temperature Request Structure
-    struct request_t {
-        bool result;
-        unsigned long timestamp;
-        operator bool() { return result; }
-    };
-
-    // Temperature Operations
-    request_t requestTemperatures(void);
-    request_t requestTemperaturesByAddress(const uint8_t*);
-    request_t requestTemperaturesByIndex(uint8_t);
-    int32_t getTemp(const uint8_t*);
-    float getTempC(const uint8_t*);
-    float getTempF(const uint8_t*);
-    float getTempCByIndex(uint8_t);
-    float getTempFByIndex(uint8_t);
-
-    // Conversion Status
-    bool isParasitePowerMode(void);
-    bool isConversionComplete(void);
-    uint16_t millisToWaitForConversion(uint8_t);
-    uint16_t millisToWaitForConversion();
-
-    // EEPROM Operations
-    bool saveScratchPadByIndex(uint8_t);
-    bool saveScratchPad(const uint8_t* = nullptr);
-    bool recallScratchPadByIndex(uint8_t);
-    bool recallScratchPad(const uint8_t* = nullptr);
-    void setAutoSaveScratchPad(bool);
-    bool getAutoSaveScratchPad(void);
-
-    // Alarm Functionality
-#if REQUIRESALARMS
-    typedef void AlarmHandler(const uint8_t*);
-    void setHighAlarmTemp(const uint8_t*, int8_t);
-    void setLowAlarmTemp(const uint8_t*, int8_t);
-    int8_t getHighAlarmTemp(const uint8_t*);
-    int8_t getLowAlarmTemp(const uint8_t*);
-    void resetAlarmSearch(void);
-    bool alarmSearch(uint8_t*);
-    bool hasAlarm(const uint8_t*);
-    bool hasAlarm(void);
-    void processAlarms(void);
-    void setAlarmHandler(const AlarmHandler*);
-    bool hasAlarmHandler();
-#endif
-
-    // User Data Operations
-    void setUserData(const uint8_t*, int16_t);
-    void setUserDataByIndex(uint8_t, int16_t);
-    int16_t getUserData(const uint8_t*);
-    int16_t getUserDataByIndex(uint8_t);
-
-    // Temperature Conversion Utilities
-    static float toFahrenheit(float);
-    static float toCelsius(float);
-    static float rawToCelsius(int32_t);
-    static int16_t celsiusToRaw(float);
-    static float rawToFahrenheit(int32_t);
-
-    // Memory Management
-#if REQUIRESNEW
-    void* operator new(unsigned int);
-    void operator delete(void*);
-#endif
-
-    // Conversion Completion Blocking
-    void blockTillConversionComplete(uint8_t);
-    void blockTillConversionComplete(uint8_t, unsigned long);
-    void blockTillConversionComplete(uint8_t, request_t);
-
-private:
-    typedef uint8_t ScratchPad[9];
-
-    // Internal State
-    bool parasite;
-    bool useExternalPullup;
-    uint8_t pullupPin;
-    uint8_t bitResolution;
-    bool waitForConversion;
-    bool checkForConversion;
-    bool autoSaveScratchPad;
-    uint8_t devices;
-    uint8_t ds18Count;
-    OneWire* _wire;
-
-    // Internal Methods
-    int32_t calculateTemperature(const uint8_t*, uint8_t*);
-    bool isAllZeros(const uint8_t* const scratchPad, const size_t length = 9);
-    void activateExternalPullup(void);
-    void deactivateExternalPullup(void);
-
-    // Alarm Search Variables
+#include "DallasTemperature.h"
+
+// OneWire commands
+#define STARTCONVO      0x44  // Tells device to take a temperature reading
+#define COPYSCRATCH     0x48  // Copy scratchpad to EEPROM
+#define READSCRATCH     0xBE  // Read from scratchpad
+#define WRITESCRATCH    0x4E  // Write to scratchpad
+#define RECALLSCRATCH   0xB8  // Recall from EEPROM to scratchpad
+#define READPOWERSUPPLY 0xB4  // Determine if device needs parasite power
+#define ALARMSEARCH     0xEC  // Query bus for devices with an alarm condition
+
+// Scratchpad locations
+#define TEMP_LSB        0
+#define TEMP_MSB        1
+#define HIGH_ALARM_TEMP 2
+#define LOW_ALARM_TEMP  3
+#define CONFIGURATION   4
+#define INTERNAL_BYTE   5
+#define COUNT_REMAIN    6
+#define COUNT_PER_C     7
+#define SCRATCHPAD_CRC  8
+
+// Device resolution
+#define TEMP_9_BIT  0x1F //  9 bit
+#define TEMP_10_BIT 0x3F // 10 bit
+#define TEMP_11_BIT 0x5F // 11 bit
+#define TEMP_12_BIT 0x7F // 12 bit
+
+DallasTemperature::DallasTemperature() {
 #if REQUIRESALARMS
-    uint8_t alarmSearchAddress[8];
-    int8_t alarmSearchJunction;
-    uint8_t alarmSearchExhausted;
-    AlarmHandler* _AlarmHandler;
+    setAlarmHandler(nullptr);
 #endif
-};
-
-#endif // DallasTemperature_h
+    useExternalPullup = false;
+}
+
+DallasTemperature::DallasTemperature(OneWire* _oneWire) : DallasTemperature() {
+    setOneWire(_oneWire);
+}
+
+DallasTemperature::DallasTemperature(OneWire* _oneWire, uint8_t _pullupPin) : DallasTemperature(_oneWire) {
+    setPullupPin(_pullupPin);
+}
+
+void DallasTemperature::setOneWire(OneWire* _oneWire) {
+    _wire = _oneWire;
+    devices = 0;
+    ds18Count = 0;
+    parasite = false;
+    bitResolution = 9;
+    waitForConversion = true;
+    checkForConversion = true;
+    autoSaveScratchPad = true;
+}
+
+void DallasTemperature::setPullupPin(uint8_t _pullupPin) {
+    useExternalPullup = true;
+    pullupPin = _pullupPin;
+    pinMode(pullupPin, OUTPUT);
+    deactivateExternalPullup();
+}
+
+// Initialize the bus with retry logic
+void DallasTemperature::begin(void) {
+    DeviceAddress deviceAddress;
+    
+    for (uint8_t retry = 0; retry < MAX_INITIALIZATION_RETRIES; retry++) {
+        _wire->reset_search();
+        devices = 0;
+        ds18Count = 0;
+        
+        // Add delay for bus stabilization
+        delay(INITIALIZATION_DELAY_MS);
+        
+        while (_wire->search(deviceAddress)) {
+            if (validAddress(deviceAddress)) {
+                devices++;
+                
+                if (validFamily(deviceAddress)) {
+                    ds18Count++;
+                    
+                    if (!parasite && readPowerSupply(deviceAddress)) {
+                        parasite = true;
+                    }
+                    
+                    uint8_t b = getResolution(deviceAddress);
+                    if (b > bitResolution) {
+                        bitResolution = b;
+                    }
+                }
+            }
+        }
+        
+        // If we found at least one device, exit retry loop
+        if (devices > 0) {
+            break;
+        }
+    }
+}
+
+// Alternative device count verification method
+bool DallasTemperature::verifyDeviceCount(void) {
+    uint8_t actualCount = 0;
+    float temp;
+    
+    requestTemperatures();
+    
+    do {
+        temp = getTempCByIndex(actualCount);
+        if (temp > DEVICE_DISCONNECTED_C) {
+            actualCount++;
+        }
+    } while (temp > DEVICE_DISCONNECTED_C && actualCount < 255);
+    
+    if (actualCount > devices) {
+        devices = actualCount;
+        begin();
+        return true;
+    }
+    
+    return false;
+}
+
+// Returns the number of devices found on the bus
+uint8_t DallasTemperature::getDeviceCount(void) {
+    return devices;
+}
+
+uint8_t DallasTemperature::getDS18Count(void) {
+    return ds18Count;
+}
+
+bool DallasTemperature::validFamily(const uint8_t* deviceAddress) {
+    switch (deviceAddress[0]) {
+        case DS18S20MODEL:
+        case DS18B20MODEL:
+        case DS1822MODEL:
+        case DS1825MODEL:
+        case DS28EA00MODEL:
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool DallasTemperature::validAddress(const uint8_t* deviceAddress) {
+    return (_wire->crc8(const_cast<uint8_t*>(deviceAddress), 7) == deviceAddress[7]);
+}
+
+bool DallasTemperature::getAddress(uint8_t* deviceAddress, uint8_t index) {
+    if (index < devices) {
+        uint8_t depth = 0;
+        
+        _wire->reset_