Merge branch 'master' into master

aentinger · web-flow · commit 53ed8945b06d · 2022-11-10T09:41:55.000+01:00
diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 
diff --git a/examples/JSONObject/JSONObject.ino b/examples/JSONObject/JSONObject.ino
@@ -8,6 +8,7 @@
 */
 
 #include <Arduino_JSON.h>
+#include <assert.h>
 
 const char input[] = "{\"result\":true,\"count\":42,\"foo\":\"bar\"}";
 
@@ -78,7 +79,19 @@ void demoCreation() {
 
   myObject["hello"] = "world";
   myObject["true"] = true;
-  myObject["x"] = 42;
+
+  myObject["x1"] = (int) 42;
+  myObject["x2"] = (long) 42;
+  myObject["x3"] = (unsigned long) 42;
+
+  int x1 = myObject["x1"];
+  assert(x1 == 42);
+  
+  long x2 = myObject["x2"];
+  assert(x2 == 42);
+
+  unsigned long x3 = myObject["x3"];
+  assert(x3 == 42);
 
   Serial.print("myObject.keys() = ");
   Serial.println(myObject.keys());
diff --git a/examples/JSONValueExtractor/JSONValueExtractor.ino b/examples/JSONValueExtractor/JSONValueExtractor.ino
@@ -0,0 +1,69 @@
+/*
+  JSON Value Extractor
+
+  This sketch demonstrates how to use some features
+  of the Official Arduino JSON library to traverse through all the
+  key value pair in the object and the nested objects.
+  Can be very helpful when searching for a specific data in a key
+  which is nested at multiple levels
+  The sketch actually use recursion to traverse all the keys in
+  a given JSON.
+
+  Example originally added on 24-03-2020
+  by Madhur Dixit https://github.com/Chester-King
+
+  This example code is in the public domain.
+*/
+
+#include <Arduino_JSON.h>
+
+void setup() {
+
+  Serial.begin(9600);
+  while (!Serial);
+  valueExtractor();
+
+}
+
+void loop() {
+}
+
+void valueExtractor() {
+
+  Serial.println("object");
+  Serial.println("======");
+  JSONVar myObject;
+
+  // Making a JSON Object
+  myObject["foo"] = "bar";
+  myObject["blah"]["abc"] = 42;
+  myObject["blah"]["efg"] = "pod";
+  myObject["blah"]["cde"]["pan1"] = "King";
+  myObject["blah"]["cde"]["pan2"] = 3.14;
+  myObject["jok"]["hij"] = "bar";
+
+  Serial.println(myObject);
+  Serial.println();
+  Serial.println("Extracted Values");
+  Serial.println("======");
+
+  objRec(myObject);
+
+}
+
+void objRec(JSONVar myObject) {
+  Serial.println("{");
+  for (int x = 0; x < myObject.keys().length(); x++) {
+    if ((JSON.typeof(myObject[myObject.keys()[x]])).equals("object")) {
+      Serial.print(myObject.keys()[x]);
+      Serial.println(" : ");
+      objRec(myObject[myObject.keys()[x]]);
+    }
+    else {
+      Serial.print(myObject.keys()[x]);
+      Serial.print(" : ");
+      Serial.println(myObject[myObject.keys()[x]]);
+    }
+  }
+  Serial.println("}");
+}
diff --git a/src/JSONVar.cpp b/src/JSONVar.cpp
@@ -202,6 +202,11 @@ JSONVar::operator unsigned long () const
     return cJSON_IsNumber (_json) ? _json->valueint : 0;
 }
 
+JSONVar::operator unsigned long() const
+{
+  return cJSON_IsNumber(_json) ? _json->valueint : 0;
+}
+
 JSONVar::operator double() const
 {
   return cJSON_IsNumber(_json) ? _json->valuedouble : NAN;

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,11 @@ JSONVar::operator unsigned long () const`
`202`	`202`	`return cJSON_IsNumber (_json) ? _json->valueint : 0;`
`203`	`203`	`}`
`204`	`204`
	`205`	`+JSONVar::operator unsigned long() const`
	`206`	`+{`
	`207`	`+ return cJSON_IsNumber(_json) ? _json->valueint : 0;`
	`208`	`+}`
	`209`	`+`
`205`	`210`	`JSONVar::operator double() const`
`206`	`211`	`{`
`207`	`212`	`return cJSON_IsNumber(_json) ? _json->valuedouble : NAN;`