From 1dba106920f014cd69c9b555d7af967a8639ba65 Mon Sep 17 00:00:00 2001
From: biologist79 <57354741+biologist79@users.noreply.github.com>
Date: Sun, 16 May 2021 19:32:45 +0200
Subject: [PATCH 1/5] Extended wifi-timeout
---
src/main.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 3ea2d56..af5999a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3455,12 +3455,12 @@ wl_status_t wifiManager(void) {
WiFi.begin(_ssid, _pwd);
uint8_t tryCount=0;
- while (WiFi.status() != WL_CONNECTED && tryCount <= 4) {
+ while (WiFi.status() != WL_CONNECTED && tryCount <= 12) {
delay(500);
Serial.print(F("."));
tryCount++;
wifiCheckLastTimestamp = millis();
- if (tryCount >= 4 && WiFi.status() == WL_CONNECT_FAILED) {
+ if (tryCount >= 6 && WiFi.status() == WL_CONNECT_FAILED) {
WiFi.begin(_ssid, _pwd); // ESP32-workaround (otherwise WiFi-connection sometimes fails)
}
}
@@ -5196,4 +5196,4 @@ void audio_icyurl(const char *info) { //homepage
void audio_lasthost(const char *info) { //stream URL played
snprintf(logBuf, serialLoglength, "lasthost : %s", info);
loggerNl(serialDebug, logBuf, LOGLEVEL_INFO);
-}
\ No newline at end of file
+}
From 0b0b9b92584d32d06f42635a62e86953d2b475c8 Mon Sep 17 00:00:00 2001
From: biologist79 <57354741+biologist79@users.noreply.github.com>
Date: Tue, 18 May 2021 08:32:06 +0200
Subject: [PATCH 2/5] Added link
---
PCBs/Headphone with PCM5102a and TDA1308/README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/PCBs/Headphone with PCM5102a and TDA1308/README.md b/PCBs/Headphone with PCM5102a and TDA1308/README.md
index 2876b26..f2f2c50 100644
--- a/PCBs/Headphone with PCM5102a and TDA1308/README.md
+++ b/PCBs/Headphone with PCM5102a and TDA1308/README.md
@@ -2,5 +2,7 @@
This is a pcb, that was kindly provided by a user of my ESPuino. It makes use of a DAC named 'PCM5102A' with a TDA1308 as amp. PCM5102A supports I2S, so it can connected in parallel to MAX98357a to the I2S-pins BCLK, LRC and DIN. Of course, it needs 3.3V and GND, too. Please note that SMD-technique is used.
The 6th pin of connector J1 is used to indicate whether there's a plug or not. That means if there is a plug, this pin is pulled to GND and therefore can be used to connect to MAX98357.SD. Doing so will mute MAX's amp and vice versa. Of course you need a special [headphone jack](https://www.conrad.de/de/p/cliff-fcr1295-klinken-steckverbinder-3-5-mm-buchse-einbau-horizontal-polzahl-3-stereo-schwarz-1-st-705830.html) to use this feature. Additionaly this 6th pin can be connected to the ESP32 in order to make use of the feature `HEADPHONE_ADJUST_ENABLE`. Doing so can optionally limit the headphone's maximum volume (configureable via GUI).
+Please note: the files in my GitHub-repository may be outdated regarding this PCB. Please have a look [here](https://u.pcloud.link/publink/show?code=kZjJVKkZOYso9U99qILNOMm5ehliaFtxldWX).
+
## Disclaimer
-PCB-circuit is provided 'as is' without warranty. As previously stated it was kindly provided by a user and I only can give limited support to it. However: it runs fine without any problems in my ESPuinos.
\ No newline at end of file
+PCB-circuit is provided 'as is' without warranty. As previously stated it was kindly provided by a user and I only can give limited support to it. However: it runs fine without any problems in my ESPuinos.
From 836ad2f2e9acf617a69cad50baf2b275ac4c16d1 Mon Sep 17 00:00:00 2001
From: biologist79 <57354741+biologist79@users.noreply.github.com>
Date: Thu, 17 Jun 2021 21:54:44 +0200
Subject: [PATCH 3/5] Fixing floating HP_DETECT
---
src/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main.cpp b/src/main.cpp
index af5999a..7908820 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4744,7 +4744,7 @@ void setup() {
}
#ifdef HEADPHONE_ADJUST_ENABLE
- pinMode(HP_DETECT, INPUT);
+ pinMode(HP_DETECT, INPUT_PULLUP);
headphoneLastDetectionState = digitalReadFromAll(HP_DETECT);
#endif
From eba1418ef2c80426de79e4f40cc36d7f5abd56fc Mon Sep 17 00:00:00 2001
From: biologist79 <57354741+biologist79@users.noreply.github.com>
Date: Mon, 5 Jul 2021 10:15:19 +0200
Subject: [PATCH 4/5] News: refactoring-branch will soon become the new master
---
README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2d64dbb..7f42125 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
# ESPuino - rfid-based musiccontroller based on ESP32 with I2S-DAC-support
-## NEWS
+## News
+I started this project back in october 2019 and never expected it to become that large. The project grew and grew - so did main.cpp. So it was about time to have it split into modules. This was done in march/april. After spending some time on tests, improvements and implementing new features, [refactoring-branch](https://github.com/biologist79/ESPuino/tree/refactoring) will soon (in july 2021) become the new master whereas the current master will become a new branch named old. It will be kept as reference but won't by maintained anymore.
+Please be advised that moving to refactoring-branch will re-arrange ESP32's partition. All things to know are described [here](https://forum.espuino.de/t/wechsel-zum-refactoring-branch-was-ist-zu-beachten/510) in german language.
+
+## Forum
* EN: I've set up a primarily German-speaking community with much documentation. Also an international corner for non-German-speakers is available at https://forum.espuino.de. Github-Login can be used there but it's not mandatory.
* DE: Ich habe ein primär deutschsprachiges Forum aufgesetzt, welches ich mit reichlich Doku versehen habe. Würde mich freuen, euch dort zu sehen: https://forum.espuino.de. Ihr könnt euch dort mit eurem Github-Login einloggen, jedoch auch "normal" anmelden. Dokumenation findet ihr insbesondere hier: https://forum.espuino.de/c/dokumentation/anleitungen/10
## Build status
From 15a06350b94ca27ba7d88401436a90da2c068d50 Mon Sep 17 00:00:00 2001
From: biologist79 <57354741+biologist79@users.noreply.github.com>
Date: Thu, 8 Jul 2021 18:52:05 +0200
Subject: [PATCH 5/5] Corrected example for dynamic button layout
---
src/settings.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/settings.h b/src/settings.h
index 4786432..18bd685 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -91,7 +91,7 @@
Multi-buttons [short only] (examples):
BUTTON_MULTI_01 => Buttons 0+1 (NEXT_BUTTON + PREVIOUS_BUTTON) pressed in parallel
- BUTTON_MULTI_23 => Buttons 0+2 (NEXT_BUTTON + PAUSEPLAY_BUTTON) pressed in parallel
+ BUTTON_MULTI_12 => Buttons 1+2 (PREV_BUTTON + PAUSEPLAY_BUTTON) pressed in parallel
Actions:
To all of those buttons, an action can be assigned freely.
@@ -221,4 +221,4 @@
static const char topicBatteryVoltage[] PROGMEM = "State/ESPuino/Voltage";
#endif
#endif
-#endif
\ No newline at end of file
+#endif