From 4c32af3e1b255c70bc4c251027dfef3005e13bad Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Sun, 26 Aug 2018 19:04:25 +0200 Subject: [PATCH] cleanup --- src/JsonStruct.h | 9 ++++----- src/MeshNet.cpp | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/JsonStruct.h b/src/JsonStruct.h index 9924a08..ae7856f 100644 --- a/src/JsonStruct.h +++ b/src/JsonStruct.h @@ -28,19 +28,18 @@ struct JsonStruct { return jsonString; } - String getAttrFromJson(JsonObject& json, const char* attr){ + String getAttrFromJson(JsonObject& json, const char* attr, String defautValue = ""){ if(json.containsKey(String(attr))){ const char *value = json[attr]; return String(value); - //return json[attr]; } - return "no value"; + return defautValue; } - int getIntAttrFromJson(JsonObject& json, const char* attr){ + int getIntAttrFromJson(JsonObject& json, const char* attr, int defautValue = 0){ if(json.containsKey(attr)){ return json[attr]; } - return 0; + return defautValue; } // Map a json object to this struct. // Parse a json string and map parsed object diff --git a/src/MeshNet.cpp b/src/MeshNet.cpp index 3152fda..65a6566 100644 --- a/src/MeshNet.cpp +++ b/src/MeshNet.cpp @@ -16,7 +16,6 @@ Network* MeshNet::init(){ Serial.println("init mesh"); config.fromFile("/config.json"); - Serial.println(config.meshSSID); //mesh.setDebugMsgTypes( ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE ); // all types on mesh.setDebugMsgTypes( config.debugTypes );