klubhaus/klubhaus-doorbell
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: apply consistent code formatting and spacing

Browse Source
This commit is contained in:
David Gwilliam
2026-02-17 04:15:48 -08:00
parent f39364f67f
commit 8e9bd18676
13 changed files with 217 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
boards/esp32-32e/DisplayDriverTFT.h
View File

@@ -1,8 +1,9 @@
#pragma once #pragma once
#include "board_config.h"
#include <KlubhausCore.h> #include <KlubhausCore.h>
#include <TFT_eSPI.h> #include <TFT_eSPI.h>
#include "board_config.h"
class DisplayDriverTFT : public IDisplayDriver { class DisplayDriverTFT : public IDisplayDriver {
public: public:
@@ -10,11 +11,11 @@ public:
void setBacklight(bool on) override; void setBacklight(bool on) override;
void render(const ScreenState& state) override; void render(const ScreenState& state) override;
TouchEvent readTouch() override; TouchEvent readTouch() override;
int dashboardTouch(int x, int y) override; int dashboardTouch(int x, int y) override;
HoldState updateHold(unsigned long holdMs) override; HoldState updateHold(unsigned long holdMs) override;
void updateHint(int x, int y) override; void updateHint(int x, int y) override;
int width() override { return DISPLAY_WIDTH; } int width() override { return DISPLAY_WIDTH; }
int height() override { return DISPLAY_HEIGHT; } int height() override { return DISPLAY_HEIGHT; }
private: private:
void drawBoot(); void drawBoot();
@@ -23,8 +24,8 @@ private:
TFT_eSPI _tft; TFT_eSPI _tft;
bool _holdActive = false; bool _holdActive = false;
uint32_t _holdStartMs = 0; uint32_t _holdStartMs = 0;
ScreenID _lastScreen = ScreenID::BOOT; ScreenID _lastScreen = ScreenID::BOOT;
bool _needsRedraw = true; bool _needsRedraw = true;
}; };

10
boards/esp32-32e/board_config.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#define BOARD_NAME "WS_32E" #define BOARD_NAME "WS_32E"
// ══════════════════════════════════════════════════════════ // ══════════════════════════════════════════════════════════
// TODO: Set these to match YOUR display + wiring. // TODO: Set these to match YOUR display + wiring.
@@ -9,12 +9,12 @@
// (which gets copied into the vendored TFT_eSPI library). // (which gets copied into the vendored TFT_eSPI library).
// ══════════════════════════════════════════════════════════ // ══════════════════════════════════════════════════════════
#define DISPLAY_WIDTH 320 #define DISPLAY_WIDTH 320
#define DISPLAY_HEIGHT 240 #define DISPLAY_HEIGHT 240
#define DISPLAY_ROTATION 1 // landscape #define DISPLAY_ROTATION 1 // landscape
// Backlight GPIO (directly wired) // Backlight GPIO (directly wired)
#define PIN_LCD_BL 22 #define PIN_LCD_BL 22
// Touch — if using XPT2046 via TFT_eSPI, set TOUCH_CS in tft_user_setup.h // Touch — if using XPT2046 via TFT_eSPI, set TOUCH_CS in tft_user_setup.h
// If using capacitive touch (e.g. FT6236), configure I2C pins here: // If using capacitive touch (e.g. FT6236), configure I2C pins here:

29
boards/esp32-32e/esp32-32e.ino
View File

@@ -2,14 +2,15 @@
// Klubhaus Doorbell — ESP32-32E target // Klubhaus Doorbell — ESP32-32E target
// //
#include <KlubhausCore.h> #include "DisplayDriverTFT.h"
#include "board_config.h" #include "board_config.h"
#include "secrets.h" #include "secrets.h"
#include "DisplayDriverTFT.h"
#include <KlubhausCore.h>
DisplayDriverTFT tftDriver; DisplayDriverTFT tftDriver;
DisplayManager display(&tftDriver); DisplayManager display(&tftDriver);
DoorbellLogic logic(&display); DoorbellLogic logic(&display);
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
@@ -31,19 +32,19 @@ void loop() {
static int holdStartX = -1; static int holdStartX = -1;
static int holdStartY = -1; static int holdStartY = -1;
if (st.deviceState == DeviceState::ALERTING) { if(st.deviceState == DeviceState::ALERTING) {
HoldState h = display.updateHold(HOLD_TO_SILENCE_MS); HoldState h = display.updateHold(HOLD_TO_SILENCE_MS);
if (h.completed) { if(h.completed) {
logic.silenceAlert(); logic.silenceAlert();
holdStartX = -1; holdStartX = -1;
holdStartY = -1; holdStartY = -1;
} }
if (h.started) { if(h.started) {
TouchEvent t = display.readTouch(); TouchEvent t = display.readTouch();
holdStartX = t.x; holdStartX = t.x;
holdStartY = t.y; holdStartY = t.y;
} }
if (!h.active && holdStartX >= 0) { if(!h.active && holdStartX >= 0) {
display.updateHint(holdStartX, holdStartY); display.updateHint(holdStartX, holdStartY);
} }
} else { } else {
@@ -51,18 +52,20 @@ void loop() {
holdStartY = -1; holdStartY = -1;
} }
if (st.screen == ScreenID::DASHBOARD) { if(st.screen == ScreenID::DASHBOARD) {
TouchEvent evt = display.readTouch(); TouchEvent evt = display.readTouch();
if (evt.pressed) { if(evt.pressed) {
int tile = display.dashboardTouch(evt.x, evt.y); int tile = display.dashboardTouch(evt.x, evt.y);
if (tile >= 0) Serial.printf("[DASH] Tile %d tapped\n", tile); if(tile >= 0)
Serial.printf("[DASH] Tile %d tapped\n", tile);
} }
} }
// ── Serial console ── // ── Serial console ──
if (Serial.available()) { if(Serial.available()) {
String cmd = Serial.readStringUntil('\n'); String cmd = Serial.readStringUntil('\n');
cmd.trim(); cmd.trim();
if (cmd.length() > 0) logic.onSerialCommand(cmd); if(cmd.length() > 0)
logic.onSerialCommand(cmd);
} }
} }

20
boards/esp32-32e/tft_user_setup.h
View File

@@ -11,27 +11,27 @@
// ── Resolution ── // ── Resolution ──
// FIXED: Match board_config.h (320x240 landscape) // FIXED: Match board_config.h (320x240 landscape)
#define TFT_WIDTH 320 #define TFT_WIDTH 320
#define TFT_HEIGHT 240 #define TFT_HEIGHT 240
// ── SPI Pins ── // ── SPI Pins ──
#define TFT_MOSI 23 #define TFT_MOSI 23
#define TFT_SCLK 18 #define TFT_SCLK 18
#define TFT_CS 5 #define TFT_CS 5
#define TFT_DC 27 #define TFT_DC 27
#define TFT_RST 33 #define TFT_RST 33
// ── Backlight (optional, can also use GPIO directly) ── // ── Backlight (optional, can also use GPIO directly) ──
// #define TFT_BL 22 // #define TFT_BL 22
// #define TFT_BACKLIGHT_ON HIGH // #define TFT_BACKLIGHT_ON HIGH
// ── Touch (XPT2046 resistive) ── // ── Touch (XPT2046 resistive) ──
#define TOUCH_CS 14 #define TOUCH_CS 14
// ── SPI speed ── // ── SPI speed ──
#define SPI_FREQUENCY 40000000 #define SPI_FREQUENCY 40000000
#define SPI_READ_FREQUENCY 20000000 #define SPI_READ_FREQUENCY 20000000
#define SPI_TOUCH_FREQUENCY 2500000 #define SPI_TOUCH_FREQUENCY 2500000
// ── Misc ── // ── Misc ──
#define LOAD_GLCD #define LOAD_GLCD

5
boards/esp32-s3-lcd-43/DisplayDriverGFX.h
View File

@@ -1,8 +1,9 @@
#pragma once #pragma once
#include <Arduino.h>
#include "IDisplayDriver.h" #include "IDisplayDriver.h"
#include <Arduino.h>
class DisplayDriverGFX : public IDisplayDriver { class DisplayDriverGFX : public IDisplayDriver {
public: public:
// ── IDisplayDriver ── // ── IDisplayDriver ──
@@ -27,7 +28,7 @@ private:
void drawDashboard(const ScreenState& state); void drawDashboard(const ScreenState& state);
// Touch handling // Touch handling
TouchEvent _lastTouch = {false, 0, 0}; TouchEvent _lastTouch = { false, 0, 0 };
unsigned long _pressStartMs = 0; unsigned long _pressStartMs = 0;
bool _isHolding = false; bool _isHolding = false;

202
boards/esp32-s3-lcd-43/LovyanPins.h
View File

@@ -2,117 +2,117 @@
#define LGFX_USE_V1 #define LGFX_USE_V1
#include <LovyanGFX.hpp> #include <LovyanGFX.hpp>
#include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp>
#include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp> #include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp>
#include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp>
// ── Display dimensions ── // ── Display dimensions ──
#define TFT_HOR_RES 800 #define TFT_HOR_RES 800
#define TFT_VER_RES 480 #define TFT_VER_RES 480
// ── Touch I2C (from Westcott example) ── // ── Touch I2C (from Westcott example) ──
#define TOUCH_SDA 8 #define TOUCH_SDA 8
#define TOUCH_SCL 9 #define TOUCH_SCL 9
#define TOUCH_INT 4 #define TOUCH_INT 4
#define TOUCH_RST -1 #define TOUCH_RST -1
// ── CH422G Expander pins ── // ── CH422G Expander pins ──
#define TP_RST 1 #define TP_RST 1
#define LCD_BL 2 #define LCD_BL 2
#define LCD_RST 3 #define LCD_RST 3
#define SD_CS 4 #define SD_CS 4
#define USB_SEL 5 #define USB_SEL 5
class LGFX : public lgfx::LGFX_Device { class LGFX : public lgfx::LGFX_Device {
public: public:
lgfx::Bus_RGB _bus_instance; lgfx::Bus_RGB _bus_instance;
lgfx::Panel_RGB _panel_instance; lgfx::Panel_RGB _panel_instance;
lgfx::Touch_GT911 _touch_instance; lgfx::Touch_GT911 _touch_instance;
LGFX(void) { LGFX(void) {
// Panel config // Panel config
{ {
auto cfg = _panel_instance.config(); auto cfg = _panel_instance.config();
cfg.memory_width = TFT_HOR_RES; cfg.memory_width = TFT_HOR_RES;
cfg.memory_height = TFT_VER_RES; cfg.memory_height = TFT_VER_RES;
cfg.panel_width = TFT_HOR_RES; cfg.panel_width = TFT_HOR_RES;
cfg.panel_height = TFT_VER_RES; cfg.panel_height = TFT_VER_RES;
cfg.offset_x = 0; cfg.offset_x = 0;
cfg.offset_y = 0; cfg.offset_y = 0;
_panel_instance.config(cfg); _panel_instance.config(cfg);
}
// RGB parallel bus config (from Westcott)
{
auto cfg = _bus_instance.config();
cfg.panel = &_panel_instance;
// Blue channel
cfg.pin_d0 = 14;
cfg.pin_d1 = 38;
cfg.pin_d2 = 18;
cfg.pin_d3 = 17;
cfg.pin_d4 = 10;
// Green channel
cfg.pin_d5 = 39;
cfg.pin_d6 = 0;
cfg.pin_d7 = 45;
cfg.pin_d8 = 48;
cfg.pin_d9 = 47;
cfg.pin_d10 = 21;
// Red channel
cfg.pin_d11 = 1;
cfg.pin_d12 = 2;
cfg.pin_d13 = 42;
cfg.pin_d14 = 41;
cfg.pin_d15 = 40;
// Timing
cfg.pin_henable = 5;
cfg.pin_vsync = 3;
cfg.pin_hsync = 46;
cfg.pin_pclk = 7;
cfg.freq_write = 14000000;
cfg.hsync_polarity = 0;
cfg.hsync_front_porch = 20;
cfg.hsync_pulse_width = 10;
cfg.hsync_back_porch = 10;
cfg.vsync_polarity = 0;
cfg.vsync_front_porch = 10;
cfg.vsync_pulse_width = 10;
cfg.vsync_back_porch = 10;
cfg.pclk_active_neg = 0;
cfg.de_idle_high = 0;
cfg.pclk_idle_high = 0;
_bus_instance.config(cfg);
}
_panel_instance.setBus(&_bus_instance);
// Touch config (I2C port 1, address 0x14 - from Westcott!)
{
auto cfg = _touch_instance.config();
cfg.x_min = 0;
cfg.x_max = TFT_HOR_RES - 1;
cfg.y_min = 0;
cfg.y_max = TFT_VER_RES - 1;
cfg.pin_int = TOUCH_INT;
cfg.pin_rst = TOUCH_RST;
cfg.bus_shared = false;
cfg.offset_rotation = 0;
cfg.i2c_port = I2C_NUM_1; // IMPORTANT: Port 1, not 0!
cfg.pin_sda = TOUCH_SDA;
cfg.pin_scl = TOUCH_SCL;
cfg.freq = 400000;
cfg.i2c_addr = 0x14; // IMPORTANT: Address 0x14, not 0x5D!
_touch_instance.config(cfg);
_panel_instance.setTouch(&_touch_instance);
}
setPanel(&_panel_instance);
} }
// RGB parallel bus config (from Westcott)
{
auto cfg = _bus_instance.config();
cfg.panel = &_panel_instance;
// Blue channel
cfg.pin_d0 = 14;
cfg.pin_d1 = 38;
cfg.pin_d2 = 18;
cfg.pin_d3 = 17;
cfg.pin_d4 = 10;
// Green channel
cfg.pin_d5 = 39;
cfg.pin_d6 = 0;
cfg.pin_d7 = 45;
cfg.pin_d8 = 48;
cfg.pin_d9 = 47;
cfg.pin_d10 = 21;
// Red channel
cfg.pin_d11 = 1;
cfg.pin_d12 = 2;
cfg.pin_d13 = 42;
cfg.pin_d14 = 41;
cfg.pin_d15 = 40;
// Timing
cfg.pin_henable = 5;
cfg.pin_vsync = 3;
cfg.pin_hsync = 46;
cfg.pin_pclk = 7;
cfg.freq_write = 14000000;
cfg.hsync_polarity = 0;
cfg.hsync_front_porch = 20;
cfg.hsync_pulse_width = 10;
cfg.hsync_back_porch = 10;
cfg.vsync_polarity = 0;
cfg.vsync_front_porch = 10;
cfg.vsync_pulse_width = 10;
cfg.vsync_back_porch = 10;
cfg.pclk_active_neg = 0;
cfg.de_idle_high = 0;
cfg.pclk_idle_high = 0;
_bus_instance.config(cfg);
}
_panel_instance.setBus(&_bus_instance);
// Touch config (I2C port 1, address 0x14 - from Westcott!)
{
auto cfg = _touch_instance.config();
cfg.x_min = 0;
cfg.x_max = TFT_HOR_RES - 1;
cfg.y_min = 0;
cfg.y_max = TFT_VER_RES - 1;
cfg.pin_int = TOUCH_INT;
cfg.pin_rst = TOUCH_RST;
cfg.bus_shared = false;
cfg.offset_rotation = 0;
cfg.i2c_port = I2C_NUM_1; // IMPORTANT: Port 1, not 0!
cfg.pin_sda = TOUCH_SDA;
cfg.pin_scl = TOUCH_SCL;
cfg.freq = 400000;
cfg.i2c_addr = 0x14; // IMPORTANT: Address 0x14, not 0x5D!
_touch_instance.config(cfg);
_panel_instance.setTouch(&_touch_instance);
}
setPanel(&_panel_instance);
}
}; };

31
libraries/KlubhausCore/src/DoorbellLogic.cpp
View File

@@ -1,29 +1,29 @@
#include "DoorbellLogic.h" #include "DoorbellLogic.h"
DoorbellLogic::DoorbellLogic(DisplayManager* display) DoorbellLogic::DoorbellLogic(DisplayManager* display)
: _display(display) {} : _display(display) { }
// ── URL builder ───────────────────────────────────────────── // ── URL builder ─────────────────────────────────────────────
String DoorbellLogic::topicUrl(const char* base) { String DoorbellLogic::topicUrl(const char* base) {
String suffix = _debug ? "_test" : ""; String suffix = _debug ? "_test" : "";
return String("https://") + NTFY_SERVER + "/" + base + suffix return String("https://") + NTFY_SERVER + "/" + base + suffix + "/json?since=20s&poll=1";
+ "/json?since=20s&poll=1";
} }
// ── Lifecycle ─────────────────────────────────────────────── // ── Lifecycle ───────────────────────────────────────────────
void DoorbellLogic::begin(const char* version, const char* boardName, void DoorbellLogic::begin(
const WiFiCred* creds, int credCount) { const char* version, const char* boardName, const WiFiCred* creds, int credCount) {
_version = version; _version = version;
_board = boardName; _board = boardName;
#ifdef DEBUG_MODE #ifdef DEBUG_MODE
_debug = true; _debug = true;
#endif #endif
Serial.println(F("========================================")); Serial.println(F("========================================"));
Serial.printf( " KLUBHAUS ALERT v%s — %s\n", _version, _board); Serial.printf(" KLUBHAUS ALERT v%s — %s\n", _version, _board);
if (_debug) Serial.println(F(" *** DEBUG MODE — _test topics ***")); if(_debug)
Serial.println(F(" *** DEBUG MODE — _test topics ***"));
Serial.println(F("========================================\n")); Serial.println(F("========================================\n"));
// Display // Display
@@ -32,21 +32,20 @@ void DoorbellLogic::begin(const char* version, const char* boardName,
// Network // Network
_net.begin(creds, credCount); _net.begin(creds, credCount);
if (_net.isConnected()) { if(_net.isConnected()) {
_net.syncNTP(); _net.syncNTP();
Serial.printf("[NET] WiFi:%s RSSI:%d IP:%s\n", Serial.printf("[NET] WiFi:%s RSSI:%d IP:%s\n", _net.getSSID().c_str(), _net.getRSSI(),
_net.getSSID().c_str(), _net.getRSSI(), _net.getIP().c_str());
_net.getIP().c_str());
_net.dnsCheck(NTFY_SERVER); _net.dnsCheck(NTFY_SERVER);
_net.tlsCheck(NTFY_SERVER); _net.tlsCheck(NTFY_SERVER);
} }
// Topic URLs // Topic URLs
_alertUrl = topicUrl(ALERT_TOPIC); _alertUrl = topicUrl(ALERT_TOPIC);
_silenceUrl = topicUrl(SILENCE_TOPIC); _silenceUrl = topicUrl(SILENCE_TOPIC);
_adminUrl = topicUrl(ADMIN_TOPIC); _adminUrl = topicUrl(ADMIN_TOPIC);
String sfx = _debug ? "_test" : ""; String sfx = _debug ? "_test" : "";
_statusUrl = String("https://") + NTFY_SERVER + "/" + STATUS_TOPIC + sfx; _statusUrl = String("https://") + NTFY_SERVER + "/" + STATUS_TOPIC + sfx;
Serial.printf("[CONFIG] ALERT_URL: %s\n", _alertUrl.c_str()); Serial.printf("[CONFIG] ALERT_URL: %s\n", _alertUrl.c_str());
Serial.printf("[CONFIG] SILENCE_URL: %s\n", _silenceUrl.c_str()); Serial.printf("[CONFIG] SILENCE_URL: %s\n", _silenceUrl.c_str());

24
libraries/KlubhausCore/src/DoorbellLogic.h
View File

@@ -1,18 +1,18 @@
#pragma once #pragma once
#include <Arduino.h>
#include <ArduinoJson.h>
#include "Config.h" #include "Config.h"
#include "ScreenState.h"
#include "DisplayManager.h" #include "DisplayManager.h"
#include "NetManager.h" #include "NetManager.h"
#include "ScreenState.h"
#include <Arduino.h>
#include <ArduinoJson.h>
class DoorbellLogic { class DoorbellLogic {
public: public:
explicit DoorbellLogic(DisplayManager* display); explicit DoorbellLogic(DisplayManager* display);
/// Call from setup(). Pass board-specific WiFi creds. /// Call from setup(). Pass board-specific WiFi creds.
void begin(const char* version, const char* boardName, void begin(const char* version, const char* boardName, const WiFiCred* creds, int credCount);
const WiFiCred* creds, int credCount);
/// Call from loop() — polls topics, runs timers, transitions state. /// Call from loop() — polls topics, runs timers, transitions state.
void update(); void update();
/// Transition out of BOOTED → SILENT. Call at end of setup(). /// Transition out of BOOTED → SILENT. Call at end of setup().
@@ -38,16 +38,16 @@ private:
String topicUrl(const char* base); String topicUrl(const char* base);
DisplayManager* _display; DisplayManager* _display;
NetManager _net; NetManager _net;
ScreenState _state; ScreenState _state;
const char* _version = ""; const char* _version = "";
const char* _board = ""; const char* _board = "";
bool _debug = false; bool _debug = false;
uint32_t _lastPollMs = 0; uint32_t _lastPollMs = 0;
uint32_t _lastHeartbeatMs = 0; uint32_t _lastHeartbeatMs = 0;
uint32_t _bootGraceEnd = 0; uint32_t _bootGraceEnd = 0;
String _alertUrl; String _alertUrl;
String _silenceUrl; String _silenceUrl;

16
libraries/KlubhausCore/src/IDisplayDriver.h
View File

@@ -3,15 +3,15 @@
struct TouchEvent { struct TouchEvent {
bool pressed = false; bool pressed = false;
int x = 0; int x = 0;
int y = 0; int y = 0;
}; };
struct HoldState { struct HoldState {
bool active = false; bool active = false;
bool started = false; bool started = false;
bool completed = false; bool completed = false;
float progress = 0.0f; // 0.0 – 1.0 float progress = 0.0f; // 0.0 – 1.0
}; };
/// Abstract display driver — implemented per-board. /// Abstract display driver — implemented per-board.
@@ -28,12 +28,12 @@ public:
// ── Touch ── // ── Touch ──
virtual TouchEvent readTouch() = 0; virtual TouchEvent readTouch() = 0;
/// Returns tile index at (x,y), or -1 if none. /// Returns tile index at (x,y), or -1 if none.
virtual int dashboardTouch(int x, int y) = 0; virtual int dashboardTouch(int x, int y) = 0;
/// Track a long-press gesture; returns progress/completion. /// Track a long-press gesture; returns progress/completion.
virtual HoldState updateHold(unsigned long holdMs) = 0; virtual HoldState updateHold(unsigned long holdMs) = 0;
/// Idle hint animation (e.g. pulsing ring) while alert is showing. /// Idle hint animation (e.g. pulsing ring) while alert is showing.
virtual void updateHint(int x, int y) = 0; virtual void updateHint(int x, int y) = 0;
virtual int width() = 0; virtual int width() = 0;
virtual int height() = 0; virtual int height() = 0;
}; };

6
libraries/KlubhausCore/src/KlubhausCore.h
View File

@@ -2,8 +2,8 @@
// Umbrella header — board sketches just #include <KlubhausCore.h> // Umbrella header — board sketches just #include <KlubhausCore.h>
#include "Config.h" #include "Config.h"
#include "ScreenState.h"
#include "IDisplayDriver.h"
#include "DisplayManager.h" #include "DisplayManager.h"
#include "NetManager.h"
#include "DoorbellLogic.h" #include "DoorbellLogic.h"
#include "IDisplayDriver.h"
#include "NetManager.h"
#include "ScreenState.h"

37
libraries/KlubhausCore/src/NetManager.cpp
View File

@@ -4,44 +4,44 @@
void NetManager::begin(const WiFiCred* creds, int count) { void NetManager::begin(const WiFiCred* creds, int count) {
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
for (int i = 0; i < count; i++) for(int i = 0; i < count; i++)
_multi.addAP(creds[i].ssid, creds[i].pass); _multi.addAP(creds[i].ssid, creds[i].pass);
Serial.println("[WIFI] Connecting..."); Serial.println("[WIFI] Connecting...");
unsigned long t0 = millis(); unsigned long t0 = millis();
while (_multi.run() != WL_CONNECTED) { while(_multi.run() != WL_CONNECTED) {
if (millis() - t0 > WIFI_CONNECT_TIMEOUT_MS) { if(millis() - t0 > WIFI_CONNECT_TIMEOUT_MS) {
Serial.println("[WIFI] Timeout!"); Serial.println("[WIFI] Timeout!");
return; return;
} }
delay(250); delay(250);
} }
Serial.printf("[WIFI] Connected: %s %s\n", Serial.printf("[WIFI] Connected: %s %s\n", getSSID().c_str(), getIP().c_str());
getSSID().c_str(), getIP().c_str());
} }
bool NetManager::checkConnection() { bool NetManager::checkConnection() {
if (WiFi.status() == WL_CONNECTED) return true; if(WiFi.status() == WL_CONNECTED)
return true;
Serial.println("[WIFI] Reconnecting..."); Serial.println("[WIFI] Reconnecting...");
return _multi.run(WIFI_CONNECT_TIMEOUT_MS) == WL_CONNECTED; return _multi.run(WIFI_CONNECT_TIMEOUT_MS) == WL_CONNECTED;
} }
bool NetManager::isConnected() { return WiFi.status() == WL_CONNECTED; } bool NetManager::isConnected() { return WiFi.status() == WL_CONNECTED; }
String NetManager::getSSID() { return WiFi.SSID(); } String NetManager::getSSID() { return WiFi.SSID(); }
String NetManager::getIP() { return WiFi.localIP().toString(); } String NetManager::getIP() { return WiFi.localIP().toString(); }
int NetManager::getRSSI() { return WiFi.RSSI(); } int NetManager::getRSSI() { return WiFi.RSSI(); }
// ── NTP ───────────────────────────────────────────────────── // ── NTP ─────────────────────────────────────────────────────
bool NetManager::syncNTP() { bool NetManager::syncNTP() {
Serial.println("[NTP] Starting sync..."); Serial.println("[NTP] Starting sync...");
if (!_ntp) _ntp = new NTPClient(_udp, "pool.ntp.org", 0, 60000); if(!_ntp)
_ntp = new NTPClient(_udp, "pool.ntp.org", 0, 60000);
_ntp->begin(); _ntp->begin();
_ntp->forceUpdate(); _ntp->forceUpdate();
_ntpReady = _ntp->isTimeSet(); _ntpReady = _ntp->isTimeSet();
Serial.printf("[NTP] %s: %s UTC\n", Serial.printf("[NTP] %s: %s UTC\n", _ntpReady ? "Synced" : "FAILED",
_ntpReady ? "Synced" : "FAILED", _ntpReady ? _ntp->getFormattedTime().c_str() : "--");
_ntpReady ? _ntp->getFormattedTime().c_str() : "--");
return _ntpReady; return _ntpReady;
} }
@@ -54,8 +54,7 @@ String NetManager::getTimeStr() {
bool NetManager::dnsCheck(const char* host) { bool NetManager::dnsCheck(const char* host) {
IPAddress ip; IPAddress ip;
bool ok = WiFi.hostByName(host, ip); bool ok = WiFi.hostByName(host, ip);
Serial.printf("[NET] DNS %s: %s\n", ok ? "OK" : "FAIL", Serial.printf("[NET] DNS %s: %s\n", ok ? "OK" : "FAIL", ok ? ip.toString().c_str() : "");
ok ? ip.toString().c_str() : "");
return ok; return ok;
} }
@@ -64,7 +63,8 @@ bool NetManager::tlsCheck(const char* host) {
c.setInsecure(); c.setInsecure();
c.setTimeout(HTTP_TIMEOUT_MS); c.setTimeout(HTTP_TIMEOUT_MS);
bool ok = c.connect(host, 443); bool ok = c.connect(host, 443);
if (ok) c.stop(); if(ok)
c.stop();
Serial.printf("[NET] TLS %s\n", ok ? "OK" : "FAIL"); Serial.printf("[NET] TLS %s\n", ok ? "OK" : "FAIL");
return ok; return ok;
} }
@@ -81,7 +81,8 @@ int NetManager::httpGet(const char* url, String& response) {
http.begin(client, url); http.begin(client, url);
int code = http.GET(); int code = http.GET();
if (code > 0) response = http.getString(); if(code > 0)
response = http.getString();
http.end(); http.end();
return code; return code;
} }

21
libraries/KlubhausCore/src/NetManager.h
View File

@@ -1,12 +1,13 @@
#pragma once #pragma once
#include "Config.h"
#include <Arduino.h> #include <Arduino.h>
#include <WiFi.h>
#include <WiFiMulti.h>
#include <WiFiClientSecure.h>
#include <HTTPClient.h> #include <HTTPClient.h>
#include <NTPClient.h> #include <NTPClient.h>
#include <WiFi.h>
#include <WiFiClientSecure.h>
#include <WiFiMulti.h>
#include <WiFiUdp.h> #include <WiFiUdp.h>
#include "Config.h"
class NetManager { class NetManager {
public: public:
@@ -16,9 +17,9 @@ public:
String getSSID(); String getSSID();
String getIP(); String getIP();
int getRSSI(); int getRSSI();
bool syncNTP(); bool syncNTP();
String getTimeStr(); String getTimeStr();
bool dnsCheck(const char* host); bool dnsCheck(const char* host);
@@ -30,8 +31,8 @@ public:
int httpPost(const char* url, const String& body); int httpPost(const char* url, const String& body);
private: private:
WiFiMulti _multi; WiFiMulti _multi;
WiFiUDP _udp; WiFiUDP _udp;
NTPClient* _ntp = nullptr; NTPClient* _ntp = nullptr;
bool _ntpReady = false; bool _ntpReady = false;
}; };

24
libraries/KlubhausCore/src/ScreenState.h
View File

@@ -1,19 +1,9 @@
#pragma once #pragma once
#include <Arduino.h> #include <Arduino.h>
enum class DeviceState { enum class DeviceState { BOOTED, SILENT, ALERTING, SILENCED };
BOOTED,
SILENT,
ALERTING,
SILENCED
};
enum class ScreenID { enum class ScreenID { BOOT, OFF, ALERT, DASHBOARD };
BOOT,
OFF,
ALERT,
DASHBOARD
};
struct ScreenState { struct ScreenState {
DeviceState deviceState = DeviceState::BOOTED; DeviceState deviceState = DeviceState::BOOTED;
@@ -35,9 +25,8 @@ struct ScreenState {
bool showDashboard = false; bool showDashboard = false;
}; };
inline const char* deviceStateStr(DeviceState s) inline const char* deviceStateStr(DeviceState s) {
{ switch(s) {
switch (s) {
case DeviceState::BOOTED: case DeviceState::BOOTED:
return "BOOTED"; return "BOOTED";
case DeviceState::SILENT: case DeviceState::SILENT:
@@ -50,9 +39,8 @@ inline const char* deviceStateStr(DeviceState s)
return "?"; return "?";
} }
inline const char* screenIdStr(ScreenID s) inline const char* screenIdStr(ScreenID s) {
{ switch(s) {
switch (s) {
case ScreenID::BOOT: case ScreenID::BOOT:
return "BOOT"; return "BOOT";
case ScreenID::OFF: case ScreenID::OFF: