iot/sprocket-core
1
0
Fork 0
mirror of https://gitlab.com/wirelos/sprocket-lib.git synced 2025-12-15 05:02:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
0x1d
2018-08-26 19:04:25 +02:00
parent b676746723
commit 4c32af3e1b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/JsonStruct.h
View File

@@ -28,19 +28,18 @@ struct JsonStruct {
return jsonString; return jsonString;
} }
String getAttrFromJson(JsonObject& json, const char* attr){ String getAttrFromJson(JsonObject& json, const char* attr, String defautValue = ""){
if(json.containsKey(String(attr))){ if(json.containsKey(String(attr))){
const char *value = json[attr]; const char *value = json[attr];
return String(value); 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)){ if(json.containsKey(attr)){
return json[attr]; return json[attr];
} }
return 0; return defautValue;
} }
// Map a json object to this struct. // Map a json object to this struct.
// Parse a json string and map parsed object // Parse a json string and map parsed object

1
src/MeshNet.cpp
View File

@@ -16,7 +16,6 @@ Network* MeshNet::init(){
Serial.println("init mesh"); Serial.println("init mesh");
config.fromFile("/config.json"); 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( ERROR | MESH_STATUS | CONNECTION | SYNC | COMMUNICATION | GENERAL | MSG_TYPES | REMOTE ); // all types on
mesh.setDebugMsgTypes( config.debugTypes ); mesh.setDebugMsgTypes( config.debugTypes );