Merge pull request #1 from tobozo/1.2.1

misc fixes

Author: tobozo

examples/test/test.ino

@@ -1,6 +1,6 @@
 #include <ArduinoJson.h> // optional
 //#include <cJSON.h>       // implicit with esp32, otherwise optional
-#include <ArduinoYaml.h>
+#include <YAMLDuino.h>
 
 
 // sorry about the notation, but it looks nicer than chunk-splitting+quoting
@@ -77,8 +77,8 @@ void setup()
   YAMLParser::setLogLevel( YAML::LogLevelDebug ); // override sketch debug level (otherwise inherited)
 
 
-  #if __has_include(<ArduinoJson.h>)
-
+  #if defined HAS_ARDUINOJSON
+    #pragma message "Enabling ArduinoJson tests"
 
     YAML_LOG_n("YAML=>JSON and JSON=>YAML using ArduinoJson\n\n");
 
@@ -153,6 +153,7 @@ void setup()
 
 
     #if defined USE_STREAM_TO_STREAM // stream to stream unavailable on esp8266 (not enough memory)
+    #pragma message "Enabling ArduinoJson stream<=>stream tests"
     {
       YAML_LOG_n( "[TEST #%d] JSON stream to JsonObject to YAML stream -> serializeYml(stream_in, Serial):", test_number++ );
       String str_json = String( json_example_str );
@@ -171,6 +172,7 @@ void setup()
 
 
   #if __has_include(<cJSON.h>)
+    #pragma message "Enabling cJSON tests"
 
 
 

library.properties

@@ -1,11 +1,11 @@
 name=YAMLDuino
-version=1.2.0
+version=1.2.1
 author=tobozo <[email protected]>
 maintainer=tobozo <[email protected]>
 sentence=A simple and efficient YAML library for embedded C++
-paragraph=ArduinoYaml is syntax friendly with ArduinoJson and cJSON, supports ✔ serialization, ✔ deserialization
+paragraph=ArduinoYaml is syntax friendly with ArduinoJson and cJSON, supports ✔ serialization, ✔ deserialization, ✔ conversion
 category=Data Processing
-url=https://github.com/tobozo/esp32-yaml
+url=https://github.com/tobozo/YAMLDuino
 architectures=esp32,esp8266,samd,rp2040,mbed_rp2040,mbed_nano
 includes=ArduinoYaml.h,YAMLDuino.h
 license=MIT

src/ArduinoYaml.cpp

@@ -216,8 +216,7 @@ void YAMLParser::handle_emitter_error(yaml_emitter_t *e)
 
 
 
-#if __has_include(<ArduinoJson.h>)
-
+#if defined HAS_ARDUINOJSON
 
   // yaml_node_t deconstructor => JsonObject
   void deserializeYml_JsonObject( yaml_document_t* document, yaml_node_t* yamlNode, JsonObject &jsonNode, YAMLParser::JNestingType_t nt, const char *nodename, int depth )

src/ArduinoYaml.hpp

@@ -41,8 +41,14 @@ extern "C" {
 
 #if defined ARDUINO_ARCH_SAMD || defined ARDUINO_ARCH_RP2040 || defined ESP8266
   #include <Arduino.h>
+  #include <ArduinoJson.h>
   #include <assert.h>
   #undef USE_STREAM_TO_STREAM
+  #define HAS_ARDUINOJSON
+#endif
+
+#if !defined HAS_ARDUINOJSON && __has_include(<Arduino.h>)
+  #define HAS_ARDUINOJSON
 #endif
 
 
@@ -57,7 +63,6 @@ class StringStream : public Stream
   virtual size_t write(uint8_t c) { str += (char)c; return 1; }
 private:
   String &str;
-  //unsigned int length = 0;
   unsigned int pos;
 };
 
@@ -93,7 +98,7 @@ class YAMLParser
 
 
 
-#if __has_include(<ArduinoJson.h>)
+#if defined HAS_ARDUINOJSON
 
   #include <ArduinoJson.h>