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

stuff

Browse Source
This commit is contained in:
0x1d
2018-09-03 02:14:14 +02:00
parent 1af30e4243
commit b9964e0ac1
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/JsonStruct.h
View File

@@ -52,7 +52,6 @@ struct JsonStruct {
}; };
void fromFile(const char* path) { void fromFile(const char* path) {
Serial.println("read json");
File configFile = SPIFFS.open(path, "r"); File configFile = SPIFFS.open(path, "r");
String cfgFileStr = configFile.readString(); String cfgFileStr = configFile.readString();
@@ -68,11 +67,10 @@ struct JsonStruct {
valid = verifyJsonObject(json); valid = verifyJsonObject(json);
if(configFile) { if(configFile) {
Serial.println("map json object");
fromJsonObject(json); fromJsonObject(json);
} }
if(!valid){ if(!valid){
Serial.println("read json failed"); Serial.println("ERROR: read failed for " + String(path));
} }
configFile.close(); configFile.close();
} }

14
src/base/MeshSprocket.h
View File

@@ -22,28 +22,14 @@ class MeshSprocket : public Sprocket {
} }
virtual void onChangedConnections(){};
virtual void onNewConnection(){};
Sprocket* activate(Scheduler* scheduler, Network* network) { Sprocket* activate(Scheduler* scheduler, Network* network) {
Sprocket::activate(scheduler, network); Sprocket::activate(scheduler, network);
net = static_cast<MeshNet*>(network); net = static_cast<MeshNet*>(network);
net->onReceive(bind(&MeshSprocket::dispatch,this, _1, _2)); net->onReceive(bind(&MeshSprocket::dispatch,this, _1, _2));
net->mesh.onNewConnection(bind(&MeshSprocket::newConnection,this, _1));
net->mesh.onChangedConnections(bind(&MeshSprocket::connectionChanged,this));
return this; return this;
} using Sprocket::activate; } using Sprocket::activate;
virtual void newConnection(uint32_t nodeId){
PRINT_MSG(Serial, "MeshSprocket", "connected to %u", nodeId);
onNewConnection();
}
virtual void connectionChanged(){
PRINT_MSG(Serial, "MeshSprocket", "connection changed");
onChangedConnections();
}
virtual void onMessage(uint32_t from, String &msg) { virtual void onMessage(uint32_t from, String &msg) {
Serial.printf("MeshSprocket onMessage: received from %u msg=%s\n", from, msg.c_str()); Serial.printf("MeshSprocket onMessage: received from %u msg=%s\n", from, msg.c_str());
}; };