administratie

.gitmodules

@@ -1,33 +1,37 @@
 [submodule "FW/leo_muziekdoos_esp32/lib/ESP8266Audio"]
 	path = FW/leo_muziekdoos_esp32/lib/ESP8266Audio
-	url = http://debianvm.local:3000/libs/ESP8266Audio.git
+	url = http://git.oldemans.nl/libs/ESP8266Audio.git
 	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/littleFS_esp32"]
 	path = FW/leo_muziekdoos_esp32/lib/littleFS_esp32
-	url = http://debianvm.local:3000/libs/LittleFS_esp32
+	url = http://git.oldemans.nl/libs/LittleFS_esp32
 [submodule "FW/leo_muziekdoos_esp32/lib/JCButton"]
 	path = FW/leo_muziekdoos_esp32/lib/JCButton
-	url = http://debianvm.local:3000/libs/JCButton.git
+	url = http://git.oldemans.nl/libs/JCButton.git
 	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/NDEF"]
 	path = FW/leo_muziekdoos_esp32/lib/NDEF
-	url = http://debianvm.local:3000/libs/rfid.NDEF.git
+	url = http://git.oldemans.nl/libs/rfid.NDEF.git
 [submodule "FW/leo_muziekdoos_esp32/lib/PN532"]
 	path = FW/leo_muziekdoos_esp32/lib/PN532
-	url = http://debianvm.local:3000/libs/rfid.PN532.git
+	url = http://git.oldemans.nl/libs/rfid.PN532.git
 	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/PN532_SPI"]
 	path = FW/leo_muziekdoos_esp32/lib/PN532_SPI
-	url = http://debianvm.local:3000/libs/rfid.PN532_SPI.git
+	url = http://git.oldemans.nl/libs/rfid.PN532_SPI.git
 [submodule "FW/leo_muziekdoos_esp32/lib/BatterySense"]
 	path = FW/leo_muziekdoos_esp32/lib/BatterySense
-	url = http://debianvm.local:3000/libs/BatterySense.git
+	url = http://git.oldemans.nl/libs/BatterySense.git
 	branch = master
 [submodule "CAD"]
 	path = CAD
-	url = http://debianvm.local:3000/projects_leo/muziekdooos_hardware.git
+	url = http://git.oldemans.nl/projects_leo/muziekdooos_hardware.git
 	branch = master
 [submodule "FW/leo_muziekdoos_esp32/lib/ADC_ADS1x15"]
 	path = FW/leo_muziekdoos_esp32/lib/ADC_ADS1x15
-	url = http://debianvm.local:3000/libs/ADC_ADS1X15.git
+	url = http://git.oldemans.nl/libs/ADC_ADS1X15.git
+	branch = master
+[submodule "CAD"]
+	path = CAD
+	url = http://git.oldemans.nl/projects_leo/muziekdooos_hardware.git
 	branch = master

FW/leo_muziekdoos_esp32/data/settings.json

@@ -25,8 +25,8 @@
     "AudioGain": 0.5,
     "ScanTimeout": 50,
     "HardwareVersion": 2,
-    "GameTimeout": 10000,
+    "GameTimeout": 20000,
-    "PowerTimeout": 420000,
+    "PowerTimeout": 30,
     "PowerOTADelay": 4000,
-    "Brightness": 20
+    "Brightness": 2
 }

FW/leo_muziekdoos_esp32/platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env]
-src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/>
+build_src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/>
 
 
 [env:esp32-pico]
@@ -22,7 +22,7 @@ lib_deps =
 	fastled/FastLED@^3.5.0
 	#robtillaart/AS5600 @ ^0.3.4
 	robtillaart/AS5600 @ ^0.3.6
-src_filter = ${env.build_src_filter}
+build_src_filter = ${env.build_src_filter}
 lib_ldf_mode = deep+
 build_flags = 
 	-DHARDWARE=2

FW/leo_muziekdoos_esp32/src/game.cpp

@@ -4,6 +4,7 @@
 
 bool newState = true;
 uint32_t idleTime = 0;
+uint32_t gameTimeout = 0; 
 
 
 
@@ -24,6 +25,7 @@ GameStates gameState = GameStates::stateInit;
 
 void initGame(void)
 {
+  gameTimeout = GetIntparam("GameTimeout", TIMEOUT_ARMED);
   log_i("Game: init: done");
 }
 
@@ -151,7 +153,7 @@ void handleGame(void)
     else
     {
       uint32_t now = millis();
-      if(now - idleTime > TIMEOUT_ARMED)
+      if(now - idleTime > gameTimeout)
       {
         log_i("Armed timed-out, clear current UID and go back to Idle");
         clearRFIDlastUID();

FW/leo_muziekdoos_esp32/src/game.h

@@ -9,7 +9,7 @@
 #include "power.h"
 
 #define TIMEOUT_IDLE        20000
-#define TIMEOUT_ARMED       10000
+#define TIMEOUT_ARMED       20000
 
 typedef enum{
   stateInit,

FW/leo_muziekdoos_esp32/src/power.h

@@ -7,9 +7,10 @@
 #include "audio.h"
 #include "ota.h"
 #include "led.h"
+#include "config.h"
 
 
-#define TIMEOUT_POWER        (7 * 1000 * 60) // 7 minutes timeout
+#define TIMEOUT_POWER        (30 * 1000 * 60) // 7 minutes timeout
 #define POWERBUTTONDELAY      400
 //#define BATTERYMEASUREDELAY  60000
 #define POWERBUTTONOTADELAY   4000

FW/leo_muziekdoos_esp32/src/sensor.cpp

@@ -92,7 +92,7 @@ bool CheckBattery(void)
   BatteryVoltage = battery.voltage();
   BatterySensor = battery.level(BatteryVoltage);
   digitalWrite(MEAS_EN, HIGH);
-  log_i("read batt, ticks=%d, raw=%4.2f, vbatt=%d, level=%d", battticks, vbattraw, BatteryVoltage, BatterySensor);
+  log_v("read batt, ticks=%d, raw=%4.2f, vbatt=%d, level=%d", battticks, vbattraw, BatteryVoltage, BatterySensor);
   if (BatteryVoltage < VBATTMIN)
   {
     uint32_t timeNow = millis();