mirror of
https://github.com/xoseperez/espurna.git
synced 2026-03-05 07:54:18 +01:00
b8fc8cd1fd
Change the underlying command line handling: - switch to a custom parser, inspired by redis / sds - update terminalRegisterCommand signature, pass only bare minimum - clean-up `help` & `commands`. update settings `set`, `get` and `del` - allow our custom test suite to run command-line tests - clean-up Stream IO to allow us to print large things into debug stream (for example, `eeprom.dump`) - send parsing errors to the debug log As a proof of concept, introduce `TERMINAL_MQTT_SUPPORT` and `TERMINAL_WEB_API_SUPPORT` - MQTT subscribes to the `<root>/cmd/set` and sends response to the `<root>/cmd`. We can't output too much, as we don't have any large-send API. - Web API listens to the `/api/cmd?apikey=...&line=...` (or PUT, params inside the body). This one is intended as a possible replacement of the `API_SUPPORT`. Internals introduce a 'task' around the AsyncWebServerRequest object that will simulate what WiFiClient does and push data into it continuously, switching between CONT and SYS. Both are experimental. We only accept a single command and not every command is updated to use Print `ctx.output` object. We are also somewhat limited by the Print / Stream overall, perhaps I am overestimating the usefulness of Arduino compatibility to such an extent :) Web API handler can also sometimes show only part of the result, whenever the command tries to yield() by itself waiting for something. Perhaps we would need to create a custom request handler for that specific use-case.
111 lines
2.9 KiB
C++
111 lines
2.9 KiB
C++
/*
|
|
|
|
LightFox module
|
|
|
|
Copyright (C) 2019 by Andrey F. Kupreychik <foxle@quickfox.ru>
|
|
|
|
*/
|
|
|
|
#include "lightfox.h"
|
|
|
|
#ifdef FOXEL_LIGHTFOX_DUAL
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// DEFINITIONS
|
|
// -----------------------------------------------------------------------------
|
|
|
|
#define LIGHTFOX_CODE_START 0xA0
|
|
#define LIGHTFOX_CODE_LEARN 0xF1
|
|
#define LIGHTFOX_CODE_CLEAR 0xF2
|
|
#define LIGHTFOX_CODE_STOP 0xA1
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// PUBLIC
|
|
// -----------------------------------------------------------------------------
|
|
|
|
void lightfoxLearn() {
|
|
Serial.write(LIGHTFOX_CODE_START);
|
|
Serial.write(LIGHTFOX_CODE_LEARN);
|
|
Serial.write(0x00);
|
|
Serial.write(LIGHTFOX_CODE_STOP);
|
|
Serial.println();
|
|
Serial.flush();
|
|
DEBUG_MSG_P(PSTR("[LIGHTFOX] Learn comman sent\n"));
|
|
}
|
|
|
|
void lightfoxClear() {
|
|
Serial.write(LIGHTFOX_CODE_START);
|
|
Serial.write(LIGHTFOX_CODE_CLEAR);
|
|
Serial.write(0x00);
|
|
Serial.write(LIGHTFOX_CODE_STOP);
|
|
Serial.println();
|
|
Serial.flush();
|
|
DEBUG_MSG_P(PSTR("[LIGHTFOX] Clear comman sent\n"));
|
|
}
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// WEB
|
|
// -----------------------------------------------------------------------------
|
|
|
|
#if WEB_SUPPORT
|
|
|
|
void _lightfoxWebSocketOnConnected(JsonObject& root) {
|
|
root["lightfoxVisible"] = 1;
|
|
uint8_t buttonsCount = _buttons.size();
|
|
root["lightfoxRelayCount"] = relayCount();
|
|
JsonArray& rfb = root.createNestedArray("lightfoxButtons");
|
|
for (byte id=0; id<buttonsCount; id++) {
|
|
JsonObject& node = rfb.createNestedObject();
|
|
node["id"] = id;
|
|
node["relay"] = getSetting({"btnRelay", id}, 0);
|
|
}
|
|
}
|
|
|
|
void _lightfoxWebSocketOnAction(uint32_t client_id, const char * action, JsonObject& data) {
|
|
if (strcmp(action, "lightfoxLearn") == 0) lightfoxLearn();
|
|
if (strcmp(action, "lightfoxClear") == 0) lightfoxClear();
|
|
}
|
|
|
|
#endif
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// TERMINAL
|
|
// -----------------------------------------------------------------------------
|
|
|
|
#if TERMINAL_SUPPORT
|
|
|
|
void _lightfoxInitCommands() {
|
|
|
|
terminalRegisterCommand(F("LIGHTFOX.LEARN"), [](const terminal::CommandContext&) {
|
|
lightfoxLearn();
|
|
DEBUG_MSG_P(PSTR("+OK\n"));
|
|
});
|
|
|
|
terminalRegisterCommand(F("LIGHTFOX.CLEAR"), [](const terminal::CommandContext&) {
|
|
lightfoxClear();
|
|
DEBUG_MSG_P(PSTR("+OK\n"));
|
|
});
|
|
}
|
|
|
|
#endif
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// SETUP & LOOP
|
|
// -----------------------------------------------------------------------------
|
|
|
|
void lightfoxSetup() {
|
|
|
|
#if WEB_SUPPORT
|
|
wsRegister()
|
|
.onConnected(_lightfoxWebSocketOnConnected)
|
|
.onAction(_lightfoxWebSocketOnAction);
|
|
#endif
|
|
|
|
#if TERMINAL_SUPPORT
|
|
_lightfoxInitCommands();
|
|
#endif
|
|
|
|
}
|
|
|
|
#endif
|