ソースを参照

pass webSocketServer to LEdManager to send messages

!!!RELEASE CANDITATE!!!
master
gituser 2週間前
コミット
9b9ff5671c
4個のファイルの変更11行の追加7行の削除
  1. 1
    1
      LEDLamp.ino
  2. 4
    2
      LEDStripManager.cpp
  3. 5
    3
      LEDStripManager.h
  4. 1
    1
      sloeber.ino.cpp

+ 1
- 1
LEDLamp.ino ファイルの表示

@@ -27,7 +27,7 @@ ESP8266WebServer webServer(80);
WebSocketsServer webSocket(81);
DNSServer dnsServer;
ConfigManager configManager;
LEDStripManager ledMngr(LED_COUNT, LED_STRIP_DATA_PIN, configManager);
LEDStripManager ledMngr(LED_COUNT, LED_STRIP_DATA_PIN, configManager, webSocket);
TimerManager timerManager(configManager);

// ---------- CAPTIVE PORTAL PAGE ----------

+ 4
- 2
LEDStripManager.cpp ファイルの表示

@@ -10,8 +10,8 @@
/*
* Constructor
*/
LEDStripManager::LEDStripManager(uint16_t numLeds, uint8_t pin, ConfigManager &configManager)
: strip(numLeds, pin, NEO_GRBW + NEO_KHZ800), configManager(configManager) {
LEDStripManager::LEDStripManager(uint16_t numLeds, uint8_t pin, ConfigManager &configManager, WebSocketsServer &webSocket)
: strip(numLeds, pin, NEO_GRBW + NEO_KHZ800), configManager(configManager), webSocket(webSocket) {

}

@@ -75,6 +75,7 @@ void LEDStripManager::show() {
void LEDStripManager::on() {
Serial.println("LEDStripManager LED ON");
begin();
webSocket.sendTXT(0, "LED ON");
}

void LEDStripManager::off() {
@@ -84,6 +85,7 @@ void LEDStripManager::off() {
delay(50);
digitalWrite(LED_STRIP_POWER_PIN, LOW); // LED zunächst AUS
digitalWrite(LED_STRIP_DATA_PIN, LOW);
webSocket.sendTXT(0, "LED OFF");
}

bool LEDStripManager::isOn() {

+ 5
- 3
LEDStripManager.h ファイルの表示

@@ -3,6 +3,7 @@

#include "Arduino.h"
#include <Adafruit_NeoPixel.h>
#include <WebSocketsServer.h>
#include "ConfigManager.h"
#include "LEDModes.h"

@@ -12,7 +13,7 @@ const int LED_STRIP_DATA_PIN = D8; // The pin to switch control the LED stripe
class LEDStripManager {

public:
LEDStripManager(uint16_t numLeds, uint8_t pin, ConfigManager &configManager);
LEDStripManager(uint16_t numLeds, uint8_t pin, ConfigManager &configManager, WebSocketsServer &webSocket);
virtual ~LEDStripManager();

void begin();
@@ -36,9 +37,10 @@ class LEDStripManager {

private:
Adafruit_NeoPixel strip;
uint32_t firstPixelHue = 0;

ConfigManager &configManager;
WebSocketsServer &webSocket;

uint32_t firstPixelHue = 0;
uint32_t wheel(uint8_t pos);
};


+ 1
- 1
sloeber.ino.cpp ファイルの表示

@@ -2,7 +2,7 @@
//This is a automatic generated file
//Please do not modify this file
//If you touch this file your change will be overwritten during the next build
//This file has been generated on 2026-07-17 16:31:43
//This file has been generated on 2026-07-18 16:25:01

#include "Arduino.h"
#include "Arduino.h"

読み込み中…
キャンセル
保存