arduino/rc-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

refactor: split logic for incoming and outgoing json #3

Merged
nicu merged 6 commits from gw/optmisation into gateway 2022-10-27 11:05:38 +02:00
Conversation 0 Commits 6 Files Changed 6 +10 -7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 101564bb6a - Show all commits

4
gateway/include/Protocol.h
View File

@ -1,9 +1,9 @@
# pragma once
#pragma once
#include <ArduinoJson.h>
#include <RCSwitch.h>
class Protocol {
protected:
unsigned int protocol;
public:

4
gateway/include/Protocol_1.h
View File

@ -1,4 +1,4 @@
# pragma once
#pragma once
#include "Protocol.h"
#define RC_STATE(value) value & 0x1
@ -21,7 +21,7 @@ public:
void toJson(unsigned long value, JsonDocument& jsonDoc) override {
JsonObject rcSwitch = jsonDoc.createNestedObject("rcSwitch");
rcSwitch["protocol"] = 1;
rcSwitch["protocol"] = protocol;
Decoder decoder;
decoder.decode(value);
rcSwitch["state"] = decoder.state;

9
gateway/include/Protocol_2.h
View File

@ -1,4 +1,4 @@
# pragma once
#pragma once
#include "Protocol.h"
#include "Tiny.h"
@ -23,7 +23,10 @@ public:
break;
}
default:
if (!buildSensorJson(jsonDoc, value)) {
StaticJsonDocument<200> jsonSensor;
if (buildSensorJson(value, jsonSensor)) {
jsonDoc.add(jsonSensor);
} else {
Protocol::toJson(value, jsonDoc);
}
break;
@ -31,7 +34,7 @@ public:
}
private:
bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) {
bool buildSensorJson(unsigned long value, JsonDocument& jsonDoc) {
JsonObject sensor = jsonDoc.createNestedObject("sensor");
sensor["id"] = ID(value);