Merge pull request #26 from tobozo/1.5.0

1.5.0

Author: tobozo

.github/workflows/ArduinoBuild.yml

@@ -61,8 +61,8 @@ jobs:
           - 2.0.15
           - 2.0.16
           - 2.0.17
-          - 3.0.0
-          - 3.0.1
+          - 3.1.1
+          - 3.1.2
           - latest
 
         include:

.github/workflows/PlatformioBuild.yml

@@ -0,0 +1,68 @@
+name: PlatformIOBuild
+
+env:
+  PROJECT_DIR: examples/test
+
+on:
+  push:
+    paths:
+    - '**.ino'
+    - '**.cpp'
+    - '**.hpp'
+    - '**.h'
+    - '**.c'
+    - '**PlatformioBuild.yml'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: ${{ matrix.pio-env }}
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        pio-env:
+          - esp32
+          - esp8266
+          - rp2040_pico
+          - rp2350_pico2
+          - seeed_wio_terminal
+
+      fail-fast: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Cache pip
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ matrix.pio-env }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Cache PlatformIO
+        uses: actions/cache@v4
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-pio-${{ matrix.pio-env }}
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+
+      - name: Run PlatformIO
+
+        run: |
+          cd ${{ env.PROJECT_DIR }}
+          pio pkg install -e ${{ matrix.pio-env }} --no-save --library file://$(realpath ../../) --force
+          pio run -e ${{ matrix.pio-env }}

examples/ReadWriteConfigFile/ReadWriteConfigFile.ino

@@ -6,14 +6,12 @@
   #define FS_t fs::FS
   #define File_t fs::File
   #define delay_fn vTaskDelay
-#elif defined CORE_TEENSY
+#else
   #include <FS.h>
   #include <SD.h>
   #define FS_t FS
   #define File_t File
   #define delay_fn delay
-#else
-  #error "please implement"
 #endif
 
 
@@ -41,7 +39,7 @@ const char* nodename = "my_setting"; // property name in the config
 const bool default_value = false; // default value for property
 bool current_value = default_value;
 bool config_loaded = false; // prevent updates if config isn't loaded
-DynamicJsonDocument json_doc(2048);
+JsonDocument json_doc;
 JsonObject myConfig; // json accessor
 
 
@@ -63,7 +61,7 @@ bool loadYamlConfig()
 {
   File_t file = SD.open( config_file );
   if( !file ) {
-    Serial.println("Can't open test file for writing :-(");
+    Serial.println("Can't open test file for reading :-(");
     return false;
   }
   auto err = deserializeYml( json_doc, file ); // convert yaml to json
@@ -119,7 +117,8 @@ void setup()
     Serial.begin(115200);
     SD.begin( BUILTIN_SDCARD );
   #else
-    #error "please implement"
+    Serial.begin(115200);
+    SD.begin(SS);
   #endif
 
 

examples/deserializeYml/deserializeYml.ino

@@ -26,8 +26,8 @@ const char* json_sample_str = R"_JSON_STRING_(
   "blah": { "nope": [ "n", "o", "p", "e" ] },
   "integer": 12345,
   "float": 12.3323,
-  "qinteger": "12345"
-  "qfloat": "12.3323"
+  "qinteger": "12345",
+  "qfloat": "12.3323",
   "last": true
 }
 

examples/serializeYml/serializeYml.ino

@@ -8,6 +8,9 @@ blah:
   nope: ["n","o","p","e"]
 integer: 12345
 float: 12.3323
+hex: 0x1234
+dq_hex: "0x1234"
+sq_hex: '0x1234'
 last: true
 
 )_YAML_STRING_";
@@ -19,6 +22,9 @@ const char* json_sample_str = R"_JSON_STRING_(
   "blah": { "nope": [ "n", "o", "p", "e" ] },
   "integer": 12345,
   "float": 12.3323,
+  "hex": 4660,
+  "dq_hex": "0x1234",
+  "sq_hex": "0x1234",
   "last": true
 }
 
@@ -43,29 +49,32 @@ int test_number = 1;
 
 void test_Yaml2JsonPretty()
 {
-  #if defined TEST_YAML_TO_JSON
-  String yaml_str = String( yaml_sample_str );
-  StringStream yaml_stream( yaml_str );
-  serializeYml( yaml_stream, Serial, YAMLParser::OUTPUT_JSON_PRETTY );
+  #if defined TEST_YAML_TO_JSON_PRETTY
+  Serial.println("serializeYml (OUTPUT_JSON_PRETTY)");
+  YAMLNode yamlnode = YAMLNode::loadString( yaml_sample_str );
+  serializeYml( yamlnode.getDocument(), Serial, OUTPUT_JSON_PRETTY );
+  Serial.println();
   #endif
 }
 
 void test_Yaml2Json()
 {
-  #if defined TEST_YAML_TO_JSON_PRETTY
-  String yaml_str = String( yaml_sample_str );
-  StringStream yaml_stream( yaml_str );
-  serializeYml( yaml_stream, Serial, YAMLParser::OUTPUT_JSON );
+  #if defined TEST_YAML_TO_JSON
+  Serial.println("serializeYml (OUTPUT_JSON)");
+  YAMLNode yamlnode = YAMLNode::loadString( yaml_sample_str );
+  serializeYml( yamlnode.getDocument(), Serial, OUTPUT_JSON );
+  Serial.println();
   #endif
 }
 
 
 void test_Json2Yaml()
 {
   #if defined TEST_JSON_TO_YAML
-  String yaml_str = String( yaml_sample_str );
-  StringStream yaml_stream( yaml_str );
-  serializeYml( yaml_stream, Serial, YAMLParser::OUTPUT_YAML );
+  Serial.println("serializeYml (OUTPUT_YAML)");
+  YAMLNode yamlnode = YAMLNode::loadString( json_sample_str );
+  serializeYml( yamlnode.getDocument(), Serial, OUTPUT_YAML );
+  Serial.println();
   #endif
 }
 
@@ -75,7 +84,7 @@ void test_serializeYml_JsonObject_YamlStream()
   #if defined TEST_ArduinoJsonObject_TO_YAML_Stream
   // Convert JsonObject to yaml
   String json_str = String( json_sample_str );
-  DynamicJsonDocument doc(128); // create and populate a JsonObject
+  JsonDocument doc; // create and populate a JsonObject
   auto err = deserializeJson( doc, json_str.c_str() );
   if( err ) {
     Serial.printf("Unable to deserialize demo JSON to JsonObject: %s", err.c_str() );
@@ -93,7 +102,7 @@ void test_serializeYml_JsonObject_YamlString()
   // Convert JsonObject to yaml
   String str_yaml_out = ""; // YAML output string
   String json_str = String( json_sample_str );
-  DynamicJsonDocument doc(128); // create and populate a JsonObject
+  JsonDocument doc; // create and populate a JsonObject
   auto err = deserializeJson( doc, json_str.c_str() );
   if( err ) {
     Serial.printf("Unable to deserialize demo JSON to JsonObject: %s", err.c_str() );
@@ -112,7 +121,7 @@ void setup()
 {
   Serial.begin(115200);
   delay(5000);
-  Serial.printf("Welcome to the YAML Test sketch\nRam free: %d bytes", HEAP_AVAILABLE() );
+  Serial.printf("Welcome to the YAML Test sketch\nRam free: %d bytes\n", HEAP_AVAILABLE() );
 
   // YAML::setLogLevel( YAML::LogLevelDebug ); // override sketch debug level (otherwise inherited)
   // YAML::setJSONIndent("  ", 8 ); // JSON -> two spaces per indent level, unfold objets up to 8 nesting levels

examples/test/platformio.ini

@@ -1,46 +1,47 @@
 [platformio]
 description    = YAMLDuino test sketch for platformio
-;default_envs   = esp32_2_0_5
+default_envs   = esp32
 src_dir        = src
 
 
 [env]
 framework = arduino
 platform  = espressif32
 lib_deps =
-  bblanchon/ArduinoJson
-;  tobozo/YAMLDuino @ ^1.2
+  bblanchon/ArduinoJson @ ^7
+  ;  tobozo/YAMLDuino @ ^1.5
   YAMLDuino
 lib_ldf_mode = deep
 
-[env:arduinojson6x]
-lib_deps =
-  bblanchon/ArduinoJson @ ^6
-  YAMLDuino
-
-[env:arduinojson7x]
-lib_deps =
-  bblanchon/ArduinoJson @ ^7
-  YAMLDuino
 
-[env:esp32-arduinojson6x]
-extends = env:arduinojson6x
-board   = esp32dev
+[env:esp32]
+board    = esp32dev
+; alternate (community maintained) platform/package:
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
+; or official (but barely maintained) espressif package
+; platform          = espressif32
 
-[env:esp32-arduinojson7x]
-extends = env:arduinojson7x
-board   = esp32dev
 
-; or alternate platform/package:
-;platform          = https://github.com/tasmota/platform-espressif32
-;platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.5/esp32-2.0.5.zip
+[env:esp8266]
+platform = espressif8266
+board = d1_mini_pro
 
 
 [env:rp2040_pico]
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
-platform_packages = framework-arduinopico @ https://github.com/earlephilhower/arduino-pico/releases/download/2.6.1/rp2040-2.6.1.zip
-board = generic
+board = pico
 framework = arduino
-board_build.filesystem_size = 0.5m ; adjust if needed
-board_upload.maximum_size = 16777216
-board_build.arduino.earlephilhower.boot2_source = boot2_w25q080_4_padded_checksum.S
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+
+
+[env:rp2350_pico2]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+board = rpipico2
+board_build.mcu = rp2350-riscv
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+
+[env:seeed_wio_terminal]
+platform = atmelsam
+board = seeed_wio_terminal