Dissolve StandardCplusplus library completely

hiveeyes · May 29, 2023 · 576c9c7 · 576c9c7
1 parent 4b0c2ca
commit 576c9c7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/backdoor/node-pipa/examples/pipa-espressif/platformio.ini b/backdoor/node-pipa/examples/pipa-espressif/platformio.ini
@@ -20,7 +20,6 @@ lib_extra_dirs =
 
 # Because "libraries" is included above, we need to exclude specific code there.
 lib_ignore =
-    StandardCplusplus
     RTCZero
 
 build_flags =

diff --git a/libraries/BERadio/README.rst b/libraries/BERadio/README.rst
@@ -92,12 +92,12 @@ Dependencies
 ************
 
 
-StandardCplusplus
-=================
+ArduinoSTL
+==========
 
-| Standard C++ for Arduino (port of uClibc++)
-| https://github.com/maniacbug/StandardCplusplus
-| https://github.com/hiveeyes/StandardCplusplus
+| Standard C++ template library for Arduino
+| https://github.com/mike-matera/ArduinoSTL
+| https://registry.platformio.org/libraries/mike-matera/ArduinoSTL
 
 
 EmBencode

diff --git a/libraries/BERadio/examples/message/simple_message.cpp b/libraries/BERadio/examples/message/simple_message.cpp
@@ -17,9 +17,7 @@
     #include <Arduino.h>
 
     // Standard C++ for Arduino
-    #include <new.cpp>
-    #include <StandardCplusplus.h>
-    #include <func_exception.cpp>
+    #include <ArduinoSTL.h>
     #include <MemoryFree.h>
 
     #include <simulavr.h>

diff --git a/libraries/BERadio/examples/playground/Makefile b/libraries/BERadio/examples/playground/Makefile
@@ -15,27 +15,37 @@
 #    remark: can be overwritten from
 #            command line
 # ------------------------------------------
-name     := hello
-#name     := hellovector
+name      := avr-hello
+name      := avr-sim
+name      := arduino-vector
 
 
 
 # ------------------------------------------
 #           configuration options
 # ------------------------------------------
-compiler := /opt/local/bin/avr-gcc
+#compiler := /opt/local/bin/avr-gcc
 #compiler := /opt/local/bin/avr-g++
 #compiler := /usr/share/arduino/hardware/tools/avr/bin/avr-gcc
+compiler := avr-gcc
 cppflags := -mmcu=atmega328p -DF_CPU=8000000L -DARDUINO=105 -ffunction-sections -fdata-sections -g -Os -w -fno-exceptions
 
-define INCLUDE
+define INCLUDE_NATIVE
 		-I/opt/local/avr/include \
 		-I/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino \
 		-I/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/variants/standard \
 		-I/Users/amo/dev/foss/open.nshare.de/beradio/tmp/StandardCplusplus \
 		-I.
 endef
 
+define INCLUDE
+		-I/opt/local/avr/include \
+		-I/Users/amo/.platformio/packages/framework-arduino-avr/cores/arduino \
+		-I/Users/amo/.platformio/packages/framework-arduino-avr/variants/standard \
+		-I/Users/amo/dev/hiveeyes/sources/arduino/libraries/TerkinData/examples/.pio/libdeps/avr328/ArduinoSTL/src \
+		-I.
+endef
+
 simulavr          := /Users/amo/dev/foss/open.nshare.de/simulavr/src/simulavr
 simulavr_options  := --verbose --cpufrequency 8000000 --device atmega328
 simulavr_hook     := --terminate=exit --writetopipe=0x91,- --writetoabort=0x95 --writetoexit=0x96

diff --git a/libraries/BERadio/examples/playground/README.rst b/libraries/BERadio/examples/playground/README.rst
@@ -7,6 +7,15 @@ AVR playground
     The Makefile includes machine-specific path definitions. Please adapt to your environment.
 
 
+Synopsis
+========
+::
+
+    make name=avr-hello
+    make name=avr-sim
+    make name=arduino-vector
+
+
 Hello world on simulavr
 =======================
 

diff --git a/libraries/BERadio/examples/playground/arduino-vector.cpp b/libraries/BERadio/examples/playground/arduino-vector.cpp
@@ -3,9 +3,13 @@
 //#include <pnew.cpp>
 
 // Variant 2: Standard C++ for Arduino (port of uClibc++)
-#include <Arduino.h>
+//#include <Arduino.h>
+//#include <new.cpp>
+//#include <StandardCplusplus.h>
+
+// Variant 3: Classic ArduinoSTL
+#include <ArduinoSTL.h>
 #include <new.cpp>
-#include <StandardCplusplus.h>
 
 // main program
 #include <iterator>

diff --git a/libraries/TerkinData/examples/platformio.ini b/libraries/TerkinData/examples/platformio.ini
@@ -26,7 +26,6 @@ lib_deps =
     bblanchon/ArduinoJson@^5
     mikem/RadioHead@^1.113
     #paulstoffregen/Time@^1.6
-    #https://github.com/hiveeyes/StandardCplusplus
 lib_extra_dirs =
     ${PROJECT_DIR}/../../../libraries