Fix: SAMD51 Target

Author: brentru

src/Wippersnapper_V2.h

@@ -74,6 +74,9 @@
 #include <map>
 #include <string>
 #include <vector>
+#ifdef ARDUINO_ARCH_SAMD
+#include <algorithm>
+#endif
 
 // Nanopb dependencies
 #include <nanopb/pb_common.h>

src/components/ds18x20/controller.cpp

@@ -64,9 +64,13 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
   // Extract the OneWire pin from the message
   uint8_t pin_name = atoi(_DS18X20_model->GetDS18x20AddMsg()->onewire_pin + 1);
 
-  // Initialize the DS18X20Hardware object
+#ifdef ARDUINO_ARCH_SAMD
+  auto new_dsx_driver = new DS18X20Hardware(pin_name, _num_drivers);
+  std::unique_ptr<DS18X20Hardware> unique_driver(new_dsx_driver);
+#else
   auto new_dsx_driver =
       std::make_unique<DS18X20Hardware>(pin_name, _num_drivers);
+#endif
   // Attempt to get the sensor's ID on the OneWire bus to show it's been init'd
   bool is_initialized = new_dsx_driver->GetSensor();
 
@@ -103,7 +107,11 @@ bool DS18X20Controller::Handle_Ds18x20Add(pb_istream_t *stream) {
 
     // If the sensor was successfully initialized, add it to the controller
     if (is_initialized == true) {
+#ifdef ARDUINO_ARCH_SAMD
+      _DS18X20_pins.push_back(std::move(unique_driver));
+#else
       _DS18X20_pins.push_back(std::move(new_dsx_driver));
+#endif
       _num_drivers++;
     }
 

src/components/i2c/hardware.cpp

@@ -145,7 +145,7 @@ void I2cHardware::InitBus(bool is_default, const char *sda, const char *scl) {
   _bus->setSDA(_bus_sda);
   _bus->setSCL(_bus_scl);
   _bus->begin();
-#elif defined(ARDUINO_ARCH_SAM)
+#elif defined(ARDUINO_ARCH_SAMD)
   _bus = new TwoWire(&PERIPH_WIRE, _bus_sda, _bus_scl);
   _bus->begin();
 #else

src/provisioning/sdcard/ws_sdcard.cpp

@@ -90,7 +90,7 @@ void ws_sdcard::calculateFileLimits() {
 bool ws_sdcard::InitDS1307() {
   _rtc_ds1307 = new RTC_DS1307();
   if (!_rtc_ds1307->begin()) {
-    #ifndef ARDUINO_ARCH_ESP8266
+    #if !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_SAMD)
     if (!_rtc_ds1307->begin(&Wire1)) {
       WS_DEBUG_PRINTLN("[SD] Runtime Error: Failed to initialize DS1307 RTC");
       delete _rtc_ds1307;
@@ -114,7 +114,7 @@ bool ws_sdcard::InitDS3231() {
   WS_DEBUG_PRINTLN("Begin DS3231 init");
   _rtc_ds3231 = new RTC_DS3231();
   if (!_rtc_ds3231->begin(&Wire)) {
-    #ifndef ARDUINO_ARCH_ESP8266
+    #if !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_SAMD)
     if (!_rtc_ds3231->begin(&Wire1)) {
       WS_DEBUG_PRINTLN("[SD] Runtime Error: Failed to initialize DS3231 RTC");
       delete _rtc_ds3231;
@@ -139,7 +139,7 @@ bool ws_sdcard::InitPCF8523() {
   if (!_rtc_pcf8523->begin(&Wire)) {
     WS_DEBUG_PRINTLN(
         "[SD] Runtime Error: Failed to initialize PCF8523 RTC on WIRE");
-    #ifndef ARDUINO_ARCH_ESP8266
+    #if !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_SAMD)
     if (!_rtc_pcf8523->begin(&Wire1)) {
       WS_DEBUG_PRINTLN(
           "[SD] Runtime Error: Failed to initialize PCF8523 RTC on WIRE1");