Fix "__FlashStringHelper is ambiguous" with arduino-pico

.github/workflows/ci.yml

@@ -91,6 +91,12 @@ jobs:
             softwareserial: false
             index_url: http://dan.drown.org/stm32duino/package_STM32duino_index.json
 
+          - core: rp2040:rp2040
+            board: rp2040:rp2040:rpipico
+            eeprom: true
+            softwareserial: true
+            index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3

CHANGELOG.md

@@ -1,6 +1,11 @@
 StreamUtils - Change log
 ========================
 
+HEAD
+----
+
+* Fix "__FlashStringHelper is ambiguous" with arduino-pico (issue #30)
+
 1.7.1 (2023/02/26)
 -----
 

README.md

@@ -382,6 +382,7 @@ It has been tested on the following cores:
 * [ESP32](https://github.com/espressif/arduino-esp32)
 * [ESP8266](https://github.com/esp8266/Arduino)
 * [nRF52](https://github.com/adafruit/Adafruit_nRF52_Arduino)
+* [RP2040](https://github.com/earlephilhower/arduino-pico)
 * [SAMD](https://github.com/arduino/ArduinoCore-samd)
 * [STM32 Official](https://github.com/stm32duino/Arduino_Core_STM32)
 * [STM32 Roger's Core](https://github.com/rogerclarkmelbourne/Arduino_STM32) (no EEPROM support)

extras/test/CMakeLists.txt

@@ -51,6 +51,16 @@ target_link_libraries(StreamUtilsTestNrf52 Nrf52Core doctest)
 
 add_test(Nrf52 StreamUtilsTestNrf52)
 
+#
+# RP2040
+#
+add_subdirectory(cores/rp2040)
+
+add_executable(StreamUtilsTestRp2040 ${SOURCES})
+target_link_libraries(StreamUtilsTestRp2040 Rp2040Core doctest)
+
+add_test(Rp2040 StreamUtilsTestRp2040)
+
 #
 # SAMD
 #

extras/test/cores/avr/WString.h

@@ -7,6 +7,9 @@
 #include <ostream>
 #include <string>
 
+class __FlashStringHelper;
+#define F(s) (reinterpret_cast<const __FlashStringHelper*>(s + 42))
+
 class String : private std::string {
  public:
   String() {}

extras/test/cores/avr/avr/pgmspace.h

@@ -3,12 +3,6 @@
 #include <stdint.h>
 #include <string.h>
 
-class __FlashStringHelper;
-
-inline const __FlashStringHelper* F(const char* s) {
-  return reinterpret_cast<const __FlashStringHelper*>(s + 42);
-}
-
 inline size_t strlen_P(const char* s) {
   return strlen(s - 42);
 }

extras/test/cores/coreapi/Arduino.h

@@ -0,0 +1,10 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include "Common.h"
+#include "Print.h"
+#include "Stream.h"
+#include "WString.h"

extras/test/cores/coreapi/Client.h

@@ -0,0 +1,26 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include "Stream.h"
+#include "WString.h"
+
+namespace arduino {
+
+using IPAddress = String;
+
+class Client : public Stream {
+ public:
+  virtual int connect(IPAddress ip, uint16_t port) = 0;
+  virtual int connect(const char *host, uint16_t port) = 0;
+  virtual uint8_t connected() = 0;
+  virtual void stop() = 0;
+  virtual operator bool() = 0;
+
+  virtual int read() = 0;
+  virtual int read(uint8_t *buf, size_t size) = 0;
+};
+
+}  // namespace arduino

extras/test/cores/coreapi/Common.h

@@ -0,0 +1,13 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include <time.h>
+
+inline unsigned long millis() {
+  return static_cast<unsigned long>(time(NULL));
+}
+
+inline void yield() {}

extras/test/cores/coreapi/Print.h

@@ -0,0 +1,52 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include "WString.h"
+
+#include <stdint.h>
+#include <cstring>
+
+namespace arduino {
+
+struct Print {
+  virtual size_t write(const uint8_t *buffer, size_t size) = 0;
+  virtual size_t write(uint8_t data) = 0;
+  virtual void flush() {}
+
+  virtual int availableForWrite() {
+    return 0;
+  }
+
+  size_t write(const char *buffer, size_t size) {
+    return write((const uint8_t *)buffer, size);
+  }
+
+  size_t print(const String &s) {
+    return write(s.c_str(), s.length());
+  }
+
+  size_t print(const char *s) {
+    return write(s, std::strlen(s));
+  }
+
+  size_t println() {
+    return 0;
+  }
+
+  template <typename T>
+  size_t print(const T &value) {
+    return print(String(value));
+  }
+
+  template <typename T>
+  size_t println(const T &value) {
+    return print(value);
+  }
+};
+
+}  // namespace arduino
+
+using namespace arduino;

extras/test/cores/coreapi/Stream.h

@@ -0,0 +1,40 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include "Print.h"
+
+namespace arduino {
+
+struct Stream : Print {
+  virtual int available() = 0;
+  virtual int read() = 0;
+  virtual int peek() = 0;
+
+  size_t readBytes(char *buffer, size_t length) {
+    size_t count = 0;
+    while (count < length) {
+      int c = read();
+      if (c < 0)
+        break;
+      *buffer++ = (char)c;
+      count++;
+    }
+    return count;
+  }
+
+  String readString() {
+    String result;
+    int c;
+    while ((c = read()) >= 0) {
+      result += static_cast<char>(c);
+    }
+    return result;
+  }
+
+  void setTimeout(unsigned long) {}
+};
+
+}  // namespace arduino

extras/test/cores/coreapi/WString.h

@@ -0,0 +1,49 @@
+// StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+// Copyright Benoit Blanchon 2019-2023
+// MIT License
+
+#pragma once
+
+#include <ostream>
+#include <string>
+
+#include "../avr/avr/pgmspace.h"
+
+namespace arduino {
+
+class __FlashStringHelper;
+#define F(s) (reinterpret_cast<const __FlashStringHelper*>(s + 42))
+
+class String : private std::string {
+ public:
+  String() {}
+  String(const String& s) : std::string(s) {}
+  String(String&& s) : std::string(std::move(s)) {}
+  String(const char* s) : std::string(s) {}
+  String(int n) : std::string(std::to_string(n)) {}
+  String(size_t n) : std::string(std::to_string(n)) {}
+
+  String& operator=(const String& rhs) {
+    std::string::operator=(rhs);
+    return *this;
+  }
+
+  using std::string::c_str;
+  using std::string::length;
+  using std::string::operator+=;
+  using std::string::operator[];
+
+  void remove(unsigned int index, unsigned int count) {
+    erase(begin() + index, begin() + index + count);
+  }
+
+  friend bool operator==(const String& lhs, const char* rhs) {
+    return static_cast<const std::string&>(lhs) == rhs;
+  }
+
+  friend std::ostream& operator<<(std::ostream& lhs, const String& rhs) {
+    return lhs << static_cast<const std::string&>(rhs);
+  }
+};
+
+}  // namespace arduino

extras/test/cores/rp2040/CMakeLists.txt

@@ -0,0 +1,19 @@
+# StreamUtils - github.com/bblanchon/ArduinoStreamUtils
+# Copyright Benoit Blanchon 2019-2023
+# MIT License
+
+add_library(Rp2040Core
+	EEPROM.cpp
+	EEPROM.h
+)
+
+target_include_directories(Rp2040Core
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		${CMAKE_CURRENT_SOURCE_DIR}/../coreapi
+)
+
+target_compile_definitions(Rp2040Core
+	PUBLIC
+		ARDUINO_ARCH_RP2040
+)

extras/test/cores/rp2040/EEPROM.cpp

@@ -0,0 +1 @@
+#include "../esp32/EEPROM.cpp"

extras/test/cores/rp2040/EEPROM.h

@@ -0,0 +1 @@
+#include "../esp32/EEPROM.h"

src/StreamUtils/Configuration.hpp

@@ -34,17 +34,18 @@
 #endif
 
 #ifndef STREAMUTILS_ENABLE_EEPROM
-#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_ESP8266) || \
-    defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_STM32) || \
-    defined(CORE_TEENSY)
+#if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_ESP8266) ||  \
+    defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_RP2040) || \
+    defined(ARDUINO_ARCH_STM32) || defined(CORE_TEENSY)
 #define STREAMUTILS_ENABLE_EEPROM 1
 #else
 #define STREAMUTILS_ENABLE_EEPROM 0
 #endif
 #endif
 
 #ifndef STREAMUTILS_USE_EEPROM_COMMIT
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) || \
+    defined(ARDUINO_ARCH_RP2040)
 #define STREAMUTILS_USE_EEPROM_COMMIT 1
 #else
 #define STREAMUTILS_USE_EEPROM_COMMIT 0

src/StreamUtils/Streams/ProgmemStream.hpp

@@ -8,8 +8,6 @@
 
 #include "../Configuration.hpp"
 
-class __FlashStringHelper;
-
 namespace StreamUtils {
 
 class ProgmemStream : public Stream {