From aaa75c0c88c816eb7b2fa90c856f590a1e052574 Mon Sep 17 00:00:00 2001
From: Willem Oldemans <willem@oldemans.nl>
Date: Fri, 30 Sep 2022 10:25:21 +0200
Subject: [PATCH] build fixes

---
 FW/leo_muziekdoos_esp32/lib/JCButton   | 2 +-
 FW/leo_muziekdoos_esp32/lib/PN532      | 2 +-
 FW/leo_muziekdoos_esp32/src/sensor.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FW/leo_muziekdoos_esp32/lib/JCButton b/FW/leo_muziekdoos_esp32/lib/JCButton
index 91ddc75..fb3743e 160000
--- a/FW/leo_muziekdoos_esp32/lib/JCButton
+++ b/FW/leo_muziekdoos_esp32/lib/JCButton
@@ -1 +1 @@
-Subproject commit 91ddc75ed7bf2438e051cd50a10ac6e7f3110037
+Subproject commit fb3743eb8d138d2a069092ca2cb4ced1d7892cc2
diff --git a/FW/leo_muziekdoos_esp32/lib/PN532 b/FW/leo_muziekdoos_esp32/lib/PN532
index 47ec860..e88576e 160000
--- a/FW/leo_muziekdoos_esp32/lib/PN532
+++ b/FW/leo_muziekdoos_esp32/lib/PN532
@@ -1 +1 @@
-Subproject commit 47ec8602987d177e7326d5788be38be9a293af6c
+Subproject commit e88576ed9339ef469dbc334cc7404fd6eab9e6eb
diff --git a/FW/leo_muziekdoos_esp32/src/sensor.cpp b/FW/leo_muziekdoos_esp32/src/sensor.cpp
index 426b85e..fbcdaa8 100644
--- a/FW/leo_muziekdoos_esp32/src/sensor.cpp
+++ b/FW/leo_muziekdoos_esp32/src/sensor.cpp
@@ -71,7 +71,7 @@ bool CheckBattery(void)
 {
   int16_t battticks = ADS.readADC(MEAS_ADC);
   float vbattraw = ADS.toVoltage(battticks);
-  BatteryVoltage = battery.voltage(vbattraw * 1000);
+  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);