@@ -25,7 +25,6 @@ Cloud4RPi::Cloud4RPi(const String &_deviceToken, const String &_server, int _por
2525
2626Cloud4RPi::~Cloud4RPi () {
2727 if (mqttClient != NULL ) {
28- delete mqttClient;
2928 mqttClient = NULL ;
3029 }
3130
@@ -98,9 +97,9 @@ void Cloud4RPi::declareBoolVariable(const String& varName, C4R_BOOL_HANDLER_SIGN
9897}
9998
10099void Cloud4RPi::declareNumericVariable (const String& varName, C4R_NUMERIC_HANDLER_SIGNATURE) {
101- if (!isVariableExists (varName)) {
100+ if (!isVariableExists (varName)) {
102101 variables->declare <double >(varName, VAR_TYPE_NUMERIC, cmdHandler);
103- }
102+ }
104103}
105104
106105void Cloud4RPi::declareStringVariable (const String& varName) {
@@ -132,11 +131,11 @@ double Cloud4RPi::getNumericValue(const String& varName) {
132131 return variables->getValue <double >(varName);
133132}
134133String Cloud4RPi::getStringValue (const String& varName) {
135- return String ( variables->getValue <char * >(varName) );
134+ return variables->getValue <String >(varName);
136135}
137136
138137String Cloud4RPi::getDiagValue (const String& varName) {
139- return String ( diagnostics->getValue <char * >(varName) );
138+ return diagnostics->getValue <String >(varName);
140139}
141140
142141void Cloud4RPi::setVariable (const String& varName, bool value) {
@@ -167,11 +166,19 @@ void Cloud4RPi::setVariable(const String& varName, double value) {
167166 variables->setValue (varName, value);
168167}
169168
170- void Cloud4RPi::setVariable (const String& varName, String value) {
169+ void Cloud4RPi::setVariable (const String& varName, const char * value) {
170+ variables->setValue (varName, String (value));
171+ }
172+
173+ void Cloud4RPi::setVariable (const String& varName, const String& value) {
171174 variables->setValue (varName, value);
172175}
173176
174- void Cloud4RPi::setDiagVariable (const String& varName, String value) {
177+
178+ void Cloud4RPi::setDiagVariable (const String& varName, const char * value) {
179+ diagnostics->setValue (varName, String (value));
180+ }
181+ void Cloud4RPi::setDiagVariable (const String& varName, const String& value) {
175182 diagnostics->setValue (varName, value);
176183}
177184
0 commit comments