using String.h

pschatzmann · pschatzmann · commit d06ebf61a6dd · 2025-10-02T16:51:01.000+02:00
diff --git a/ArduinoCore-API/api/ArduinoAPI.h b/ArduinoCore-API/api/ArduinoAPI.h
@@ -32,7 +32,7 @@
 #include "Printable.h"
 #include "PluggableUSB.h"
 #include "Server.h"
-#include "WString.h"
+#include "String.h"
 #include "Stream.h"
 #include "Udp.h"
 #include "USBAPI.h"
diff --git a/ArduinoCore-API/api/IPAddress.h b/ArduinoCore-API/api/IPAddress.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include "Printable.h"
-#include "WString.h"
+#include "String.h"
 
 #define IPADDRESS_V4_BYTES_INDEX 12
 #define IPADDRESS_V4_DWORD_INDEX 3
diff --git a/ArduinoCore-API/api/Print.h b/ArduinoCore-API/api/Print.h
@@ -21,8 +21,9 @@
 
 #include <inttypes.h>
 #include <stdio.h> // for size_t
+#include <string.h>
 
-#include "WString.h"
+#include "api/String.h"
 #include "Printable.h"
 
 #define DEC 10
diff --git a/ArduinoCore-API/api/String.cpp b/ArduinoCore-API/api/String.cpp
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "WString.h"
+#include "String.h"
 #include "Common.h"
 #include "itoa.h"
 #include "deprecated-avr-comp/avr/dtostrf.h"
diff --git a/ArduinoCore-API/api/String.h b/ArduinoCore-API/api/String.h
diff --git a/ArduinoCore-API/test/src/IPAddress/test_fromString.cpp b/ArduinoCore-API/test/src/IPAddress/test_fromString.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 #include <api/IPAddress.h>
 
 /**************************************************************************************
diff --git a/ArduinoCore-API/test/src/IPAddress/test_fromString6.cpp b/ArduinoCore-API/test/src/IPAddress/test_fromString6.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 #include <api/IPAddress.h>
 
 /**************************************************************************************
diff --git a/ArduinoCore-API/test/src/IPAddress/test_toString.cpp b/ArduinoCore-API/test/src/IPAddress/test_toString.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 #include <api/IPAddress.h>
 
 /**************************************************************************************
diff --git a/ArduinoCore-API/test/src/String/StringPrinter.h b/ArduinoCore-API/test/src/String/StringPrinter.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <catch2/catch_test_macros.hpp>
-#include <api/WString.h>
+#include <api/String.h>
 
 namespace Catch {
   /**
diff --git a/ArduinoCore-API/test/src/String/test_String.cpp b/ArduinoCore-API/test/src/String/test_String.cpp
@@ -12,7 +12,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_characterAccessFunc.cpp b/ArduinoCore-API/test/src/String/test_characterAccessFunc.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_compareTo.cpp b/ArduinoCore-API/test/src/String/test_compareTo.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_comparisonFunc.cpp b/ArduinoCore-API/test/src/String/test_comparisonFunc.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_concat.cpp b/ArduinoCore-API/test/src/String/test_concat.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_indexOf.cpp b/ArduinoCore-API/test/src/String/test_indexOf.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_isEmpty.cpp b/ArduinoCore-API/test/src/String/test_isEmpty.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_lastIndexOf.cpp b/ArduinoCore-API/test/src/String/test_lastIndexOf.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_length.cpp b/ArduinoCore-API/test/src/String/test_length.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_move.cpp b/ArduinoCore-API/test/src/String/test_move.cpp
@@ -6,7 +6,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_operators.cpp b/ArduinoCore-API/test/src/String/test_operators.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_remove.cpp b/ArduinoCore-API/test/src/String/test_remove.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_replace.cpp b/ArduinoCore-API/test/src/String/test_replace.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_substring.cpp b/ArduinoCore-API/test/src/String/test_substring.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_toDouble.cpp b/ArduinoCore-API/test/src/String/test_toDouble.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_toFloat.cpp b/ArduinoCore-API/test/src/String/test_toFloat.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_toInt.cpp b/ArduinoCore-API/test/src/String/test_toInt.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_toLowerCase.cpp b/ArduinoCore-API/test/src/String/test_toLowerCase.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_toUpperCase.cpp b/ArduinoCore-API/test/src/String/test_toUpperCase.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-API/test/src/String/test_trim.cpp b/ArduinoCore-API/test/src/String/test_trim.cpp
@@ -10,7 +10,7 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <api/WString.h>
+#include <api/String.h>
 
 #include "StringPrinter.h"
 
diff --git a/ArduinoCore-Linux/cores/arduino/Arduino.cpp b/ArduinoCore-Linux/cores/arduino/Arduino.cpp
@@ -5,9 +5,9 @@
 #include <thread>
 #include <chrono>
 #include "Arduino.h"
-#include "Common.h"
-#include "Stream.h"
-#include "PluggableUSB.h"
+#include "api/Common.h"
+#include "api/Stream.h"
+#include "api/PluggableUSB.h"
 #include "RemoteSerial.h"
 #include "Hardware.h"
 #if !defined(SKIP_HARDWARE_SETUP)
@@ -21,8 +21,8 @@
 #  include "HardwareGPIO_RPI.h"
 #  include "HardwareI2C_RPI.h"
 #endif
-#include "PluggableUSB.h"
-#include "deprecated-avr-comp/avr/dtostrf.h"
+#include "api/PluggableUSB.h"
+#include "api/deprecated-avr-comp/avr/dtostrf.h"
 #include "ArduinoLogger.h"
 #include "StdioDevice.h"
 #include "Serial.h"
diff --git a/ArduinoCore-Linux/cores/arduino/Arduino.h b/ArduinoCore-Linux/cores/arduino/Arduino.h
@@ -36,7 +36,7 @@
 #include "Serial.h"
 #include "StdioDevice.h"
 #include "ArduinoLogger.h"
-#include "ArduinoAPI.h"
+#include "api/ArduinoAPI.h"
 #include "RemoteSerial.h"
 #include "HardwareSetup.h"
 
diff --git a/ArduinoCore-Linux/cores/arduino/ArduinoLogger.h b/ArduinoCore-Linux/cores/arduino/ArduinoLogger.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "StdioDevice.h"
-#include "Stream.h"
+#include "api/Stream.h"
 
 namespace arduino {
 
diff --git a/ArduinoCore-Linux/cores/arduino/Ethernet.h b/ArduinoCore-Linux/cores/arduino/Ethernet.h
@@ -6,9 +6,9 @@
 #include <unistd.h>     // for close
 
 #include "ArduinoLogger.h"
-#include "Client.h"
-#include "Common.h"
-#include "IPAddress.h"
+#include "api/Client.h"
+#include "api/Common.h"
+#include "api/IPAddress.h"
 #include "RingBufferExt.h"
 #include "SocketImpl.h"
 
diff --git a/ArduinoCore-Linux/cores/arduino/EthernetServer.h b/ArduinoCore-Linux/cores/arduino/EthernetServer.h
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "Ethernet.h"
-#include "Server.h"
+#include "api/Server.h"
 #include "SignalHandler.h"
 
 namespace arduino {
diff --git a/ArduinoCore-Linux/cores/arduino/EthernetUDP.h b/ArduinoCore-Linux/cores/arduino/EthernetUDP.h
@@ -34,9 +34,9 @@
  * bjoern@cs.stanford.edu 12/30/2008
  */
 
-#include <IPAddress.h>
+#include <api/IPAddress.h>
+#include <api/Udp.h>
 #include <RingBufferExt.h>
-#include <Udp.h>
 #include "SignalHandler.h"
 #include "ArduinoLogger.h"
 
diff --git a/ArduinoCore-Linux/cores/arduino/HardwareGPIO.cpp b/ArduinoCore-Linux/cores/arduino/HardwareGPIO.cpp
@@ -1,5 +1,5 @@
 
-#include "Common.h"
+#include "api/Common.h"
 #include "Hardware.h"
 #include "HardwareGPIO.h"
 #include "HardwareService.h"
diff --git a/ArduinoCore-Linux/cores/arduino/HardwareGPIO.h b/ArduinoCore-Linux/cores/arduino/HardwareGPIO.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common.h"      
+#include "api/Common.h"      
 
 namespace arduino {
         
diff --git a/ArduinoCore-Linux/cores/arduino/HardwareI2CEx.h b/ArduinoCore-Linux/cores/arduino/HardwareI2CEx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "HardwareI2C.h"
+#include "api/HardwareI2C.h"
 
 namespace arduino {
 
diff --git a/ArduinoCore-Linux/cores/arduino/HardwareSPI.cpp b/ArduinoCore-Linux/cores/arduino/HardwareSPI.cpp
@@ -1,4 +1,4 @@
-#include "HardwareSPI.h"
+#include "api/HardwareSPI.h"
 #include "HardwareService.h"
 #include "Hardware.h"
 /**
diff --git a/ArduinoCore-Linux/cores/arduino/HardwareService.h b/ArduinoCore-Linux/cores/arduino/HardwareService.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Stream.h"
+#include "api/Stream.h"
 
 namespace arduino {
 
diff --git a/ArduinoCore-Linux/cores/arduino/RemoteSPI.h b/ArduinoCore-Linux/cores/arduino/RemoteSPI.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "HardwareSPI.h"
+#include "api/HardwareSPI.h"
 
 /**
  * We virtualize the hardware and send the requests and replys over
diff --git a/ArduinoCore-Linux/cores/arduino/RemoteSerial.h b/ArduinoCore-Linux/cores/arduino/RemoteSerial.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Stream.h"
+#include "api/Stream.h"
 #include "HardwareService.h"
 #include "RingBufferExt.h"
 
diff --git a/ArduinoCore-Linux/cores/arduino/StdioDevice.h b/ArduinoCore-Linux/cores/arduino/StdioDevice.h
@@ -2,8 +2,8 @@
 
 #include <iostream>
 #include <streambuf>
-#include "Stream.h"
-#include "Printable.h"
+#include "api/Stream.h"
+#include "api/Printable.h"
 
 namespace arduino {
 
diff --git a/ArduinoCore-Linux/cores/arduino/UDP.h b/ArduinoCore-Linux/cores/arduino/UDP.h
diff --git a/ArduinoCore-Linux/cores/arduino/Unsupported.cpp b/ArduinoCore-Linux/cores/arduino/Unsupported.cpp
diff --git a/ArduinoCore-Linux/cores/arduino/WMath.cpp b/ArduinoCore-Linux/cores/arduino/WMath.cpp
diff --git a/ArduinoCore-Linux/cores/arduino/WiFiUdpStream.h b/ArduinoCore-Linux/cores/arduino/WiFiUdpStream.h
diff --git a/ArduinoCore-Linux/cores/arduino/itoa.cpp b/ArduinoCore-Linux/cores/arduino/itoa.cpp
diff --git a/ArduinoCore-Linux/libraries/SPI.h b/ArduinoCore-Linux/libraries/SPI.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
