From 6daf89c1f8794d8fa6d6dbaee36cadae967f8f91 Mon Sep 17 00:00:00 2001
From: Willem Oldemans <willem@oldemans.nl>
Date: Fri, 30 Sep 2022 09:49:47 +0200
Subject: [PATCH] merge new remote#2

---
 FW/leo_muziekdoos_esp32/platformio.ini | 2 +-
 FW/leo_muziekdoos_esp32/src/main.cpp   | 1 +
 FW/leo_muziekdoos_esp32/src/ota.cpp    | 1 +
 FW/leo_muziekdoos_esp32/src/ota.h      | 4 +++-
 FW/leo_muziekdoos_esp32/src/power.cpp  | 5 +++++
 FW/leo_muziekdoos_esp32/src/power.h    | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/FW/leo_muziekdoos_esp32/platformio.ini b/FW/leo_muziekdoos_esp32/platformio.ini
index 565f444..fc5cec6 100644
--- a/FW/leo_muziekdoos_esp32/platformio.ini
+++ b/FW/leo_muziekdoos_esp32/platformio.ini
@@ -23,4 +23,4 @@ build_flags =
 	-DCORE_DEBUG_LEVEL=4
 	-DNDEF_DEBUG=1
 upload_protocol = espota
-upload_port = muziekdoos.local
\ No newline at end of file
+upload_port = muziekdoos.local
diff --git a/FW/leo_muziekdoos_esp32/src/main.cpp b/FW/leo_muziekdoos_esp32/src/main.cpp
index 4f52cbf..23d2944 100644
--- a/FW/leo_muziekdoos_esp32/src/main.cpp
+++ b/FW/leo_muziekdoos_esp32/src/main.cpp
@@ -15,6 +15,7 @@ uint32_t looptime = 0;
 void setup()
 {
   initPower();
+  
   Serial.begin(115200);
   Serial.setDebugOutput(true);
   log_i("muziekdoos v2");
diff --git a/FW/leo_muziekdoos_esp32/src/ota.cpp b/FW/leo_muziekdoos_esp32/src/ota.cpp
index ed51bd2..c3335c0 100644
--- a/FW/leo_muziekdoos_esp32/src/ota.cpp
+++ b/FW/leo_muziekdoos_esp32/src/ota.cpp
@@ -164,6 +164,7 @@ void OtaProcess_class::active(void)
   {
     log_i("Otastate = active(=>idle)");
     m_newState = false;
+    setProcessState(processIdle);
   }
   idle();
 }
diff --git a/FW/leo_muziekdoos_esp32/src/ota.h b/FW/leo_muziekdoos_esp32/src/ota.h
index 969dd52..afd2630 100644
--- a/FW/leo_muziekdoos_esp32/src/ota.h
+++ b/FW/leo_muziekdoos_esp32/src/ota.h
@@ -1,10 +1,12 @@
 #pragma once
-#include "ArduinoOTA.h"
 #include "secrets.h"
 #include "defines.h"
 #include "process.h"
 #include "config.h"
+#include "power.h"
 
+#include "ArduinoOTA.h"
+#include "JC_Button.h"
 #include "LITTLEFS.h"
 
 #define WIFICONNECTINTERVAL 1000
diff --git a/FW/leo_muziekdoos_esp32/src/power.cpp b/FW/leo_muziekdoos_esp32/src/power.cpp
index 2fa8365..b32a108 100644
--- a/FW/leo_muziekdoos_esp32/src/power.cpp
+++ b/FW/leo_muziekdoos_esp32/src/power.cpp
@@ -12,6 +12,11 @@ POWERSTATES lastState = off;
 Button buttonPower(PWR_BTN, 250UL, 1U, 0);
 extern OtaProcess_class ota;
 
+Button* getPowerButton()
+{
+  return &buttonPower;
+}
+
 void initPowerOn(void)
 {
   pinMode(PWR_HOLD, OUTPUT);
diff --git a/FW/leo_muziekdoos_esp32/src/power.h b/FW/leo_muziekdoos_esp32/src/power.h
index 4330cd0..1ea0b68 100644
--- a/FW/leo_muziekdoos_esp32/src/power.h
+++ b/FW/leo_muziekdoos_esp32/src/power.h
@@ -36,5 +36,7 @@ void PowerKeepAlive(void);
 void initBattery(void);
 bool handleBattery(void);
 
+Button* getPowerButton();
+
 void initPower(void);
 void handlePower(void);
\ No newline at end of file