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

remove join method as everything is handled via activate, remove commented code

Browse Source
This commit is contained in:
0x1d
2018-11-08 15:46:46 +01:00
parent a8e0d9037e
commit b63b75b47f
3 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/JsonStruct.h
View File

@@ -16,10 +16,8 @@ struct JsonStruct {
virtual void fromJsonObject(JsonObject& json); virtual void fromJsonObject(JsonObject& json);
virtual int verifyJsonObject(JsonObject& json){ virtual int verifyJsonObject(JsonObject& json){
return json.success(); return json.success();
//&& json.containsKey(JSON_DOMAIN)
}; };
String toJsonString(){ String toJsonString(){
//StaticJsonBuffer<200> StringjsonBuffer;
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300)); DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300));
JsonObject& root = jsonBuffer.createObject(); JsonObject& root = jsonBuffer.createObject();
mapJsonObject(root); mapJsonObject(root);
@@ -44,7 +42,6 @@ struct JsonStruct {
// 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
void fromJsonString(String& str){ void fromJsonString(String& str){
//StaticJsonBuffer<200> jsonBuffer;
DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300)); DynamicJsonBuffer jsonBuffer(JSON_ARRAY_SIZE(300));
JsonObject& json = jsonBuffer.parseObject(str); JsonObject& json = jsonBuffer.parseObject(str);
valid = verifyJsonObject(json); valid = verifyJsonObject(json);
@@ -56,13 +53,6 @@ struct JsonStruct {
void fromFile(const char* path) { void fromFile(const char* path) {
File configFile = SPIFFS.open(path, "r"); File configFile = SPIFFS.open(path, "r");
String cfgFileStr = configFile.readString(); String cfgFileStr = configFile.readString();
// Allocate a buffer to store contents of the file.
//size_t size = configFile.size();
//std::unique_ptr<char[]> buf(new char[size]);
//configFile.readBytes(buf.get(), size);
//StaticJsonBuffer<1024> jsonBuffer;
//JsonObject& json = jsonBuffer.parseObject(buf.get());
DynamicJsonBuffer jsonBuffer; DynamicJsonBuffer jsonBuffer;
JsonObject& json = jsonBuffer.parseObject(cfgFileStr); JsonObject& json = jsonBuffer.parseObject(cfgFileStr);

14
src/Sprocket.cpp
View File

@@ -13,25 +13,13 @@ Sprocket* Sprocket::init(SprocketConfig cfg){
delay(cfg.startupDelay); delay(cfg.startupDelay);
Serial.begin(cfg.serialBaudRate); Serial.begin(cfg.serialBaudRate);
SPIFFS.begin(); SPIFFS.begin();
scheduler = new Scheduler();
return this; return this;
} }
Sprocket* Sprocket::activate() { Sprocket* Sprocket::activate() {
scheduler = new Scheduler();
activatePlugins(scheduler); activatePlugins(scheduler);
return activate(scheduler); return activate(scheduler);
} }
Sprocket* Sprocket::activate(Scheduler* s) {
return this;
}
// TODO check if we want to remove network from sprocket and handle everything via plugins
Sprocket* Sprocket::join(Network& net){
Serial.println("join network");
net.init(scheduler);
net.connect();
network = net;
return activate(scheduler);
}
Sprocket* Sprocket::addTask(Task& tsk){ Sprocket* Sprocket::addTask(Task& tsk){
scheduler->addTask(tsk); scheduler->addTask(tsk);

3
src/Sprocket.h
View File

@@ -37,11 +37,10 @@ class Sprocket : public Mediator {
Sprocket(); Sprocket();
Sprocket(SprocketConfig); Sprocket(SprocketConfig);
Sprocket* init(SprocketConfig); Sprocket* init(SprocketConfig);
Sprocket* join(Network&);
Sprocket* addTask(Task&); Sprocket* addTask(Task&);
virtual void loop(); virtual void loop();
virtual Sprocket* activate(); virtual Sprocket* activate();
virtual Sprocket* activate(Scheduler*); virtual Sprocket* activate(Scheduler*) { return this; };
virtual void dispatch( uint32_t from, String &msg ); virtual void dispatch( uint32_t from, String &msg );
void addPlugin(Plugin* p); void addPlugin(Plugin* p);