feat: services (#2)
This commit is contained in:
@@ -7,6 +7,12 @@
|
||||
#include "ApiServer.h"
|
||||
#include "TaskManager.h"
|
||||
|
||||
// Services
|
||||
#include "services/NodeService.h"
|
||||
#include "services/NetworkService.h"
|
||||
#include "services/ClusterService.h"
|
||||
#include "services/TaskService.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
NodeContext ctx({
|
||||
@@ -18,6 +24,12 @@ TaskManager taskManager(ctx);
|
||||
ClusterManager cluster(ctx, taskManager);
|
||||
ApiServer apiServer(ctx, taskManager, ctx.config.api_server_port);
|
||||
|
||||
// Create services
|
||||
NodeService nodeService(ctx);
|
||||
NetworkService networkService(network);
|
||||
ClusterService clusterService(ctx);
|
||||
TaskService taskService(taskManager);
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
|
||||
@@ -27,7 +39,11 @@ void setup() {
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
// Start the API server
|
||||
// Register services and start API server
|
||||
apiServer.addService(nodeService);
|
||||
apiServer.addService(networkService);
|
||||
apiServer.addService(clusterService);
|
||||
apiServer.addService(taskService);
|
||||
apiServer.begin();
|
||||
|
||||
// Print initial task status
|
||||
|
||||
470
examples/neopattern/NeoPattern.cpp
Normal file
470
examples/neopattern/NeoPattern.cpp
Normal file
@@ -0,0 +1,470 @@
|
||||
/**
|
||||
* Original NeoPattern code by Bill Earl
|
||||
* https://learn.adafruit.com/multi-tasking-the-arduino-part-3/overview
|
||||
*
|
||||
* TODO
|
||||
* - cleanup the mess
|
||||
* - fnc table for patterns to replace switch case
|
||||
*
|
||||
* Custom modifications by 0x1d:
|
||||
* - default OnComplete callback that sets pattern to reverse
|
||||
* - separate animation update from timer; Update now updates directly, UpdateScheduled uses timer
|
||||
*/
|
||||
#ifndef __NeoPattern_INCLUDED__
|
||||
#define __NeoPattern_INCLUDED__
|
||||
|
||||
#include <Adafruit_NeoPixel.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
// Pattern types supported:
|
||||
enum pattern
|
||||
{
|
||||
NONE = 0,
|
||||
RAINBOW_CYCLE = 1,
|
||||
THEATER_CHASE = 2,
|
||||
COLOR_WIPE = 3,
|
||||
SCANNER = 4,
|
||||
FADE = 5,
|
||||
FIRE = 6
|
||||
};
|
||||
// Patern directions supported:
|
||||
enum direction
|
||||
{
|
||||
FORWARD,
|
||||
REVERSE
|
||||
};
|
||||
|
||||
// NeoPattern Class - derived from the Adafruit_NeoPixel class
|
||||
class NeoPattern : public Adafruit_NeoPixel
|
||||
{
|
||||
public:
|
||||
// Member Variables:
|
||||
pattern ActivePattern = RAINBOW_CYCLE; // which pattern is running
|
||||
direction Direction = FORWARD; // direction to run the pattern
|
||||
|
||||
unsigned long Interval = 150; // milliseconds between updates
|
||||
unsigned long lastUpdate = 0; // last update of position
|
||||
|
||||
uint32_t Color1 = 0;
|
||||
uint32_t Color2 = 0; // What colors are in use
|
||||
uint16_t TotalSteps = 32; // total number of steps in the pattern
|
||||
uint16_t Index; // current step within the pattern
|
||||
uint16_t completed = 0;
|
||||
|
||||
// FIXME return current NeoPatternState
|
||||
void (*OnComplete)(int); // Callback on completion of pattern
|
||||
|
||||
uint8_t *frameBuffer;
|
||||
int bufferSize = 0;
|
||||
|
||||
// Constructor - calls base-class constructor to initialize strip
|
||||
NeoPattern(uint16_t pixels, uint8_t pin, uint8_t type, void (*callback)(int))
|
||||
: Adafruit_NeoPixel(pixels, pin, type)
|
||||
{
|
||||
frameBuffer = (uint8_t *)malloc(768);
|
||||
OnComplete = callback;
|
||||
TotalSteps = numPixels();
|
||||
begin();
|
||||
}
|
||||
|
||||
NeoPattern(uint16_t pixels, uint8_t pin, uint8_t type)
|
||||
: Adafruit_NeoPixel(pixels, pin, type)
|
||||
{
|
||||
frameBuffer = (uint8_t *)malloc(768);
|
||||
TotalSteps = numPixels();
|
||||
begin();
|
||||
}
|
||||
|
||||
void handleStream(uint8_t *data, size_t len)
|
||||
{
|
||||
//const uint16_t *data16 = (uint16_t *)data;
|
||||
bufferSize = len;
|
||||
memcpy(frameBuffer, data, len);
|
||||
}
|
||||
|
||||
void drawFrameBuffer(int w, uint8_t *frame, int length)
|
||||
{
|
||||
for (int i = 0; i < length; i++)
|
||||
{
|
||||
uint8_t r = frame[i];
|
||||
uint8_t g = frame[i + 1];
|
||||
uint8_t b = frame[i + 2];
|
||||
setPixelColor(i, r, g, b);
|
||||
}
|
||||
}
|
||||
|
||||
void onCompleteDefault(int pixels)
|
||||
{
|
||||
//Serial.println("onCompleteDefault");
|
||||
// FIXME no specific code
|
||||
if (ActivePattern == THEATER_CHASE)
|
||||
{
|
||||
return;
|
||||
}
|
||||
Reverse();
|
||||
//Serial.println("pattern completed");
|
||||
}
|
||||
|
||||
// Update the pattern
|
||||
void Update()
|
||||
{
|
||||
switch (ActivePattern)
|
||||
{
|
||||
case RAINBOW_CYCLE:
|
||||
RainbowCycleUpdate();
|
||||
break;
|
||||
case THEATER_CHASE:
|
||||
TheaterChaseUpdate();
|
||||
break;
|
||||
case COLOR_WIPE:
|
||||
ColorWipeUpdate();
|
||||
break;
|
||||
case SCANNER:
|
||||
ScannerUpdate();
|
||||
break;
|
||||
case FADE:
|
||||
FadeUpdate();
|
||||
break;
|
||||
case FIRE:
|
||||
Fire(50, 120);
|
||||
break;
|
||||
default:
|
||||
if (bufferSize > 0)
|
||||
{
|
||||
drawFrameBuffer(TotalSteps, frameBuffer, bufferSize);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateScheduled()
|
||||
{
|
||||
if ((millis() - lastUpdate) > Interval) // time to update
|
||||
{
|
||||
lastUpdate = millis();
|
||||
Update();
|
||||
}
|
||||
}
|
||||
|
||||
// Increment the Index and reset at the end
|
||||
void Increment()
|
||||
{
|
||||
completed = 0;
|
||||
if (Direction == FORWARD)
|
||||
{
|
||||
Index++;
|
||||
if (Index >= TotalSteps)
|
||||
{
|
||||
Index = 0;
|
||||
completed = 1;
|
||||
if (OnComplete != NULL)
|
||||
{
|
||||
OnComplete(numPixels()); // call the comlpetion callback
|
||||
}
|
||||
else
|
||||
{
|
||||
onCompleteDefault(numPixels());
|
||||
}
|
||||
}
|
||||
}
|
||||
else // Direction == REVERSE
|
||||
{
|
||||
--Index;
|
||||
if (Index <= 0)
|
||||
{
|
||||
Index = TotalSteps - 1;
|
||||
completed = 1;
|
||||
if (OnComplete != NULL)
|
||||
{
|
||||
OnComplete(numPixels()); // call the comlpetion callback
|
||||
}
|
||||
else
|
||||
{
|
||||
onCompleteDefault(numPixels());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reverse pattern direction
|
||||
void Reverse()
|
||||
{
|
||||
if (Direction == FORWARD)
|
||||
{
|
||||
Direction = REVERSE;
|
||||
Index = TotalSteps - 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
Direction = FORWARD;
|
||||
Index = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize for a RainbowCycle
|
||||
void RainbowCycle(uint8_t interval, direction dir = FORWARD)
|
||||
{
|
||||
ActivePattern = RAINBOW_CYCLE;
|
||||
Interval = interval;
|
||||
TotalSteps = 255;
|
||||
Index = 0;
|
||||
Direction = dir;
|
||||
}
|
||||
|
||||
// Update the Rainbow Cycle Pattern
|
||||
void RainbowCycleUpdate()
|
||||
{
|
||||
for (int i = 0; i < numPixels(); i++)
|
||||
{
|
||||
setPixelColor(i, Wheel(((i * 256 / numPixels()) + Index) & 255));
|
||||
}
|
||||
show();
|
||||
Increment();
|
||||
}
|
||||
|
||||
// Initialize for a Theater Chase
|
||||
void TheaterChase(uint32_t color1, uint32_t color2, uint16_t interval, direction dir = FORWARD)
|
||||
{
|
||||
ActivePattern = THEATER_CHASE;
|
||||
Interval = interval;
|
||||
TotalSteps = numPixels();
|
||||
Color1 = color1;
|
||||
Color2 = color2;
|
||||
Index = 0;
|
||||
Direction = dir;
|
||||
}
|
||||
|
||||
// Update the Theater Chase Pattern
|
||||
void TheaterChaseUpdate()
|
||||
{
|
||||
for (int i = 0; i < numPixels(); i++)
|
||||
{
|
||||
if ((i + Index) % 3 == 0)
|
||||
{
|
||||
setPixelColor(i, Color1);
|
||||
}
|
||||
else
|
||||
{
|
||||
setPixelColor(i, Color2);
|
||||
}
|
||||
}
|
||||
show();
|
||||
Increment();
|
||||
}
|
||||
|
||||
// Initialize for a ColorWipe
|
||||
void ColorWipe(uint32_t color, uint8_t interval, direction dir = FORWARD)
|
||||
{
|
||||
ActivePattern = COLOR_WIPE;
|
||||
Interval = interval;
|
||||
TotalSteps = numPixels();
|
||||
Color1 = color;
|
||||
Index = 0;
|
||||
Direction = dir;
|
||||
}
|
||||
|
||||
// Update the Color Wipe Pattern
|
||||
void ColorWipeUpdate()
|
||||
{
|
||||
setPixelColor(Index, Color1);
|
||||
show();
|
||||
Increment();
|
||||
}
|
||||
|
||||
// Initialize for a SCANNNER
|
||||
void Scanner(uint32_t color1, uint8_t interval)
|
||||
{
|
||||
ActivePattern = SCANNER;
|
||||
Interval = interval;
|
||||
TotalSteps = (numPixels() - 1) * 2;
|
||||
Color1 = color1;
|
||||
Index = 0;
|
||||
}
|
||||
|
||||
// Update the Scanner Pattern
|
||||
void ScannerUpdate()
|
||||
{
|
||||
for (int i = 0; i < numPixels(); i++)
|
||||
{
|
||||
if (i == Index) // Scan Pixel to the right
|
||||
{
|
||||
setPixelColor(i, Color1);
|
||||
}
|
||||
else if (i == TotalSteps - Index) // Scan Pixel to the left
|
||||
{
|
||||
setPixelColor(i, Color1);
|
||||
}
|
||||
else // Fading tail
|
||||
{
|
||||
setPixelColor(i, DimColor(getPixelColor(i)));
|
||||
}
|
||||
}
|
||||
show();
|
||||
Increment();
|
||||
}
|
||||
|
||||
// Initialize for a Fade
|
||||
void Fade(uint32_t color1, uint32_t color2, uint16_t steps, uint8_t interval, direction dir = FORWARD)
|
||||
{
|
||||
ActivePattern = FADE;
|
||||
Interval = interval;
|
||||
TotalSteps = steps;
|
||||
Color1 = color1;
|
||||
Color2 = color2;
|
||||
Index = 0;
|
||||
Direction = dir;
|
||||
}
|
||||
|
||||
// Update the Fade Pattern
|
||||
void FadeUpdate()
|
||||
{
|
||||
// Calculate linear interpolation between Color1 and Color2
|
||||
// Optimise order of operations to minimize truncation error
|
||||
uint8_t red = ((Red(Color1) * (TotalSteps - Index)) + (Red(Color2) * Index)) / TotalSteps;
|
||||
uint8_t green = ((Green(Color1) * (TotalSteps - Index)) + (Green(Color2) * Index)) / TotalSteps;
|
||||
uint8_t blue = ((Blue(Color1) * (TotalSteps - Index)) + (Blue(Color2) * Index)) / TotalSteps;
|
||||
|
||||
ColorSet(Color(red, green, blue));
|
||||
show();
|
||||
Increment();
|
||||
}
|
||||
|
||||
// Calculate 50% dimmed version of a color (used by ScannerUpdate)
|
||||
uint32_t DimColor(uint32_t color)
|
||||
{
|
||||
// Shift R, G and B components one bit to the right
|
||||
uint32_t dimColor = Color(Red(color) >> 1, Green(color) >> 1, Blue(color) >> 1);
|
||||
return dimColor;
|
||||
}
|
||||
|
||||
// Set all pixels to a color (synchronously)
|
||||
void ColorSet(uint32_t color)
|
||||
{
|
||||
for (int i = 0; i < numPixels(); i++)
|
||||
{
|
||||
setPixelColor(i, color);
|
||||
}
|
||||
show();
|
||||
}
|
||||
|
||||
// Returns the Red component of a 32-bit color
|
||||
uint8_t Red(uint32_t color)
|
||||
{
|
||||
return (color >> 16) & 0xFF;
|
||||
}
|
||||
|
||||
// Returns the Green component of a 32-bit color
|
||||
uint8_t Green(uint32_t color)
|
||||
{
|
||||
return (color >> 8) & 0xFF;
|
||||
}
|
||||
|
||||
// Returns the Blue component of a 32-bit color
|
||||
uint8_t Blue(uint32_t color)
|
||||
{
|
||||
return color & 0xFF;
|
||||
}
|
||||
|
||||
// Input a value 0 to 255 to get a color value.
|
||||
// The colours are a transition r - g - b - back to r.
|
||||
uint32_t Wheel(uint8_t WheelPos)
|
||||
{
|
||||
//if(WheelPos == 0) return Color(0,0,0);
|
||||
WheelPos = 255 - WheelPos;
|
||||
if (WheelPos < 85)
|
||||
{
|
||||
return Color(255 - WheelPos * 3, 0, WheelPos * 3);
|
||||
}
|
||||
else if (WheelPos < 170)
|
||||
{
|
||||
WheelPos -= 85;
|
||||
return Color(0, WheelPos * 3, 255 - WheelPos * 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
WheelPos -= 170;
|
||||
return Color(WheelPos * 3, 255 - WheelPos * 3, 0);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Effects from https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
|
||||
*/
|
||||
void Fire(int Cooling, int Sparking)
|
||||
{
|
||||
uint8_t heat[numPixels()];
|
||||
int cooldown;
|
||||
|
||||
// Step 1. Cool down every cell a little
|
||||
for (int i = 0; i < numPixels(); i++)
|
||||
{
|
||||
cooldown = random(0, ((Cooling * 10) / numPixels()) + 2);
|
||||
|
||||
if (cooldown > heat[i])
|
||||
{
|
||||
heat[i] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
heat[i] = heat[i] - cooldown;
|
||||
}
|
||||
}
|
||||
|
||||
// Step 2. Heat from each cell drifts 'up' and diffuses a little
|
||||
for (int k = numPixels() - 1; k >= 2; k--)
|
||||
{
|
||||
heat[k] = (heat[k - 1] + heat[k - 2] + heat[k - 2]) / 3;
|
||||
}
|
||||
|
||||
// Step 3. Randomly ignite new 'sparks' near the bottom
|
||||
if (random(255) < Sparking)
|
||||
{
|
||||
int y = random(7);
|
||||
heat[y] = heat[y] + random(160, 255);
|
||||
//heat[y] = random(160,255);
|
||||
}
|
||||
|
||||
// Step 4. Convert heat to LED colors
|
||||
for (int j = 0; j < numPixels(); j++)
|
||||
{
|
||||
setPixelHeatColor(j, heat[j]);
|
||||
}
|
||||
|
||||
showStrip();
|
||||
}
|
||||
|
||||
void setPixelHeatColor(int Pixel, uint8_t temperature)
|
||||
{
|
||||
// Scale 'heat' down from 0-255 to 0-191
|
||||
uint8_t t192 = round((temperature / 255.0) * 191);
|
||||
|
||||
// calculate ramp up from
|
||||
uint8_t heatramp = t192 & 0x3F; // 0..63
|
||||
heatramp <<= 2; // scale up to 0..252
|
||||
|
||||
// figure out which third of the spectrum we're in:
|
||||
if (t192 > 0x80)
|
||||
{ // hottest
|
||||
setPixel(Pixel, 255, 255, heatramp);
|
||||
}
|
||||
else if (t192 > 0x40)
|
||||
{ // middle
|
||||
setPixel(Pixel, 255, heatramp, 0);
|
||||
}
|
||||
else
|
||||
{ // coolest
|
||||
setPixel(Pixel, heatramp, 0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void setPixel(int Pixel, uint8_t red, uint8_t green, uint8_t blue)
|
||||
{
|
||||
setPixelColor(Pixel, Color(red, green, blue));
|
||||
}
|
||||
void showStrip()
|
||||
{
|
||||
show();
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
187
examples/neopattern/NeoPatternService.cpp
Normal file
187
examples/neopattern/NeoPatternService.cpp
Normal file
@@ -0,0 +1,187 @@
|
||||
#include "NeoPatternService.h"
|
||||
#include "ApiServer.h"
|
||||
|
||||
NeoPatternService::NeoPatternService(TaskManager& taskMgr, uint16_t numPixels, uint8_t pin, uint8_t type)
|
||||
: taskManager(taskMgr),
|
||||
pixels(numPixels, pin, type),
|
||||
updateIntervalMs(100),
|
||||
brightness(48) {
|
||||
pixels.setBrightness(brightness);
|
||||
pixels.show();
|
||||
|
||||
registerTasks();
|
||||
setPatternByName("rainbow_cycle");
|
||||
}
|
||||
|
||||
void NeoPatternService::registerEndpoints(ApiServer& api) {
|
||||
api.addEndpoint("/api/neopattern/status", HTTP_GET,
|
||||
[this](AsyncWebServerRequest* request) { handleStatusRequest(request); },
|
||||
std::vector<ParamSpec>{});
|
||||
|
||||
api.addEndpoint("/api/neopattern/patterns", HTTP_GET,
|
||||
[this](AsyncWebServerRequest* request) { handlePatternsRequest(request); },
|
||||
std::vector<ParamSpec>{});
|
||||
|
||||
api.addEndpoint("/api/neopattern", HTTP_POST,
|
||||
[this](AsyncWebServerRequest* request) { handleControlRequest(request); },
|
||||
std::vector<ParamSpec>{
|
||||
ParamSpec{String("pattern"), false, String("body"), String("string"), patternNamesVector()},
|
||||
ParamSpec{String("interval_ms"), false, String("body"), String("number"), {}, String("100")},
|
||||
ParamSpec{String("brightness"), false, String("body"), String("number"), {}, String("50")},
|
||||
ParamSpec{String("color"), false, String("body"), String("color"), {}},
|
||||
ParamSpec{String("color2"), false, String("body"), String("color"), {}},
|
||||
ParamSpec{String("r"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("g"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("b"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("r2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("g2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("b2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("total_steps"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("direction"), false, String("body"), String("string"), {String("forward"), String("reverse")}}
|
||||
});
|
||||
}
|
||||
|
||||
void NeoPatternService::handleStatusRequest(AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
doc["pin"] = pixels.getPin();
|
||||
doc["count"] = pixels.numPixels();
|
||||
doc["interval_ms"] = updateIntervalMs;
|
||||
doc["brightness"] = brightness;
|
||||
doc["pattern"] = currentPatternName();
|
||||
doc["total_steps"] = pixels.TotalSteps;
|
||||
doc["color1"] = pixels.Color1;
|
||||
doc["color2"] = pixels.Color2;
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPatternService::handlePatternsRequest(AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
JsonArray arr = doc.to<JsonArray>();
|
||||
for (auto& kv : patternSetters) arr.add(kv.first);
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPatternService::handleControlRequest(AsyncWebServerRequest* request) {
|
||||
if (request->hasParam("pattern", true)) {
|
||||
String name = request->getParam("pattern", true)->value();
|
||||
setPatternByName(name);
|
||||
}
|
||||
|
||||
if (request->hasParam("interval_ms", true)) {
|
||||
unsigned long v = request->getParam("interval_ms", true)->value().toInt();
|
||||
if (v < 1) v = 1;
|
||||
updateIntervalMs = v;
|
||||
taskManager.setTaskInterval("neopattern_update", updateIntervalMs);
|
||||
}
|
||||
|
||||
if (request->hasParam("brightness", true)) {
|
||||
int b = request->getParam("brightness", true)->value().toInt();
|
||||
if (b < 0) b = 0; if (b > 255) b = 255;
|
||||
setBrightness((uint8_t)b);
|
||||
}
|
||||
|
||||
// Accept packed color ints or r,g,b triplets
|
||||
if (request->hasParam("color", true)) {
|
||||
pixels.Color1 = (uint32_t)strtoul(request->getParam("color", true)->value().c_str(), nullptr, 0);
|
||||
}
|
||||
if (request->hasParam("color2", true)) {
|
||||
pixels.Color2 = (uint32_t)strtoul(request->getParam("color2", true)->value().c_str(), nullptr, 0);
|
||||
}
|
||||
if (request->hasParam("r", true) || request->hasParam("g", true) || request->hasParam("b", true)) {
|
||||
int r = request->hasParam("r", true) ? request->getParam("r", true)->value().toInt() : 0;
|
||||
int g = request->hasParam("g", true) ? request->getParam("g", true)->value().toInt() : 0;
|
||||
int b = request->hasParam("b", true) ? request->getParam("b", true)->value().toInt() : 0;
|
||||
pixels.Color1 = pixels.Color(r, g, b);
|
||||
}
|
||||
if (request->hasParam("r2", true) || request->hasParam("g2", true) || request->hasParam("b2", true)) {
|
||||
int r = request->hasParam("r2", true) ? request->getParam("r2", true)->value().toInt() : 0;
|
||||
int g = request->hasParam("g2", true) ? request->getParam("g2", true)->value().toInt() : 0;
|
||||
int b = request->hasParam("b2", true) ? request->getParam("b2", true)->value().toInt() : 0;
|
||||
pixels.Color2 = pixels.Color(r, g, b);
|
||||
}
|
||||
|
||||
if (request->hasParam("total_steps", true)) {
|
||||
pixels.TotalSteps = request->getParam("total_steps", true)->value().toInt();
|
||||
}
|
||||
|
||||
if (request->hasParam("direction", true)) {
|
||||
String dir = request->getParam("direction", true)->value();
|
||||
if (dir.equalsIgnoreCase("forward")) pixels.Direction = FORWARD;
|
||||
else if (dir.equalsIgnoreCase("reverse")) pixels.Direction = REVERSE;
|
||||
}
|
||||
|
||||
JsonDocument resp;
|
||||
resp["ok"] = true;
|
||||
resp["pattern"] = currentPatternName();
|
||||
resp["interval_ms"] = updateIntervalMs;
|
||||
resp["brightness"] = brightness;
|
||||
|
||||
String json;
|
||||
serializeJson(resp, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPatternService::setBrightness(uint8_t b) {
|
||||
brightness = b;
|
||||
pixels.setBrightness(brightness);
|
||||
pixels.show();
|
||||
}
|
||||
|
||||
void NeoPatternService::registerTasks() {
|
||||
taskManager.registerTask("neopattern_update", updateIntervalMs, [this]() { update(); });
|
||||
taskManager.registerTask("neopattern_status_print", 10000, [this]() {
|
||||
Serial.printf("[NeoPattern] pattern=%s interval=%lu ms brightness=%u\n",
|
||||
currentPatternName().c_str(), updateIntervalMs, brightness);
|
||||
});
|
||||
}
|
||||
|
||||
void NeoPatternService::registerPatterns() {
|
||||
patternSetters["off"] = [this]() { pixels.ActivePattern = NONE; };
|
||||
patternSetters["rainbow_cycle"] = [this]() { pixels.RainbowCycle(updateIntervalMs); };
|
||||
patternSetters["theater_chase"] = [this]() { pixels.TheaterChase(pixels.Color1 ? pixels.Color1 : pixels.Color(127,127,127), pixels.Color2, updateIntervalMs); };
|
||||
patternSetters["color_wipe"] = [this]() { pixels.ColorWipe(pixels.Color1 ? pixels.Color1 : pixels.Color(255,0,0), updateIntervalMs); };
|
||||
patternSetters["scanner"] = [this]() { pixels.Scanner(pixels.Color1 ? pixels.Color1 : pixels.Color(0,0,255), updateIntervalMs); };
|
||||
patternSetters["fade"] = [this]() { pixels.Fade(pixels.Color1, pixels.Color2, pixels.TotalSteps ? pixels.TotalSteps : 32, updateIntervalMs); };
|
||||
patternSetters["fire"] = [this]() { pixels.ActivePattern = FIRE; pixels.Interval = updateIntervalMs; };
|
||||
}
|
||||
|
||||
std::vector<String> NeoPatternService::patternNamesVector() {
|
||||
if (patternSetters.empty()) registerPatterns();
|
||||
std::vector<String> v;
|
||||
v.reserve(patternSetters.size());
|
||||
for (const auto& kv : patternSetters) v.push_back(kv.first);
|
||||
return v;
|
||||
}
|
||||
|
||||
String NeoPatternService::currentPatternName() {
|
||||
switch (pixels.ActivePattern) {
|
||||
case NONE: return String("off");
|
||||
case RAINBOW_CYCLE: return String("rainbow_cycle");
|
||||
case THEATER_CHASE: return String("theater_chase");
|
||||
case COLOR_WIPE: return String("color_wipe");
|
||||
case SCANNER: return String("scanner");
|
||||
case FADE: return String("fade");
|
||||
case FIRE: return String("fire");
|
||||
}
|
||||
return String("off");
|
||||
}
|
||||
|
||||
void NeoPatternService::setPatternByName(const String& name) {
|
||||
if (patternSetters.empty()) registerPatterns();
|
||||
auto it = patternSetters.find(name);
|
||||
if (it != patternSetters.end()) {
|
||||
pixels.Index = 0;
|
||||
pixels.Direction = FORWARD;
|
||||
it->second();
|
||||
}
|
||||
}
|
||||
|
||||
void NeoPatternService::update() {
|
||||
pixels.Update();
|
||||
}
|
||||
34
examples/neopattern/NeoPatternService.h
Normal file
34
examples/neopattern/NeoPatternService.h
Normal file
@@ -0,0 +1,34 @@
|
||||
#pragma once
|
||||
#include "services/Service.h"
|
||||
#include "TaskManager.h"
|
||||
#include "NeoPattern.cpp"
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
class NeoPatternService : public Service {
|
||||
public:
|
||||
NeoPatternService(TaskManager& taskMgr, uint16_t numPixels, uint8_t pin, uint8_t type);
|
||||
void registerEndpoints(ApiServer& api) override;
|
||||
const char* getName() const override { return "NeoPattern"; }
|
||||
|
||||
void setBrightness(uint8_t b);
|
||||
void setPatternByName(const String& name);
|
||||
|
||||
private:
|
||||
void registerTasks();
|
||||
void registerPatterns();
|
||||
std::vector<String> patternNamesVector();
|
||||
String currentPatternName();
|
||||
void update();
|
||||
|
||||
// Handlers
|
||||
void handleStatusRequest(AsyncWebServerRequest* request);
|
||||
void handlePatternsRequest(AsyncWebServerRequest* request);
|
||||
void handleControlRequest(AsyncWebServerRequest* request);
|
||||
|
||||
TaskManager& taskManager;
|
||||
NeoPattern pixels;
|
||||
unsigned long updateIntervalMs;
|
||||
uint8_t brightness;
|
||||
std::map<String, std::function<void()>> patternSetters;
|
||||
};
|
||||
31
examples/neopattern/config.h
Normal file
31
examples/neopattern/config.h
Normal file
@@ -0,0 +1,31 @@
|
||||
#ifndef __DEVICE_CONFIG__
|
||||
#define __DEVICE_CONFIG__
|
||||
|
||||
// Scheduler config
|
||||
#define _TASK_SLEEP_ON_IDLE_RUN
|
||||
#define _TASK_STD_FUNCTION
|
||||
#define _TASK_PRIORITY
|
||||
|
||||
// Chip config
|
||||
#define SPROCKET_TYPE "SPROCKET"
|
||||
#define SERIAL_BAUD_RATE 115200
|
||||
#define STARTUP_DELAY 1000
|
||||
|
||||
// network config
|
||||
#define SPROCKET_MODE 1
|
||||
#define WIFI_CHANNEL 11
|
||||
#define AP_SSID "sprocket"
|
||||
#define AP_PASSWORD "th3r31sn0sp00n"
|
||||
#define STATION_SSID "MyAP"
|
||||
#define STATION_PASSWORD "th3r31sn0sp00n"
|
||||
#define HOSTNAME "sprocket"
|
||||
#define CONNECT_TIMEOUT 10000
|
||||
|
||||
// NeoPixel conig
|
||||
#define LED_STRIP_PIN D2
|
||||
#define LED_STRIP_LENGTH 8
|
||||
#define LED_STRIP_BRIGHTNESS 48
|
||||
#define LED_STRIP_UPDATE_INTERVAL 200
|
||||
#define LED_STRIP_DEFAULT_COLOR 100
|
||||
|
||||
#endif
|
||||
71
examples/neopattern/main.cpp
Normal file
71
examples/neopattern/main.cpp
Normal file
@@ -0,0 +1,71 @@
|
||||
#include <Arduino.h>
|
||||
#include <functional>
|
||||
#include "Globals.h"
|
||||
#include "NodeContext.h"
|
||||
#include "NetworkManager.h"
|
||||
#include "ClusterManager.h"
|
||||
#include "ApiServer.h"
|
||||
#include "TaskManager.h"
|
||||
|
||||
// Services
|
||||
#include "services/NodeService.h"
|
||||
#include "services/NetworkService.h"
|
||||
#include "services/ClusterService.h"
|
||||
#include "services/TaskService.h"
|
||||
#include "NeoPatternService.h"
|
||||
|
||||
#ifndef LED_STRIP_PIN
|
||||
#define LED_STRIP_PIN 2
|
||||
#endif
|
||||
|
||||
#ifndef LED_STRIP_LENGTH
|
||||
#define LED_STRIP_LENGTH 8
|
||||
#endif
|
||||
|
||||
#ifndef LED_STRIP_TYPE
|
||||
#define LED_STRIP_TYPE (NEO_GRB + NEO_KHZ800)
|
||||
#endif
|
||||
|
||||
NodeContext ctx({
|
||||
{"app", "neopattern"},
|
||||
{"device", "light"},
|
||||
{"pixels", String(LED_STRIP_LENGTH)},
|
||||
{"pin", String(LED_STRIP_PIN)}
|
||||
});
|
||||
NetworkManager network(ctx);
|
||||
TaskManager taskManager(ctx);
|
||||
ClusterManager cluster(ctx, taskManager);
|
||||
ApiServer apiServer(ctx, taskManager, ctx.config.api_server_port);
|
||||
|
||||
// Create services
|
||||
NodeService nodeService(ctx);
|
||||
NetworkService networkService(network);
|
||||
ClusterService clusterService(ctx);
|
||||
TaskService taskService(taskManager);
|
||||
NeoPatternService neoPatternService(taskManager, LED_STRIP_LENGTH, LED_STRIP_PIN, LED_STRIP_TYPE);
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
|
||||
// Setup WiFi first
|
||||
network.setupWiFi();
|
||||
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
// Register services and start API server
|
||||
apiServer.addService(nodeService);
|
||||
apiServer.addService(networkService);
|
||||
apiServer.addService(clusterService);
|
||||
apiServer.addService(taskService);
|
||||
apiServer.addService(neoPatternService);
|
||||
apiServer.begin();
|
||||
|
||||
// Print initial task status
|
||||
taskManager.printTaskStatus();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
taskManager.execute();
|
||||
yield();
|
||||
}
|
||||
291
examples/neopixel/NeoPixelService.cpp
Normal file
291
examples/neopixel/NeoPixelService.cpp
Normal file
@@ -0,0 +1,291 @@
|
||||
#include "NeoPixelService.h"
|
||||
#include "ApiServer.h"
|
||||
|
||||
// Wheel helper: map 0-255 to RGB rainbow
|
||||
static uint32_t colorWheel(Adafruit_NeoPixel& strip, uint8_t pos) {
|
||||
pos = 255 - pos;
|
||||
if (pos < 85) {
|
||||
return strip.Color(255 - pos * 3, 0, pos * 3);
|
||||
}
|
||||
if (pos < 170) {
|
||||
pos -= 85;
|
||||
return strip.Color(0, pos * 3, 255 - pos * 3);
|
||||
}
|
||||
pos -= 170;
|
||||
return strip.Color(pos * 3, 255 - pos * 3, 0);
|
||||
}
|
||||
|
||||
NeoPixelService::NeoPixelService(TaskManager& taskMgr, uint16_t numPixels, uint8_t pin, neoPixelType type)
|
||||
: taskManager(taskMgr),
|
||||
strip(numPixels, pin, type),
|
||||
currentPattern(Pattern::Off),
|
||||
updateIntervalMs(20),
|
||||
lastUpdateMs(0),
|
||||
wipeIndex(0),
|
||||
wipeColor(strip.Color(255, 0, 0)),
|
||||
rainbowJ(0),
|
||||
cycleJ(0),
|
||||
chaseJ(0),
|
||||
chaseQ(0),
|
||||
chasePhaseOn(true),
|
||||
chaseColor(strip.Color(127, 127, 127)),
|
||||
brightness(50) {
|
||||
strip.begin();
|
||||
strip.setBrightness(brightness);
|
||||
strip.show();
|
||||
|
||||
registerPatterns();
|
||||
registerTasks();
|
||||
}
|
||||
|
||||
void NeoPixelService::registerEndpoints(ApiServer& api) {
|
||||
api.addEndpoint("/api/neopixel/status", HTTP_GET,
|
||||
[this](AsyncWebServerRequest* request) { handleStatusRequest(request); },
|
||||
std::vector<ParamSpec>{});
|
||||
|
||||
api.addEndpoint("/api/neopixel/patterns", HTTP_GET,
|
||||
[this](AsyncWebServerRequest* request) { handlePatternsRequest(request); },
|
||||
std::vector<ParamSpec>{});
|
||||
|
||||
api.addEndpoint("/api/neopixel", HTTP_POST,
|
||||
[this](AsyncWebServerRequest* request) { handleControlRequest(request); },
|
||||
std::vector<ParamSpec>{
|
||||
ParamSpec{String("pattern"), false, String("body"), String("string"), patternNamesVector()},
|
||||
ParamSpec{String("interval_ms"), false, String("body"), String("number"), {}, String("100")},
|
||||
ParamSpec{String("brightness"), false, String("body"), String("number"), {}, String("50")},
|
||||
ParamSpec{String("color"), false, String("body"), String("color"), {}},
|
||||
ParamSpec{String("color2"), false, String("body"), String("color"), {}},
|
||||
ParamSpec{String("r"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("g"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("b"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("r2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("g2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("b2"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("total_steps"), false, String("body"), String("number"), {}},
|
||||
ParamSpec{String("direction"), false, String("body"), String("string"), {String("forward"), String("reverse")}}
|
||||
});
|
||||
}
|
||||
|
||||
void NeoPixelService::handleStatusRequest(AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
doc["pin"] = strip.getPin();
|
||||
doc["count"] = strip.numPixels();
|
||||
doc["interval_ms"] = updateIntervalMs;
|
||||
doc["brightness"] = brightness;
|
||||
doc["pattern"] = currentPatternName();
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPixelService::handlePatternsRequest(AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
JsonArray arr = doc.to<JsonArray>();
|
||||
for (auto& kv : patternUpdaters) arr.add(kv.first);
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPixelService::handleControlRequest(AsyncWebServerRequest* request) {
|
||||
if (request->hasParam("pattern", true)) {
|
||||
String name = request->getParam("pattern", true)->value();
|
||||
setPatternByName(name);
|
||||
}
|
||||
|
||||
if (request->hasParam("interval_ms", true)) {
|
||||
unsigned long v = request->getParam("interval_ms", true)->value().toInt();
|
||||
if (v < 1) v = 1;
|
||||
updateIntervalMs = v;
|
||||
taskManager.setTaskInterval("neopixel_update", updateIntervalMs);
|
||||
}
|
||||
|
||||
if (request->hasParam("brightness", true)) {
|
||||
int b = request->getParam("brightness", true)->value().toInt();
|
||||
if (b < 0) b = 0; if (b > 255) b = 255;
|
||||
setBrightness((uint8_t)b);
|
||||
}
|
||||
|
||||
// Accept packed color ints or r,g,b triplets
|
||||
if (request->hasParam("color", true)) {
|
||||
wipeColor = (uint32_t)strtoul(request->getParam("color", true)->value().c_str(), nullptr, 0);
|
||||
chaseColor = wipeColor;
|
||||
}
|
||||
if (request->hasParam("r", true) || request->hasParam("g", true) || request->hasParam("b", true)) {
|
||||
int r = request->hasParam("r", true) ? request->getParam("r", true)->value().toInt() : 0;
|
||||
int g = request->hasParam("g", true) ? request->getParam("g", true)->value().toInt() : 0;
|
||||
int b = request->hasParam("b", true) ? request->getParam("b", true)->value().toInt() : 0;
|
||||
wipeColor = strip.Color(r, g, b);
|
||||
chaseColor = strip.Color(r / 2, g / 2, b / 2); // dimmer for chase
|
||||
}
|
||||
|
||||
JsonDocument resp;
|
||||
resp["ok"] = true;
|
||||
resp["pattern"] = currentPatternName();
|
||||
resp["interval_ms"] = updateIntervalMs;
|
||||
resp["brightness"] = brightness;
|
||||
|
||||
String json;
|
||||
serializeJson(resp, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void NeoPixelService::setBrightness(uint8_t b) {
|
||||
brightness = b;
|
||||
strip.setBrightness(brightness);
|
||||
strip.show();
|
||||
}
|
||||
|
||||
void NeoPixelService::registerTasks() {
|
||||
taskManager.registerTask("neopixel_update", updateIntervalMs, [this]() { update(); });
|
||||
taskManager.registerTask("neopixel_status_print", 10000, [this]() {
|
||||
Serial.printf("[NeoPixel] pattern=%s interval=%lu ms brightness=%u\n",
|
||||
currentPatternName().c_str(), updateIntervalMs, brightness);
|
||||
});
|
||||
}
|
||||
|
||||
void NeoPixelService::registerPatterns() {
|
||||
patternUpdaters["off"] = [this]() { updateOff(); };
|
||||
patternUpdaters["color_wipe"] = [this]() { updateColorWipe(); };
|
||||
patternUpdaters["rainbow"] = [this]() { updateRainbow(); };
|
||||
patternUpdaters["rainbow_cycle"] = [this]() { updateRainbowCycle(); };
|
||||
patternUpdaters["theater_chase"] = [this]() { updateTheaterChase(); };
|
||||
patternUpdaters["theater_chase_rainbow"] = [this]() { updateTheaterChaseRainbow(); };
|
||||
}
|
||||
|
||||
std::vector<String> NeoPixelService::patternNamesVector() const {
|
||||
std::vector<String> v;
|
||||
v.reserve(patternUpdaters.size());
|
||||
for (const auto& kv : patternUpdaters) v.push_back(kv.first);
|
||||
return v;
|
||||
}
|
||||
|
||||
String NeoPixelService::currentPatternName() const {
|
||||
switch (currentPattern) {
|
||||
case Pattern::Off: return String("off");
|
||||
case Pattern::ColorWipe: return String("color_wipe");
|
||||
case Pattern::Rainbow: return String("rainbow");
|
||||
case Pattern::RainbowCycle: return String("rainbow_cycle");
|
||||
case Pattern::TheaterChase: return String("theater_chase");
|
||||
case Pattern::TheaterChaseRainbow: return String("theater_chase_rainbow");
|
||||
}
|
||||
return String("off");
|
||||
}
|
||||
|
||||
NeoPixelService::Pattern NeoPixelService::nameToPattern(const String& name) const {
|
||||
if (name.equalsIgnoreCase("color_wipe")) return Pattern::ColorWipe;
|
||||
if (name.equalsIgnoreCase("rainbow")) return Pattern::Rainbow;
|
||||
if (name.equalsIgnoreCase("rainbow_cycle")) return Pattern::RainbowCycle;
|
||||
if (name.equalsIgnoreCase("theater_chase")) return Pattern::TheaterChase;
|
||||
if (name.equalsIgnoreCase("theater_chase_rainbow")) return Pattern::TheaterChaseRainbow;
|
||||
return Pattern::Off;
|
||||
}
|
||||
|
||||
void NeoPixelService::setPatternByName(const String& name) {
|
||||
Pattern p = nameToPattern(name);
|
||||
resetStateForPattern(p);
|
||||
}
|
||||
|
||||
void NeoPixelService::resetStateForPattern(Pattern p) {
|
||||
strip.clear();
|
||||
strip.show();
|
||||
|
||||
wipeIndex = 0;
|
||||
rainbowJ = 0;
|
||||
cycleJ = 0;
|
||||
chaseJ = 0;
|
||||
chaseQ = 0;
|
||||
chasePhaseOn = true;
|
||||
lastUpdateMs = 0;
|
||||
|
||||
currentPattern = p;
|
||||
}
|
||||
|
||||
void NeoPixelService::update() {
|
||||
unsigned long now = millis();
|
||||
if (now - lastUpdateMs < updateIntervalMs) return;
|
||||
lastUpdateMs = now;
|
||||
|
||||
const String name = currentPatternName();
|
||||
auto it = patternUpdaters.find(name);
|
||||
if (it != patternUpdaters.end()) {
|
||||
it->second();
|
||||
} else {
|
||||
updateOff();
|
||||
}
|
||||
}
|
||||
|
||||
void NeoPixelService::updateOff() {
|
||||
strip.clear();
|
||||
strip.show();
|
||||
}
|
||||
|
||||
void NeoPixelService::updateColorWipe() {
|
||||
if (wipeIndex < strip.numPixels()) {
|
||||
strip.setPixelColor(wipeIndex, wipeColor);
|
||||
++wipeIndex;
|
||||
strip.show();
|
||||
} else {
|
||||
strip.clear();
|
||||
wipeIndex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void NeoPixelService::updateRainbow() {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i++) {
|
||||
strip.setPixelColor(i, colorWheel(strip, (i + rainbowJ) & 255));
|
||||
}
|
||||
strip.show();
|
||||
rainbowJ = (rainbowJ + 1) & 0xFF;
|
||||
}
|
||||
|
||||
void NeoPixelService::updateRainbowCycle() {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i++) {
|
||||
uint8_t pos = ((i * 256 / strip.numPixels()) + cycleJ) & 0xFF;
|
||||
strip.setPixelColor(i, colorWheel(strip, pos));
|
||||
}
|
||||
strip.show();
|
||||
cycleJ = (cycleJ + 1) & 0xFF;
|
||||
}
|
||||
|
||||
void NeoPixelService::updateTheaterChase() {
|
||||
if (chasePhaseOn) {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, chaseColor);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = false;
|
||||
} else {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, 0);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = true;
|
||||
chaseQ = (chaseQ + 1) % 3;
|
||||
chaseJ = (chaseJ + 1) % 10;
|
||||
}
|
||||
}
|
||||
|
||||
void NeoPixelService::updateTheaterChaseRainbow() {
|
||||
if (chasePhaseOn) {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, colorWheel(strip, (idx + chaseJ) % 255));
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = false;
|
||||
} else {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, 0);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = true;
|
||||
chaseQ = (chaseQ + 1) % 3;
|
||||
chaseJ = (chaseJ + 1) & 0xFF;
|
||||
}
|
||||
}
|
||||
67
examples/neopixel/NeoPixelService.h
Normal file
67
examples/neopixel/NeoPixelService.h
Normal file
@@ -0,0 +1,67 @@
|
||||
#pragma once
|
||||
#include "services/Service.h"
|
||||
#include "TaskManager.h"
|
||||
#include <Adafruit_NeoPixel.h>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
class NeoPixelService : public Service {
|
||||
public:
|
||||
enum class Pattern {
|
||||
Off,
|
||||
ColorWipe,
|
||||
Rainbow,
|
||||
RainbowCycle,
|
||||
TheaterChase,
|
||||
TheaterChaseRainbow
|
||||
};
|
||||
|
||||
NeoPixelService(TaskManager& taskMgr, uint16_t numPixels, uint8_t pin, neoPixelType type);
|
||||
void registerEndpoints(ApiServer& api) override;
|
||||
const char* getName() const override { return "NeoPixel"; }
|
||||
|
||||
void setPatternByName(const String& name);
|
||||
void setBrightness(uint8_t b);
|
||||
|
||||
private:
|
||||
void registerTasks();
|
||||
void registerPatterns();
|
||||
std::vector<String> patternNamesVector() const;
|
||||
String currentPatternName() const;
|
||||
Pattern nameToPattern(const String& name) const;
|
||||
void resetStateForPattern(Pattern p);
|
||||
void update();
|
||||
|
||||
// Pattern updaters
|
||||
void updateOff();
|
||||
void updateColorWipe();
|
||||
void updateRainbow();
|
||||
void updateRainbowCycle();
|
||||
void updateTheaterChase();
|
||||
void updateTheaterChaseRainbow();
|
||||
|
||||
// Handlers
|
||||
void handleStatusRequest(AsyncWebServerRequest* request);
|
||||
void handlePatternsRequest(AsyncWebServerRequest* request);
|
||||
void handleControlRequest(AsyncWebServerRequest* request);
|
||||
|
||||
TaskManager& taskManager;
|
||||
Adafruit_NeoPixel strip;
|
||||
|
||||
std::map<String, std::function<void()>> patternUpdaters;
|
||||
|
||||
Pattern currentPattern;
|
||||
unsigned long updateIntervalMs;
|
||||
unsigned long lastUpdateMs;
|
||||
|
||||
// State for patterns
|
||||
uint16_t wipeIndex;
|
||||
uint32_t wipeColor;
|
||||
uint8_t rainbowJ;
|
||||
uint8_t cycleJ;
|
||||
int chaseJ;
|
||||
int chaseQ;
|
||||
bool chasePhaseOn;
|
||||
uint32_t chaseColor;
|
||||
uint8_t brightness;
|
||||
};
|
||||
@@ -1,9 +1,5 @@
|
||||
#include <Arduino.h>
|
||||
#include <functional>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <Adafruit_NeoPixel.h>
|
||||
|
||||
#include "Globals.h"
|
||||
#include "NodeContext.h"
|
||||
#include "NetworkManager.h"
|
||||
@@ -11,6 +7,13 @@
|
||||
#include "ApiServer.h"
|
||||
#include "TaskManager.h"
|
||||
|
||||
// Services
|
||||
#include "services/NodeService.h"
|
||||
#include "services/NetworkService.h"
|
||||
#include "services/ClusterService.h"
|
||||
#include "services/TaskService.h"
|
||||
#include "NeoPixelService.h"
|
||||
|
||||
#ifndef NEOPIXEL_PIN
|
||||
#define NEOPIXEL_PIN 2
|
||||
#endif
|
||||
@@ -23,348 +26,46 @@
|
||||
#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800)
|
||||
#endif
|
||||
|
||||
// Wheel helper: map 0-255 to RGB rainbow
|
||||
static uint32_t colorWheel(Adafruit_NeoPixel &strip, uint8_t pos) {
|
||||
pos = 255 - pos;
|
||||
if (pos < 85) {
|
||||
return strip.Color(255 - pos * 3, 0, pos * 3);
|
||||
}
|
||||
if (pos < 170) {
|
||||
pos -= 85;
|
||||
return strip.Color(0, pos * 3, 255 - pos * 3);
|
||||
}
|
||||
pos -= 170;
|
||||
return strip.Color(pos * 3, 255 - pos * 3, 0);
|
||||
}
|
||||
|
||||
class NeoPixelService {
|
||||
public:
|
||||
enum class Pattern {
|
||||
Off,
|
||||
ColorWipe,
|
||||
Rainbow,
|
||||
RainbowCycle,
|
||||
TheaterChase,
|
||||
TheaterChaseRainbow
|
||||
};
|
||||
|
||||
NeoPixelService(NodeContext &ctx, TaskManager &taskMgr,
|
||||
uint16_t numPixels,
|
||||
uint8_t pin,
|
||||
neoPixelType type)
|
||||
: ctx(ctx), taskManager(taskMgr),
|
||||
strip(numPixels, pin, type),
|
||||
currentPattern(Pattern::Off),
|
||||
updateIntervalMs(20),
|
||||
lastUpdateMs(0),
|
||||
wipeIndex(0),
|
||||
wipeColor(strip.Color(255, 0, 0)),
|
||||
rainbowJ(0),
|
||||
cycleJ(0),
|
||||
chaseJ(0),
|
||||
chaseQ(0),
|
||||
chasePhaseOn(true),
|
||||
chaseColor(strip.Color(127, 127, 127)),
|
||||
brightness(50) {
|
||||
strip.begin();
|
||||
strip.setBrightness(brightness);
|
||||
strip.show();
|
||||
|
||||
registerPatterns();
|
||||
registerTasks();
|
||||
}
|
||||
|
||||
void registerApi(ApiServer &api) {
|
||||
api.addEndpoint("/api/neopixel/status", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
JsonDocument doc;
|
||||
doc["pin"] = NEOPIXEL_PIN;
|
||||
doc["count"] = strip.numPixels();
|
||||
doc["interval_ms"] = updateIntervalMs;
|
||||
doc["brightness"] = brightness;
|
||||
doc["pattern"] = currentPatternName();
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
});
|
||||
|
||||
api.addEndpoint("/api/neopixel/patterns", HTTP_GET, [this](AsyncWebServerRequest *request) {
|
||||
JsonDocument doc;
|
||||
JsonArray arr = doc.to<JsonArray>();
|
||||
for (auto &kv : patternUpdaters) arr.add(kv.first);
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
});
|
||||
|
||||
api.addEndpoint("/api/neopixel", HTTP_POST,
|
||||
[this](AsyncWebServerRequest *request) {
|
||||
String pattern = request->hasParam("pattern", true) ? request->getParam("pattern", true)->value() : "";
|
||||
if (pattern.length()) {
|
||||
setPatternByName(pattern);
|
||||
}
|
||||
|
||||
if (request->hasParam("interval_ms", true)) {
|
||||
updateIntervalMs = request->getParam("interval_ms", true)->value().toInt();
|
||||
if (updateIntervalMs < 1) updateIntervalMs = 1;
|
||||
taskManager.setTaskInterval("neopixel_update", updateIntervalMs);
|
||||
}
|
||||
|
||||
if (request->hasParam("brightness", true)) {
|
||||
int b = request->getParam("brightness", true)->value().toInt();
|
||||
if (b < 0) b = 0; if (b > 255) b = 255;
|
||||
setBrightness((uint8_t)b);
|
||||
}
|
||||
|
||||
// Optional RGB for color_wipe and theater_chase
|
||||
if (request->hasParam("r", true) || request->hasParam("g", true) || request->hasParam("b", true)) {
|
||||
int r = request->hasParam("r", true) ? request->getParam("r", true)->value().toInt() : 0;
|
||||
int g = request->hasParam("g", true) ? request->getParam("g", true)->value().toInt() : 0;
|
||||
int b = request->hasParam("b", true) ? request->getParam("b", true)->value().toInt() : 0;
|
||||
wipeColor = strip.Color(r, g, b);
|
||||
chaseColor = strip.Color(r / 2, g / 2, b / 2); // dimmer for chase
|
||||
}
|
||||
|
||||
JsonDocument resp;
|
||||
resp["ok"] = true;
|
||||
resp["pattern"] = currentPatternName();
|
||||
resp["interval_ms"] = updateIntervalMs;
|
||||
resp["brightness"] = brightness;
|
||||
String json;
|
||||
serializeJson(resp, json);
|
||||
request->send(200, "application/json", json);
|
||||
},
|
||||
std::vector<ApiServer::ParamSpec>{
|
||||
ApiServer::ParamSpec{ String("pattern"), false, String("body"), String("string"), patternNamesVector() },
|
||||
ApiServer::ParamSpec{ String("interval_ms"), false, String("body"), String("number"), {} },
|
||||
ApiServer::ParamSpec{ String("brightness"), false, String("body"), String("number"), {} },
|
||||
ApiServer::ParamSpec{ String("r"), false, String("body"), String("number"), {} },
|
||||
ApiServer::ParamSpec{ String("g"), false, String("body"), String("number"), {} },
|
||||
ApiServer::ParamSpec{ String("b"), false, String("body"), String("number"), {} },
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
void setPatternByName(const String &name) {
|
||||
auto it = patternUpdaters.find(name);
|
||||
if (it != patternUpdaters.end()) {
|
||||
// Map name to enum for status and reset state
|
||||
currentPattern = nameToPattern(name);
|
||||
resetStateForPattern(currentPattern);
|
||||
}
|
||||
}
|
||||
|
||||
void setBrightness(uint8_t b) {
|
||||
brightness = b;
|
||||
strip.setBrightness(brightness);
|
||||
strip.show();
|
||||
}
|
||||
|
||||
private:
|
||||
void registerTasks() {
|
||||
taskManager.registerTask("neopixel_update", updateIntervalMs, [this]() { update(); });
|
||||
taskManager.registerTask("neopixel_status_print", 10000, [this]() {
|
||||
Serial.printf("[NeoPixel] pattern=%s interval=%lu ms brightness=%u\n",
|
||||
currentPatternName().c_str(), updateIntervalMs, brightness);
|
||||
});
|
||||
}
|
||||
|
||||
void registerPatterns() {
|
||||
patternUpdaters["off"] = [this]() { updateOff(); };
|
||||
patternUpdaters["color_wipe"] = [this]() { updateColorWipe(); };
|
||||
patternUpdaters["rainbow"] = [this]() { updateRainbow(); };
|
||||
patternUpdaters["rainbow_cycle"] = [this]() { updateRainbowCycle(); };
|
||||
patternUpdaters["theater_chase"] = [this]() { updateTheaterChase(); };
|
||||
patternUpdaters["theater_chase_rainbow"] = [this]() { updateTheaterChaseRainbow(); };
|
||||
}
|
||||
|
||||
std::vector<String> patternNamesVector() const {
|
||||
std::vector<String> v;
|
||||
v.reserve(patternUpdaters.size());
|
||||
for (const auto &kv : patternUpdaters) v.push_back(kv.first);
|
||||
return v;
|
||||
}
|
||||
|
||||
String currentPatternName() const {
|
||||
switch (currentPattern) {
|
||||
case Pattern::Off: return String("off");
|
||||
case Pattern::ColorWipe: return String("color_wipe");
|
||||
case Pattern::Rainbow: return String("rainbow");
|
||||
case Pattern::RainbowCycle: return String("rainbow_cycle");
|
||||
case Pattern::TheaterChase: return String("theater_chase");
|
||||
case Pattern::TheaterChaseRainbow: return String("theater_chase_rainbow");
|
||||
}
|
||||
return String("off");
|
||||
}
|
||||
|
||||
Pattern nameToPattern(const String &name) const {
|
||||
if (name.equalsIgnoreCase("color_wipe")) return Pattern::ColorWipe;
|
||||
if (name.equalsIgnoreCase("rainbow")) return Pattern::Rainbow;
|
||||
if (name.equalsIgnoreCase("rainbow_cycle")) return Pattern::RainbowCycle;
|
||||
if (name.equalsIgnoreCase("theater_chase")) return Pattern::TheaterChase;
|
||||
if (name.equalsIgnoreCase("theater_chase_rainbow")) return Pattern::TheaterChaseRainbow;
|
||||
return Pattern::Off;
|
||||
}
|
||||
|
||||
void resetStateForPattern(Pattern p) {
|
||||
// Clear strip by default when changing pattern
|
||||
strip.clear();
|
||||
strip.show();
|
||||
|
||||
// Reset indexes/state variables
|
||||
wipeIndex = 0;
|
||||
rainbowJ = 0;
|
||||
cycleJ = 0;
|
||||
chaseJ = 0;
|
||||
chaseQ = 0;
|
||||
chasePhaseOn = true;
|
||||
lastUpdateMs = 0; // force immediate update on next tick
|
||||
|
||||
currentPattern = p;
|
||||
}
|
||||
|
||||
void update() {
|
||||
unsigned long now = millis();
|
||||
if (now - lastUpdateMs < updateIntervalMs) return;
|
||||
lastUpdateMs = now;
|
||||
|
||||
const String name = currentPatternName();
|
||||
auto it = patternUpdaters.find(name);
|
||||
if (it != patternUpdaters.end()) {
|
||||
it->second();
|
||||
} else {
|
||||
updateOff();
|
||||
}
|
||||
}
|
||||
|
||||
// Pattern updaters (non-blocking; advance a small step each call)
|
||||
void updateOff() {
|
||||
// Ensure off state
|
||||
strip.clear();
|
||||
strip.show();
|
||||
}
|
||||
|
||||
void updateColorWipe() {
|
||||
if (wipeIndex < strip.numPixels()) {
|
||||
strip.setPixelColor(wipeIndex, wipeColor);
|
||||
++wipeIndex;
|
||||
strip.show();
|
||||
} else {
|
||||
// Restart
|
||||
strip.clear();
|
||||
wipeIndex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void updateRainbow() {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i++) {
|
||||
strip.setPixelColor(i, colorWheel(strip, (i + rainbowJ) & 255));
|
||||
}
|
||||
strip.show();
|
||||
rainbowJ = (rainbowJ + 1) & 0xFF; // 0..255
|
||||
}
|
||||
|
||||
void updateRainbowCycle() {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i++) {
|
||||
uint8_t pos = ((i * 256 / strip.numPixels()) + cycleJ) & 0xFF;
|
||||
strip.setPixelColor(i, colorWheel(strip, pos));
|
||||
}
|
||||
strip.show();
|
||||
cycleJ = (cycleJ + 1) & 0xFF;
|
||||
}
|
||||
|
||||
void updateTheaterChase() {
|
||||
// Phase toggles on/off for the current q offset
|
||||
if (chasePhaseOn) {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, chaseColor);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = false;
|
||||
} else {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, 0);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = true;
|
||||
chaseQ = (chaseQ + 1) % 3; // move the crawl
|
||||
chaseJ = (chaseJ + 1) % 10; // cycle count kept for status if needed
|
||||
}
|
||||
}
|
||||
|
||||
void updateTheaterChaseRainbow() {
|
||||
if (chasePhaseOn) {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, colorWheel(strip, (idx + chaseJ) % 255));
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = false;
|
||||
} else {
|
||||
for (uint16_t i = 0; i < strip.numPixels(); i += 3) {
|
||||
uint16_t idx = i + chaseQ;
|
||||
if (idx < strip.numPixels()) strip.setPixelColor(idx, 0);
|
||||
}
|
||||
strip.show();
|
||||
chasePhaseOn = true;
|
||||
chaseQ = (chaseQ + 1) % 3;
|
||||
chaseJ = (chaseJ + 1) & 0xFF;
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
NodeContext &ctx;
|
||||
TaskManager &taskManager;
|
||||
Adafruit_NeoPixel strip;
|
||||
|
||||
std::map<String, std::function<void()>> patternUpdaters;
|
||||
|
||||
Pattern currentPattern;
|
||||
unsigned long updateIntervalMs;
|
||||
unsigned long lastUpdateMs;
|
||||
|
||||
// State for patterns
|
||||
uint16_t wipeIndex;
|
||||
uint32_t wipeColor;
|
||||
|
||||
uint8_t rainbowJ;
|
||||
uint8_t cycleJ;
|
||||
|
||||
int chaseJ;
|
||||
int chaseQ;
|
||||
bool chasePhaseOn;
|
||||
uint32_t chaseColor;
|
||||
|
||||
uint8_t brightness;
|
||||
};
|
||||
|
||||
NodeContext ctx({
|
||||
{"app", "neopixel"},
|
||||
{"device", "light"},
|
||||
{"pixels", String(NEOPIXEL_COUNT)},
|
||||
{"pin", String(NEOPIXEL_PIN)}
|
||||
{"app", "neopixel"},
|
||||
{"device", "light"},
|
||||
{"pixels", String(NEOPIXEL_COUNT)},
|
||||
{"pin", String(NEOPIXEL_PIN)}
|
||||
});
|
||||
NetworkManager network(ctx);
|
||||
TaskManager taskManager(ctx);
|
||||
ClusterManager cluster(ctx, taskManager);
|
||||
ApiServer apiServer(ctx, taskManager, ctx.config.api_server_port);
|
||||
NeoPixelService neoService(ctx, taskManager, NEOPIXEL_COUNT, NEOPIXEL_PIN, NEOPIXEL_TYPE);
|
||||
|
||||
// Create services
|
||||
NodeService nodeService(ctx);
|
||||
NetworkService networkService(network);
|
||||
ClusterService clusterService(ctx);
|
||||
TaskService taskService(taskManager);
|
||||
NeoPixelService neoPixelService(taskManager, NEOPIXEL_COUNT, NEOPIXEL_PIN, NEOPIXEL_TYPE);
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
Serial.begin(115200);
|
||||
|
||||
network.setupWiFi();
|
||||
// Setup WiFi first
|
||||
network.setupWiFi();
|
||||
|
||||
taskManager.initialize();
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
apiServer.begin();
|
||||
neoService.registerApi(apiServer);
|
||||
// Register services and start API server
|
||||
apiServer.addService(nodeService);
|
||||
apiServer.addService(networkService);
|
||||
apiServer.addService(clusterService);
|
||||
apiServer.addService(taskService);
|
||||
apiServer.addService(neoPixelService);
|
||||
apiServer.begin();
|
||||
|
||||
taskManager.printTaskStatus();
|
||||
// Print initial task status
|
||||
taskManager.printTaskStatus();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
taskManager.execute();
|
||||
yield();
|
||||
}
|
||||
taskManager.execute();
|
||||
yield();
|
||||
}
|
||||
89
examples/relay/RelayService.cpp
Normal file
89
examples/relay/RelayService.cpp
Normal file
@@ -0,0 +1,89 @@
|
||||
#include "RelayService.h"
|
||||
#include "ApiServer.h"
|
||||
|
||||
RelayService::RelayService(TaskManager& taskMgr, int pin)
|
||||
: taskManager(taskMgr), relayPin(pin), relayOn(false) {
|
||||
pinMode(relayPin, OUTPUT);
|
||||
// Many relay modules are active LOW. Start in OFF state (relay de-energized).
|
||||
digitalWrite(relayPin, HIGH);
|
||||
registerTasks();
|
||||
}
|
||||
|
||||
void RelayService::registerEndpoints(ApiServer& api) {
|
||||
api.addEndpoint("/api/relay/status", HTTP_GET,
|
||||
[this](AsyncWebServerRequest* request) { handleStatusRequest(request); },
|
||||
std::vector<ParamSpec>{});
|
||||
|
||||
api.addEndpoint("/api/relay", HTTP_POST,
|
||||
[this](AsyncWebServerRequest* request) { handleControlRequest(request); },
|
||||
std::vector<ParamSpec>{
|
||||
ParamSpec{String("state"), true, String("body"), String("string"),
|
||||
{String("on"), String("off"), String("toggle")}}
|
||||
});
|
||||
}
|
||||
|
||||
void RelayService::handleStatusRequest(AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
doc["pin"] = relayPin;
|
||||
doc["state"] = relayOn ? "on" : "off";
|
||||
doc["uptime"] = millis();
|
||||
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
}
|
||||
|
||||
void RelayService::handleControlRequest(AsyncWebServerRequest* request) {
|
||||
String state = request->hasParam("state", true) ? request->getParam("state", true)->value() : "";
|
||||
bool ok = false;
|
||||
|
||||
if (state.equalsIgnoreCase("on")) {
|
||||
turnOn();
|
||||
ok = true;
|
||||
} else if (state.equalsIgnoreCase("off")) {
|
||||
turnOff();
|
||||
ok = true;
|
||||
} else if (state.equalsIgnoreCase("toggle")) {
|
||||
toggle();
|
||||
ok = true;
|
||||
}
|
||||
|
||||
JsonDocument resp;
|
||||
resp["success"] = ok;
|
||||
resp["state"] = relayOn ? "on" : "off";
|
||||
if (!ok) {
|
||||
resp["message"] = "Invalid state. Use: on, off, or toggle";
|
||||
}
|
||||
|
||||
String json;
|
||||
serializeJson(resp, json);
|
||||
request->send(ok ? 200 : 400, "application/json", json);
|
||||
}
|
||||
|
||||
void RelayService::turnOn() {
|
||||
relayOn = true;
|
||||
// Active LOW relay
|
||||
digitalWrite(relayPin, LOW);
|
||||
Serial.println("[RelayService] Relay ON");
|
||||
}
|
||||
|
||||
void RelayService::turnOff() {
|
||||
relayOn = false;
|
||||
digitalWrite(relayPin, HIGH);
|
||||
Serial.println("[RelayService] Relay OFF");
|
||||
}
|
||||
|
||||
void RelayService::toggle() {
|
||||
if (relayOn) {
|
||||
turnOff();
|
||||
} else {
|
||||
turnOn();
|
||||
}
|
||||
}
|
||||
|
||||
void RelayService::registerTasks() {
|
||||
taskManager.registerTask("relay_status_print", 5000, [this]() {
|
||||
Serial.printf("[RelayService] Status - pin: %d, state: %s\n",
|
||||
relayPin, relayOn ? "ON" : "OFF");
|
||||
});
|
||||
}
|
||||
25
examples/relay/RelayService.h
Normal file
25
examples/relay/RelayService.h
Normal file
@@ -0,0 +1,25 @@
|
||||
#pragma once
|
||||
#include "services/Service.h"
|
||||
#include "TaskManager.h"
|
||||
#include <ArduinoJson.h>
|
||||
|
||||
class RelayService : public Service {
|
||||
public:
|
||||
RelayService(TaskManager& taskMgr, int pin);
|
||||
void registerEndpoints(ApiServer& api) override;
|
||||
const char* getName() const override { return "Relay"; }
|
||||
|
||||
void turnOn();
|
||||
void turnOff();
|
||||
void toggle();
|
||||
|
||||
private:
|
||||
void registerTasks();
|
||||
|
||||
TaskManager& taskManager;
|
||||
int relayPin;
|
||||
bool relayOn;
|
||||
|
||||
void handleStatusRequest(AsyncWebServerRequest* request);
|
||||
void handleControlRequest(AsyncWebServerRequest* request);
|
||||
};
|
||||
@@ -7,6 +7,13 @@
|
||||
#include "ApiServer.h"
|
||||
#include "TaskManager.h"
|
||||
|
||||
// Services
|
||||
#include "services/NodeService.h"
|
||||
#include "services/NetworkService.h"
|
||||
#include "services/ClusterService.h"
|
||||
#include "services/TaskService.h"
|
||||
#include "RelayService.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
// Choose a default relay pin. For ESP-01 this is GPIO0. Adjust as needed for your board.
|
||||
@@ -14,88 +21,6 @@ using namespace std;
|
||||
#define RELAY_PIN 0
|
||||
#endif
|
||||
|
||||
class RelayService {
|
||||
public:
|
||||
RelayService(NodeContext& ctx, TaskManager& taskMgr, int pin)
|
||||
: ctx(ctx), taskManager(taskMgr), relayPin(pin), relayOn(false) {
|
||||
pinMode(relayPin, OUTPUT);
|
||||
// Many relay modules are active LOW. Start in OFF state (relay de-energized).
|
||||
digitalWrite(relayPin, HIGH);
|
||||
|
||||
registerTasks();
|
||||
}
|
||||
|
||||
void registerApi(ApiServer& api) {
|
||||
api.addEndpoint("/api/relay/status", HTTP_GET, [this](AsyncWebServerRequest* request) {
|
||||
JsonDocument doc;
|
||||
doc["pin"] = relayPin;
|
||||
doc["state"] = relayOn ? "on" : "off";
|
||||
doc["uptime"] = millis();
|
||||
String json;
|
||||
serializeJson(doc, json);
|
||||
request->send(200, "application/json", json);
|
||||
});
|
||||
|
||||
api.addEndpoint("/api/relay", HTTP_POST, [this](AsyncWebServerRequest* request) {
|
||||
String state = request->hasParam("state", true) ? request->getParam("state", true)->value() : "";
|
||||
bool ok = false;
|
||||
if (state.equalsIgnoreCase("on")) {
|
||||
turnOn();
|
||||
ok = true;
|
||||
} else if (state.equalsIgnoreCase("off")) {
|
||||
turnOff();
|
||||
ok = true;
|
||||
} else if (state.equalsIgnoreCase("toggle")) {
|
||||
toggle();
|
||||
ok = true;
|
||||
}
|
||||
|
||||
JsonDocument resp;
|
||||
resp["success"] = ok;
|
||||
resp["state"] = relayOn ? "on" : "off";
|
||||
if (!ok) {
|
||||
resp["message"] = "Invalid state. Use: on, off, or toggle";
|
||||
}
|
||||
String json;
|
||||
serializeJson(resp, json);
|
||||
request->send(ok ? 200 : 400, "application/json", json);
|
||||
}, std::vector<ApiServer::ParamSpec>{ ApiServer::ParamSpec{ String("state"), true, String("body"), String("string"), { String("on"), String("off"), String("toggle") } } });
|
||||
}
|
||||
|
||||
void turnOn() {
|
||||
relayOn = true;
|
||||
// Active LOW relay
|
||||
digitalWrite(relayPin, LOW);
|
||||
Serial.println("[RelayService] Relay ON");
|
||||
}
|
||||
|
||||
void turnOff() {
|
||||
relayOn = false;
|
||||
digitalWrite(relayPin, HIGH);
|
||||
Serial.println("[RelayService] Relay OFF");
|
||||
}
|
||||
|
||||
void toggle() {
|
||||
if (relayOn) {
|
||||
turnOff();
|
||||
} else {
|
||||
turnOn();
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
void registerTasks() {
|
||||
taskManager.registerTask("relay_status_print", 5000, [this]() {
|
||||
Serial.printf("[RelayService] Status - pin: %d, state: %s\n", relayPin, relayOn ? "ON" : "OFF");
|
||||
});
|
||||
}
|
||||
|
||||
NodeContext& ctx;
|
||||
TaskManager& taskManager;
|
||||
int relayPin;
|
||||
bool relayOn;
|
||||
};
|
||||
|
||||
NodeContext ctx({
|
||||
{"app", "relay"},
|
||||
{"device", "actuator"},
|
||||
@@ -105,7 +30,13 @@ NetworkManager network(ctx);
|
||||
TaskManager taskManager(ctx);
|
||||
ClusterManager cluster(ctx, taskManager);
|
||||
ApiServer apiServer(ctx, taskManager, ctx.config.api_server_port);
|
||||
RelayService relayService(ctx, taskManager, RELAY_PIN);
|
||||
|
||||
// Create services
|
||||
NodeService nodeService(ctx);
|
||||
NetworkService networkService(network);
|
||||
ClusterService clusterService(ctx);
|
||||
TaskService taskService(taskManager);
|
||||
RelayService relayService(taskManager, RELAY_PIN);
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
@@ -116,9 +47,13 @@ void setup() {
|
||||
// Initialize and start all tasks
|
||||
taskManager.initialize();
|
||||
|
||||
// Start the API server and expose relay endpoints
|
||||
// Register services and start API server
|
||||
apiServer.addService(nodeService);
|
||||
apiServer.addService(networkService);
|
||||
apiServer.addService(clusterService);
|
||||
apiServer.addService(taskService);
|
||||
apiServer.addService(relayService);
|
||||
apiServer.begin();
|
||||
relayService.registerApi(apiServer);
|
||||
|
||||
// Print initial task status
|
||||
taskManager.printTaskStatus();
|
||||
@@ -127,4 +62,4 @@ void setup() {
|
||||
void loop() {
|
||||
taskManager.execute();
|
||||
yield();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user