diff --git a/gateway/include/huzzah.h b/gateway/include/huzzah.h index 431fcba..c800beb 100644 --- a/gateway/include/huzzah.h +++ b/gateway/include/huzzah.h @@ -26,4 +26,10 @@ namespace Board { void loop() { ts.execute(); } + + void publishResponse(JsonDocument& jsonDoc) { + } + + void handleJsonError(JsonDocument& jsonError) { + } } diff --git a/gateway/include/pro-mini.h b/gateway/include/pro-mini.h index aacb484..9283fea 100644 --- a/gateway/include/pro-mini.h +++ b/gateway/include/pro-mini.h @@ -1,4 +1,5 @@ #include +#include "output.h" #define RESET_PIN 10 #define SEND_PIN 11 @@ -10,6 +11,7 @@ namespace Board { void setup() { digitalWrite(RESET_PIN, HIGH); pinMode(RESET_PIN, OUTPUT); + Serial.begin(9600); } void readCommand() { @@ -28,4 +30,14 @@ namespace Board { void loop() { readCommand(); } + + void publishResponse(JsonDocument& jsonDoc) { + serializeJson(jsonDoc, Serial); + Serial.println(); + } + + void handleJsonError(JsonDocument& jsonError) { + serializeJson(jsonError, Serial); + Serial.println(); + } } diff --git a/gateway/src/gateway.cpp b/gateway/src/gateway.cpp index b728d12..7bd20e4 100644 --- a/gateway/src/gateway.cpp +++ b/gateway/src/gateway.cpp @@ -3,7 +3,6 @@ #include "Dht.h" #include "Protocol_1.h" #include "Protocol_2.h" -#include "output.h" RCSwitch mySwitch; void runJsonCommand(char* cmd); @@ -16,8 +15,6 @@ void runJsonCommand(char* cmd); void setup() { - Serial.begin(9600); - mySwitch.enableReceive(digitalPinToInterrupt(RECEIVE_PIN)); mySwitch.enableTransmit(SEND_PIN); mySwitch.setRepeatTransmit(10); @@ -55,8 +52,7 @@ void readRcSwitch() { p->toJson(value, jsonDoc); delete p; if (!jsonDoc.isNull()) { - serializeJson(jsonDoc, Serial); - Serial.println(); + Board::publishResponse(jsonDoc); } #endif } @@ -67,8 +63,7 @@ void handleJsonError(DeserializationError err, const char* cmd) { JsonObject error = jsonError.createNestedObject("error"); error["msg"] = err.c_str(); error["orig_cmd"] = cmd; - serializeJson(jsonError, Serial); - Serial.println(); + Board::handleJsonError(jsonError); } void runJsonCommand(char* cmd) { @@ -80,8 +75,7 @@ void runJsonCommand(char* cmd) { Protocol* p = findProtocol(rcSwitch["protocol"]); p->fromJson(rcSwitch, mySwitch); delete p; - serializeJson(jsonDoc, Serial); - Serial.println(); + Board::publishResponse(jsonDoc); } } else { handleJsonError(err, cmd);