"; html += GNAME[i];
- html += " ";
- for (uint8_t m = 0; m < 12; m++) {
- html += ""
-
- // ── Tama panel ────────────────────────────────────────────────────
- "Tamagotchi "
- ""
- "
"
- "
Glod: "
- "
"
- "
"
- "
"
- "
"
- "
Radosc: "
- "
"
- "
"
- "
"
- "
"
- "
Czystosc: "
- "
"
- "
"
- "
"
- "
"
- "Nakarm "
- "Pobaw sie "
- "Umyj "
- "
"
- "
"
-
- ""
-
- "Pogoda "
- ""
- "Ladowanie..."
- "
"
- ""
- "
"
- ""
-
- "Test nastroju "
- ""
- "Normal "
- "Happy "
- "Sleepy "
- "Surprised "
- "Angry "
- "Sad "
- "Excited "
- "Wink L "
- "Wink R "
- "Hungry "
- "Playful "
- "Dirty "
- "
"
- "
"
- ""
-
- "GET /api/config POST /api/config (JSON)"
- " | GET /api/tama POST /api/tama/{feed,play,clean}"
- " | GET /api/weather POST /weather/save"
- " | POST /api/mood/test?m={0-11}
"
- "";
- return html;
-}
-
-void setupHttpServer()
-{
- httpServer.on("/", HTTP_GET, [](AsyncWebServerRequest *req)
- { req->send(200, "text/html; charset=utf-8", buildHtml()); });
-
- httpServer.on("/save", HTTP_POST, [](AsyncWebServerRequest *req) {
- for (uint8_t i = 0; i < NUM_GESTURES; i++) {
- String urlKey = String("url_") + GKEY[i];
- String moodKey = String("mood_") + GKEY[i];
- String actKey = String("act_") + GKEY[i];
- String enKey = String("en_") + GKEY[i];
- if (req->hasParam(urlKey, true))
- strncpy(gConfig[i].url, req->getParam(urlKey, true)->value().c_str(),
- sizeof(gConfig[i].url) - 1);
- if (req->hasParam(moodKey, true))
- gConfig[i].mood = (uint8_t)req->getParam(moodKey, true)->value().toInt();
- if (req->hasParam(actKey, true))
- gConfig[i].action = (uint8_t)req->getParam(actKey, true)->value().toInt();
- gConfig[i].enabled = req->hasParam(enKey, true);
- }
- saveConfig();
- req->redirect("/");
- });
-
- httpServer.on("/api/config", HTTP_GET, [](AsyncWebServerRequest *req) {
- JsonDocument doc;
- for (uint8_t i = 0; i < NUM_GESTURES; i++) {
- doc[GNAME[i]]["url"] = gConfig[i].url;
- doc[GNAME[i]]["mood"] = gConfig[i].mood;
- doc[GNAME[i]]["action"] = gConfig[i].action;
- doc[GNAME[i]]["enabled"] = gConfig[i].enabled;
- }
- String out; serializeJsonPretty(doc, out);
- req->send(200, "application/json", out);
- });
-
- httpServer.on("/api/config", HTTP_POST,
- [](AsyncWebServerRequest *req) {},
- nullptr,
- [](AsyncWebServerRequest *req, uint8_t *data, size_t len, size_t, size_t) {
- String body; body.reserve(len);
- for (size_t i = 0; i < len; i++) body += (char)data[i];
- JsonDocument doc;
- if (deserializeJson(doc, body) != DeserializationError::Ok) {
- req->send(400, "application/json", "{\"error\":\"invalid JSON\"}"); return;
- }
- for (uint8_t i = 0; i < NUM_GESTURES; i++) {
- if (!doc[GNAME[i]].is()) continue;
- JsonObject g = doc[GNAME[i]];
- if (g["url"].is())
- strncpy(gConfig[i].url, g["url"] | "", sizeof(gConfig[i].url) - 1);
- if (g["mood"].is()) gConfig[i].mood = (uint8_t)(int)g["mood"];
- if (g["action"].is()) gConfig[i].action = (uint8_t)(int)g["action"];
- if (g["enabled"].is()) gConfig[i].enabled = (bool)g["enabled"];
- }
- saveConfig();
- req->send(200, "application/json", "{\"ok\":true}");
- });
-
- httpServer.on("/config.json", HTTP_GET, [](AsyncWebServerRequest *req) {
- JsonDocument doc;
- for (uint8_t i = 0; i < NUM_GESTURES; i++) {
- doc[GNAME[i]]["url"] = gConfig[i].url;
- doc[GNAME[i]]["mood"] = gConfig[i].mood;
- doc[GNAME[i]]["action"] = gConfig[i].action;
- doc[GNAME[i]]["enabled"] = gConfig[i].enabled;
- }
- String out; serializeJsonPretty(doc, out);
- req->send(200, "application/json", out);
- });
-
- // GET /api/tama — current needs state
- httpServer.on("/api/tama", HTTP_GET, [](AsyncWebServerRequest *req) {
- char buf[64];
- snprintf(buf, sizeof(buf),
- "{\"hunger\":%d,\"happiness\":%d,\"hygiene\":%d}",
- tama.hunger, tama.happiness, tama.hygiene);
- req->send(200, "application/json", buf);
- });
-
- // POST /api/tama/feed — nakarm
- httpServer.on("/api/tama/feed", HTTP_POST, [](AsyncWebServerRequest *req) {
- uint32_t now = millis();
- tamaFeed(tama);
- setBuddyMood(buddy, MOOD_HAPPY, now, 4000);
- overlayAction = ACTION_FEED;
- overlayUntil = now + 3000;
- Serial.printf("[Web] Feed | H:%d P:%d C:%d\n",
- tama.hunger, tama.happiness, tama.hygiene);
- char buf[64];
- snprintf(buf, sizeof(buf),
- "{\"ok\":true,\"msg\":\"Mniam! Glod: %d%%\",\"hunger\":%d}",
- tama.hunger, tama.hunger);
- req->send(200, "application/json", buf);
- });
-
- // POST /api/tama/play — pobaw sie
- httpServer.on("/api/tama/play", HTTP_POST, [](AsyncWebServerRequest *req) {
- uint32_t now = millis();
- tamaPlay(tama);
- setBuddyMood(buddy, MOOD_EXCITED, now, 4000);
- overlayAction = ACTION_PLAY;
- overlayUntil = now + 3000;
- Serial.printf("[Web] Play | H:%d P:%d C:%d\n",
- tama.hunger, tama.happiness, tama.hygiene);
- char buf[64];
- snprintf(buf, sizeof(buf),
- "{\"ok\":true,\"msg\":\"Grajmy! Radosc: %d%%\",\"happiness\":%d}",
- tama.happiness, tama.happiness);
- req->send(200, "application/json", buf);
- });
-
- // POST /api/tama/clean — umyj
- httpServer.on("/api/tama/clean", HTTP_POST, [](AsyncWebServerRequest *req) {
- uint32_t now = millis();
- tamaClean(tama);
- setBuddyMood(buddy, MOOD_SURPRISED, now, 3000);
- overlayAction = ACTION_CLEAN;
- overlayUntil = now + 3000;
- Serial.printf("[Web] Clean | H:%d P:%d C:%d\n",
- tama.hunger, tama.happiness, tama.hygiene);
- char buf[64];
- snprintf(buf, sizeof(buf),
- "{\"ok\":true,\"msg\":\"Mycie! Czystosc: %d%%\",\"hygiene\":%d}",
- tama.hygiene, tama.hygiene);
- req->send(200, "application/json", buf);
- });
-
- // POST /api/mood/test?m=N — ustaw nastoj testowy na 10s
- httpServer.on("/api/mood/test", HTTP_POST, [](AsyncWebServerRequest *req) {
- uint32_t now = millis();
- uint8_t m = 0;
- if (req->hasParam("m"))
- m = (uint8_t)constrain(req->getParam("m")->value().toInt(), 0, 11);
- setBuddyMood(buddy, (Mood)m, now, 10000);
- Serial.printf("[Web] Mood test: %s (%d)\n", MOOD_LABELS[m], m);
- char buf[64];
- snprintf(buf, sizeof(buf), "{\"ok\":true,\"msg\":\"Nastoj: %s (10s)\"}", MOOD_LABELS[m]);
- req->send(200, "application/json", buf);
- });
-
- // GET /api/weather — current weather data + config
- httpServer.on("/api/weather", HTTP_GET, [](AsyncWebServerRequest *req) {
- char buf[180];
- snprintf(buf, sizeof(buf),
- "{\"valid\":%s,\"temp\":%d,\"pressure\":%d,\"icon\":%d,"
- "\"city\":\"%s\",\"interval\":%d,\"duration\":%d}",
- weatherData.valid ? "true" : "false",
- (int)weatherData.temp, (int)weatherData.pressure,
- (int)weatherData.icon,
- weatherCfg.city,
- (int)weatherCfg.intervalSec, (int)weatherCfg.durationSec);
- req->send(200, "application/json", buf);
- });
-
- // POST /weather/save — update weather config from HTML form
- httpServer.on("/weather/save", HTTP_POST, [](AsyncWebServerRequest *req) {
- if (req->hasParam("city", true))
- strncpy(weatherCfg.city, req->getParam("city", true)->value().c_str(),
- sizeof(weatherCfg.city) - 1);
- if (req->hasParam("interval", true))
- weatherCfg.intervalSec = (uint16_t)req->getParam("interval", true)->value().toInt();
- if (req->hasParam("duration", true))
- weatherCfg.durationSec = (uint16_t)req->getParam("duration", true)->value().toInt();
- saveWeatherConfig();
- // Reset show timer so new config takes effect immediately on next cycle
- weatherNextShow = millis() + weatherCfg.intervalSec * 1000UL;
- triggerWeatherFetch(); // fetch right away with new city/key
- req->redirect("/");
- });
-
- httpServer.begin();
- Serial.printf("[HTTP] Server na http://%s/\n", WiFi.localIP().toString().c_str());
-}
// ── WiFi ──────────────────────────────────────────────────────────────────────
static void splash(const char *l1, const char *l2 = "", const char *l3 = "")
@@ -1271,6 +990,13 @@ void executeAction(uint8_t idx)
tamaClean(tama);
setBuddyMood(buddy, MOOD_SURPRISED, now, 3000);
dur = 3000; break;
+ case ACTION_RESTART:
+ g_confirmPending = true;
+ g_confirmAction = ACTION_RESTART;
+ g_confirmUntil = millis() + 10000UL;
+ setBuddyMood(buddy, MOOD_SURPRISED, now, 0);
+ Serial.println("[Action] Restart — czeka na potwierdzenie");
+ return; // nie ustawia overlayAction
default: break;
}
@@ -1281,10 +1007,48 @@ void executeAction(uint8_t idx)
tama.hunger, tama.happiness, tama.hygiene);
}
+static void executeConfirmedGesture(int8_t idx)
+{
+ uint32_t now = millis();
+ Serial.printf("[Action] Gest '%s' potwierdzony\n", GNAME[idx]);
+ executeAction((uint8_t)idx);
+ if (gConfig[idx].mood > 0)
+ setBuddyMood(buddy, (Mood)gConfig[idx].mood, now, 4000);
+ else
+ setBuddyMood(buddy, DEFAULT_MOOD[idx], now, DEFAULT_MOOD_DUR[idx]);
+ if (gConfig[idx].enabled && strlen(gConfig[idx].url) > 0)
+ fireWebhook((uint8_t)idx);
+}
+
void handleGesture(Gesture g)
{
if (g == GES_NONE) return;
uint32_t now = millis();
+
+ // Intercept gestures during confirmation mode
+ if (g_confirmPending) {
+ buddy.lastEvent = now;
+ if (g_dimmed) setDim(false);
+ if (g == GES_RIGHT) {
+ g_confirmPending = false;
+ if (g_confirmGestIdx >= 0) {
+ int8_t idx = g_confirmGestIdx;
+ g_confirmGestIdx = -1;
+ executeConfirmedGesture(idx);
+ } else {
+ executeConfirmedAction(g_confirmAction);
+ }
+ } else if (g == GES_LEFT) {
+ g_confirmPending = false;
+ g_confirmAction = ACTION_NONE;
+ g_confirmGestIdx = -1;
+ setBuddyMood(buddy, MOOD_NORMAL, now, 0);
+ Serial.println("[Action] Anulowano");
+ }
+ // all other gestures ignored during confirmation
+ return;
+ }
+
buddy.lastEvent = now;
if (g_dimmed) setDim(false);
@@ -1292,6 +1056,18 @@ void handleGesture(Gesture g)
if (idx < 0 || idx >= NUM_GESTURES) return;
Serial.printf("[Gest] %s\n", GNAME[idx]);
+
+ // Gesture-level confirmation: defer all effects to user gesture RIGHT
+ if (gConfig[idx].confirm) {
+ g_confirmPending = true;
+ g_confirmGestIdx = (int8_t)idx;
+ g_confirmAction = ACTION_NONE;
+ g_confirmUntil = now + 10000UL;
+ setBuddyMood(buddy, MOOD_SURPRISED, now, 0);
+ Serial.printf("[Action] '%s' czeka na potwierdzenie\n", GNAME[idx]);
+ return;
+ }
+
executeAction(idx);
if (gConfig[idx].mood > 0)
@@ -1323,7 +1099,26 @@ void setup()
else Serial.println("[PAJ7620] Nie znaleziono");
connectWiFi();
- if (WiFi.status() == WL_CONNECTED) setupHttpServer();
+ if (WiFi.status() == WL_CONNECTED) {
+ static HttpServerCtx httpCtx;
+ httpCtx.server = &httpServer;
+ httpCtx.gConfig = gConfig;
+ httpCtx.buddy = &buddy;
+ httpCtx.tama = &tama;
+ httpCtx.weatherCfg = &weatherCfg;
+ httpCtx.weatherData = &weatherData;
+ httpCtx.overlayAction = &overlayAction;
+ httpCtx.overlayUntil = &overlayUntil;
+ httpCtx.weatherNextShow = &weatherNextShow;
+ httpCtx.weatherShowUntil = &weatherShowUntil;
+ httpCtx.weatherCachedCity = weatherCachedCity;
+ httpCtx.alertMsg = g_alertMsg;
+ httpCtx.wifiSsid = WIFI_SSID;
+ httpCtx.cbSaveConfig = saveConfig;
+ httpCtx.cbSaveWeatherConfig = saveWeatherConfig;
+ httpCtx.cbTriggerWeatherFetch = triggerWeatherFetch;
+ setupHttpServer(&httpCtx);
+ }
}
// ── Loop ──────────────────────────────────────────────────────────────────────
@@ -1347,6 +1142,19 @@ void loop()
setDim(night && idle);
}
+ // HTTP socket watchdog — wyczerpany pool: reset stosu WiFi zamiast restartu urządzenia
+ if (httpFailStreak >= HTTP_FAIL_RESTART) {
+ Serial.printf("[HTTP] %d kolejnych bledow connect — reset WiFi (zachowanie uptime)\n",
+ (int)httpFailStreak);
+ httpFailStreak = 0;
+ weatherRetryAfter = now + 30000UL; // 30s przerwa po resecie
+ wifiResettingUntil = now + 20000UL; // 20s blokada nowych HTTP tasks
+ WiFi.disconnect(false); // rozłącz, zachowaj ssid/pass w RAM
+ delay(300);
+ WiFi.begin(WIFI_SSID, WIFI_PASS); // podnosi interfejs + czyści socket pool lwIP
+ Serial.println("[HTTP] WiFi begin po resecie — reconnect w toku");
+ }
+
// WiFi watchdog: próba reconnect co 30 s, restart po 5 min bez połączenia
static uint32_t lastWifiCheck = 0;
static uint32_t wifiDownSince = 0; // 0 = połączony lub nie śledzony
@@ -1371,7 +1179,8 @@ void loop()
if (weatherCfg.intervalSec > 0 && now >= weatherNextShow) {
weatherShowUntil = now + weatherCfg.durationSec * 1000UL;
weatherNextShow = now + weatherCfg.intervalSec * 1000UL;
- if (!weatherData.valid || now - weatherLastFetch >= 60000UL) {
+ if (now >= weatherRetryAfter &&
+ (!weatherData.valid || now - weatherLastFetch >= 60000UL)) {
weatherLastFetch = now;
triggerWeatherFetch();
}
diff --git a/tools/svg_to_xbm.sh b/tools/svg_to_xbm.sh
new file mode 100755
index 0000000..c14302f
--- /dev/null
+++ b/tools/svg_to_xbm.sh
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+# Convert assets/svg/cloud.svg to XBM C headers in src/bitmaps/
+# Requires: rsvg-convert, magick (ImageMagick 7)
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+SVG="$PROJECT_DIR/assets/svg/cloud.svg"
+OUT_DIR="$PROJECT_DIR/src/bitmaps"
+
+mkdir -p "$OUT_DIR"
+
+convert_cloud() {
+ local W="$1" H="$2" VARNAME="$3" OUTFILE="$4"
+ local TMP_PNG TMP_XBM
+ TMP_PNG=$(mktemp /tmp/cloud_XXXXXX.png)
+ TMP_XBM=$(mktemp /tmp/cloud_XXXXXX.xbm)
+
+ # SVG → PNG (rsvg-convert scales, magick flattens on white + thresholds to 1-bit)
+ rsvg-convert -w "$W" -h "$H" "$SVG" \
+ | magick - -background white -flatten -threshold 50% "$TMP_PNG"
+
+ # PNG → XBM
+ magick "$TMP_PNG" "$TMP_XBM"
+
+ # XBM → C header via Python (handles edge cases in XBM formatting)
+ python3 - "$TMP_XBM" "$W" "$H" "$VARNAME" "$OUT_DIR/$OUTFILE" <<'PYEOF'
+import sys, re
+
+xbm_file, W, H, varname, outfile = sys.argv[1:]
+W, H = int(W), int(H)
+
+with open(xbm_file) as f:
+ content = f.read()
+
+# Remove #define lines
+content = re.sub(r'#define\s+\S+\s+\d+\n?', '', content)
+# Replace "static char NAME[] =" with our typed array
+content = re.sub(r'static\s+char\s+\S+\s*=', f'static const uint8_t {varname}_XBM[] =', content)
+content = content.strip()
+
+header = f"""#pragma once
+#include
+// W={W}, H={H} -- generated from assets/svg/cloud.svg
+#define {varname}_W {W}
+#define {varname}_H {H}
+{content}
+"""
+with open(outfile, 'w') as f:
+ f.write(header)
+print(f"[svg_to_xbm] Generated {outfile} ({W}x{H})")
+PYEOF
+
+ rm -f "$TMP_PNG" "$TMP_XBM"
+}
+
+convert_cloud 26 17 "CLOUD" "cloud_xbm.h"
+convert_cloud 20 13 "CLOUD_SMALL" "cloud_small_xbm.h"
+
+# Alert icon (circle with !) — rendered as both eyes for MOOD_ALERT
+convert_svg() {
+ local SVG_SRC="$1" W="$2" H="$3" VARNAME="$4" OUTFILE="$5"
+ local TMP_PNG TMP_XBM
+ TMP_PNG=$(mktemp /tmp/icon_XXXXXX.png)
+ TMP_XBM=$(mktemp /tmp/icon_XXXXXX.xbm)
+
+ rsvg-convert -w "$W" -h "$H" "$SVG_SRC" \
+ | magick - -background white -flatten -threshold 50% "$TMP_PNG"
+ magick "$TMP_PNG" "$TMP_XBM"
+
+ python3 - "$TMP_XBM" "$W" "$H" "$VARNAME" "$OUT_DIR/$OUTFILE" "$SVG_SRC" <<'PYEOF'
+import sys, re
+xbm_file, W, H, varname, outfile, src = sys.argv[1:]
+W, H = int(W), int(H)
+with open(xbm_file) as f:
+ content = f.read()
+content = re.sub(r'#define\s+\S+\s+\d+\n?', '', content)
+content = re.sub(r'static\s+char\s+\S+\s*=', f'static const uint8_t {varname}_XBM[] =', content)
+import os
+header = f"""#pragma once
+#include
+// W={W}, H={H} -- generated from {os.path.basename(src)}
+#define {varname}_W {W}
+#define {varname}_H {H}
+{content.strip()}
+"""
+with open(outfile, 'w') as f:
+ f.write(header)
+print(f"[svg_to_xbm] Generated {outfile} ({W}x{H})")
+PYEOF
+
+ rm -f "$TMP_PNG" "$TMP_XBM"
+}
+
+convert_svg "$PROJECT_DIR/assets/svg/alert.svg" 26 26 "ALERT" "alert_xbm.h"
+
+echo "[svg_to_xbm] Done."