From ce81741953d58b42d83c16b87313f3d6305b8300 Mon Sep 17 00:00:00 2001
From: matsfunk <mathias.funk@gmail.com>
Date: Sun, 1 May 2022 19:10:47 +0200
Subject: [PATCH] v1.5.12  - removed commented code from merged PR

---
 dist/oocsi.zip                | Bin 39104 -> 39179 bytes
 dist/oocsi/DFDataset.cpp      |  36 ++++++++++++++++++++--------------
 dist/oocsi/DFDataset.h        |   2 +-
 dist/oocsi/library.properties |   4 ++--
 src/DFDataset.cpp             |   9 +--------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/dist/oocsi.zip b/dist/oocsi.zip
index 9ba618455d07fca15399ebb718741576f3b33f1c..835fe80353c9f6758c7ed2cf43ad74e59187d8db 100644
GIT binary patch
delta 5206
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
ZIvEV~|Gydj_u4Ip#0)NMqv$`i{{o3rx6c3o

delta 5132
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
MNaZ3R3I7BC3xB<xSO5S3

diff --git a/dist/oocsi/DFDataset.cpp b/dist/oocsi/DFDataset.cpp
index 99e8941..26db6c0 100644
--- a/dist/oocsi/DFDataset.cpp
+++ b/dist/oocsi/DFDataset.cpp
@@ -20,6 +20,11 @@ DFDataset::DFDataset(const char* server, int id, const char* token) {
   api_token = token;
   logging = true;
   jsonMessage.clear();
+
+  device_id = NULL;
+  activity_id = NULL;
+  resource_id = NULL;
+  resource_token = NULL;
 }
 
 // iot datasets
@@ -80,12 +85,13 @@ bool DFDataset::logItem() {
   device_id = device_id != NULL ? device_id : "";
 
   // url encode activity id string because it will be part of the URL
-  activity_id = urlencode(activity_id);
+  char activity_id_url[200];
+  urlencode(activity_id_url, activity_id);
 
   // do transmission
 #if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_NANO_33_IOT) || defined(ARDUINO_NANO_RP2040_CONNECT)
   // compile address
-  snprintf_P(address, sizeof(address), PSTR("/datasets/ts/log/%i/%s"), dataset_id, activity_id);
+  snprintf_P(address, sizeof(address), PSTR("/datasets/ts/log/%i/%s"), dataset_id, activity_id_url);
 
   HttpClient http = HttpClient(wifi, host, 80);  
   http.beginRequest();
@@ -107,7 +113,7 @@ bool DFDataset::logItem() {
   return httpCode == 200;
 #else
   // compile address
-  snprintf_P(address, sizeof(address), PSTR("http://%s/datasets/ts/log/%i/%s"), host, dataset_id, activity_id);
+  snprintf_P(address, sizeof(address), PSTR("http://%s/datasets/ts/log/%i/%s"), host, dataset_id, activity_id_url);
 
   HTTPClient http;
   http.begin(wifi, address/*, root_ca_df*/);
@@ -318,7 +324,7 @@ bool DFDataset::getItem() {
   http.print("");
   http.endRequest();
   
-  int httpCode = http.responseStatusCode();
+  /*int httpCode = */http.responseStatusCode();
   String jsonResponse = http.responseBody();
 
   //http.end();
@@ -488,17 +494,17 @@ void DFDataset::setLogging(bool log) {
   logging = log;
 }
 
-const char* DFDataset::urlencode(const char* str)
+void DFDataset::urlencode(char* dst, const char* src)
 {
-  String encodedString="";
+  char encodedString[200] = "";
   char c;
   char code0;
   char code1;
-  char code2;
-  for (int i =0; i < strlen(str); i++){
-    c=str[i];
+
+  for (int i =0; i < strlen(src); i++){
+    c=src[i];
     if (isalnum(c)){
-      encodedString+=c;
+      sprintf(encodedString, "%s%c", encodedString, c);
     } else {
       code1=(c & 0xf)+'0';
       if ((c & 0xf) >9){
@@ -509,12 +515,12 @@ const char* DFDataset::urlencode(const char* str)
       if (c > 9){
           code0=c - 10 + 'A';
       }
-      code2='\0';
-      encodedString+='%';
-      encodedString+=code0;
-      encodedString+=code1;
+      sprintf(encodedString, "%s%c", encodedString, '%');
+      sprintf(encodedString, "%s%c", encodedString, code0);
+      sprintf(encodedString, "%s%c", encodedString, code1);
     }
     yield();
   }
-  return encodedString.c_str();
+
+  strcpy(dst, encodedString);
 }
diff --git a/dist/oocsi/DFDataset.h b/dist/oocsi/DFDataset.h
index ee0a551..a3d2f10 100644
--- a/dist/oocsi/DFDataset.h
+++ b/dist/oocsi/DFDataset.h
@@ -109,7 +109,7 @@ class DFDataset {
     void println();
     void println(const String &message);
     void println(char message);
-    const char* urlencode(const char* str);
+    void urlencode(char* dst, const char* src);
 };
 
 #endif
diff --git a/dist/oocsi/library.properties b/dist/oocsi/library.properties
index d2bd2cd..6476587 100644
--- a/dist/oocsi/library.properties
+++ b/dist/oocsi/library.properties
@@ -1,11 +1,11 @@
 name=OOCSI
-version=1.5.11
+version=1.5.12
 author=Jort Band, Mathias Funk
 maintainer=Mathias Funk <m.funk@tue.nl>
 sentence=OOCSI client library for the ESP32, ESP8266, Arduino MKR Wifi 101, Arduino UNO Wifi, Arduino Nano 33 IoT, and Arduino Nano RP2040
 paragraph=Library for easy connection and communication with the ESP32, ESP8266 and Arduino NANO 33 IoT modules over the OOCSI platform
 category=Communication
 url=https://github.com/iddi/oocsi-esp
-architectures=esp32,esp8266,samd,megaavr,mbed_nano,mbed_rp2040
+architectures=esp32,esp8266,samd,megaavr,mbed_nano,mbed_rp2040,rp2040
 includes=OOCSI.h
 depends=ArduinoJson,ArduinoHttpClient
\ No newline at end of file
diff --git a/src/DFDataset.cpp b/src/DFDataset.cpp
index 7b08515..26db6c0 100644
--- a/src/DFDataset.cpp
+++ b/src/DFDataset.cpp
@@ -497,15 +497,13 @@ void DFDataset::setLogging(bool log) {
 void DFDataset::urlencode(char* dst, const char* src)
 {
   char encodedString[200] = "";
-  //String encodedString="";
   char c;
   char code0;
   char code1;
-  //char code2;
+
   for (int i =0; i < strlen(src); i++){
     c=src[i];
     if (isalnum(c)){
-      // encodedString+=c;
       sprintf(encodedString, "%s%c", encodedString, c);
     } else {
       code1=(c & 0xf)+'0';
@@ -517,17 +515,12 @@ void DFDataset::urlencode(char* dst, const char* src)
       if (c > 9){
           code0=c - 10 + 'A';
       }
-      code2='\0';
-      //encodedString+='%';
       sprintf(encodedString, "%s%c", encodedString, '%');
-      //encodedString+=code0;
       sprintf(encodedString, "%s%c", encodedString, code0);
-      //encodedString+=code1;
       sprintf(encodedString, "%s%c", encodedString, code1);
     }
     yield();
   }
 
-  //return encodedString.c_str();
   strcpy(dst, encodedString);
 }