ArduinoJSON v6.20.0+ compatibility

- Remove support for naked CHAR in parameters
- Remove use of containsKey() function

Author: mdelain

src/LiveObjectsBase.cpp

@@ -31,12 +31,12 @@ void LiveObjectsBase::paramTyper(const String& name, bool* variable, LiveObjects
   else
     addTypedParam(name, variable, type, T_BOOL, callback);
 }
-void LiveObjectsBase::paramTyper(const String& name, char* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback) {
+/*void LiveObjectsBase::paramTyper(const String& name, char* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback) {
   if (type == IMPLICIT)
     addTypedParam(name, variable, INTEGER, T_CHAR, callback);
   else
     addTypedParam(name, variable, type, T_CHAR, callback);
-}
+}*/
 #if not defined ESP8266 && not defined ESP32 && not defined ARDUINO_AVR_FEATHER32U4
 void LiveObjectsBase::paramTyper(const String& name, int* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback) {
   if (type == IMPLICIT)
@@ -111,9 +111,9 @@ void LiveObjectsBase::ptrTyper(const LiveObjects_parameter param, const JsonDocu
     case T_BOOL:
       updateParameter(param, (bool*)param.value, configIn, configOut);
       break;
-    case T_CHAR:
+/*    case T_CHAR:
       updateParameter(param, (char*)param.value, configIn, configOut);
-      break;
+      break;*/
     #ifndef ESP8266
     case T_INT:
       updateParameter(param, (int*)param.value, configIn, configOut);
@@ -301,7 +301,7 @@ void LiveObjectsBase::sendData(const String customPayload) {
   {
     StaticJsonDocument<PAYLOAD_DATA_SIZE> payload;
     deserializeJson(payload, customPayload);
-    if (!payload.containsKey(JSONMODEL)) payload[JSONMODEL] = m_sModel;
+    if (!payload[JSONMODEL].is<const char*>()) payload[JSONMODEL] = m_sModel;
     publishMessage(m_sTopic, payload);
   }
   else publishMessage(m_sTopic, const_cast<String&>(customPayload));

src/LiveObjectsBase.h

@@ -14,7 +14,6 @@
 #define KEEP_ALIVE_NETWORK 1000
 #define SW_REVISION "2.1.1"
 
-
 /******************************************************************************
    LiveObjects MQTT constants
  ******************************************************************************/
@@ -42,6 +41,7 @@
 #define JSONCFGTYPE "t"
 #define JSONMODEL "model"
 #define JSONVALUE "value"
+
 /******************************************************************************
    INCLUDES
  ******************************************************************************/
@@ -215,7 +215,6 @@ class LiveObjectsBase
   virtual void sendMQTT(String& topic, String& doc)=0;
   virtual void deserializeMessage(JsonDocument& doc)=0;
 
-
 protected:
  /******************************************************************************
    CONFIGURATION MANAGER
@@ -285,12 +284,12 @@ class LiveObjectsBase
    PARAM TYPERS
  ******************************************************************************/
     void paramTyper(const String& name, bool* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
-    void paramTyper(const String& name, char* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
+    // void paramTyper(const String& name, char* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     #if not defined ESP8266 && not defined ESP32 && not defined ARDUINO_AVR_FEATHER32U4
     void paramTyper(const String& name, int* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     void paramTyper(const String& name, unsigned int* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     #endif
-    void paramTyper(const String& name, int8_t*variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
+    void paramTyper(const String& name, int8_t* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     void paramTyper(const String& name, int32_t* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     void paramTyper(const String& name, int16_t* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);
     void paramTyper(const String& name, uint8_t* variable, LiveObjects_parameterType type, onParameterUpdateCallback callback);