6 Commits

Author SHA1 Message Date
30db59d4a8 Merge branch 'as5600' 2023-04-16 21:35:19 +02:00
6dca8972e3 added submodule CAD 2023-01-01 12:16:24 +01:00
3af2487843 added CAD submoodule 2023-01-01 10:41:23 +01:00
8ad62b3fc1 moved CAD to seperate repo 2023-01-01 10:01:56 +01:00
c075d1a812 firmware updates 2022-12-31 11:04:47 +01:00
c6e9e8b0ba update gitmodules 2022-12-31 11:02:35 +01:00
3 changed files with 23 additions and 10 deletions

22
.gitmodules vendored
View File

@@ -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

View File

@@ -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();

View File

@@ -17,6 +17,15 @@
#define HALLINTERVAL 100
#define HALLTHRESHOLD 5
static String HALLSENESORSTATES_ENUM2STR[HALL_LAST]
{
"Hall Idle",
"Hall Increasing",
"Hall Tipover",
"Hall decreasing",
"Hall tipUnder"
};
void initSensor(void);
void handleBatterySensor(void);
void handleHallSensor(void);