Fix merge issues

biologist79 · Oct 6, 2024 · 6697f5e · 6697f5e
2 parents cf536de + 7ba93fa
commit 6697f5e
Show file tree

Hide file tree

Showing 23 changed files with 1,881 additions and 1,713 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@ d1f82a7c93f160f9197c8b4e14e5a984ac6f9449
 
 # Code re-formatting with editorconf
 3a562b67e3ca0f98ed128650440323c3b2d5fc78
+
+# Code re-formatting for html+json
+ee16ea64767c28420d3711bfe7b4a81c71f1e8bf
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -40,15 +40,15 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Cache PlatformIO
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.platformio
           key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
-      - name: Setup Python 3.9
+      - name: Setup Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Install PlatformIO Core
         run: |
           pip install -U setuptools platformio

diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,24 @@
 # Changelog
 
+
 ## DEV-branch
 
+* 29.09.2024: Prepare for Arduino 3.0.5
+* 27.09.2024: PlatformIO package 6.9.0
+
+
+
+
+## Version 2.3 (23.09.2024)
+
+* 19.09.2024: Document the virtual cards in the UI #333, thanks to @caco3 !
+* 18.09.2024: Re-designed tools page (#337), thanks to @caco3 !
+* 16.09.2024: Fix sleep after playlist not toggling nightmode #336, thanks to @dneukirchen !
+* 12.09.2024: PlatformIO package 6.8.1 (Arduino 2.0.17, ESP-IDF 4.4.7)
+* 12.09.2024: Change default settings to match "ESPuino-mini 4Layer" board
+* 11.09.2024: Fix string's expected length for rfid-cmnd via mqtt
+* 11.09.2024: Ignore mqtt messages with length zero
+* 10.09.2024: Porting to new web server library completed
 * 09.06.2024: Consume about 50% less CPU time in Audio library
 * 09.06.2024: Replace 3rd party library toastr (#331), thanks to @trainbird !
 * 09.06.2024: Modernized webserver & optimized JSON delivery (#332)
@@ -93,7 +110,7 @@
 * 07.11.2023: Set timezone after startup, thanks to @Joe91 !
 
 
-## Version 2 (07.11.2023)
+## Version 2.1 (07.11.2023)
 
 * 04.11.2023: LPCD: wakeup check for ISO-14443 cards also with IRQ connected to port-expander
 * 04.11.2023: Bugfix for showing wrong loglevel

diff --git a/html/accesspoint.html b/html/accesspoint.html
@@ -91,7 +91,8 @@ <h1 data-i18n="wifi.title"></h1>
 		<input type="password" id="pwd" name="pwd" autocomplete="off" required>
 		<br>
 		<label for="hostname" data-i18n="wifi.hostname.title"></label>: <br>
-		<input type="text" id="hostname" name="hostname" value="espuino" pattern="^[0-9a-zA-Z][0-9a-zA-Z\\-]{0,30}[0-9a-zA-Z]" required>
+		<input type="text" id="hostname" name="hostname" value="espuino"
+			pattern="^[0-9a-zA-Z][0-9a-zA-Z\\-]{0,30}[0-9a-zA-Z]" required>
 		<br>
 		<br>
 		<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value="false">
@@ -159,15 +160,15 @@ <h1 data-i18n="wifi.restartPrompt"></h1>
 			console.log(data);
 			var list = document.getElementById("WiFiList");
 			var h = "";
-			data.map(function(WiFis) {
+			data.map(function (WiFis) {
 				h += `<div class="ssid" onclick="selectWiFi('${WiFis.ssid}')"><a href="#"><div class="${WiFis.wico}" title="${WiFis.quality}% (${WiFis.rssi} dBm)"><div class="${WiFis.pico}" title="${WiFis.ssid}.(${WiFis.bssid})">${WiFis.ssid}</div></div></a></div>\n`;
 			});
 			h += "<br>";
 			list.innerHTML = h;
 			setTimeout(getWiFiList, 5000);
 		}
 		// disable static input fields on toggle
-		document.getElementById('static_enabled').onchange = function() {
+		document.getElementById('static_enabled').onchange = function () {
 			let new_style = this.checked ? null : "none";
 			document.getElementById("wifi_static_div").style.display = new_style;
 		};
@@ -178,7 +179,7 @@ <h1 data-i18n="wifi.restartPrompt"></h1>
 				pwd: document.getElementById('pwd').value,
 				static: static
 			};
-			if(static) {
+			if (static) {
 				myObj = {
 					...myObj,
 					static_addr: document.getElementById('static_addr').value,
@@ -215,12 +216,13 @@ <h1 data-i18n="wifi.restartPrompt"></h1>
 			let hostnameElem = document.getElementById("hostname");
 			let scanWifiElem = document.getElementById("scan_wifi_on_start");
 			let config = await (await fetch("/wificonfig")).json();
-			if(config.hostname && config.hostname !== "") {
+			if (config.hostname && config.hostname !== "") {
 				hostnameElem.value = config.hostname;
 				hostnameElem.defaultValue = config.hostname;
 			}
 			scanWifiElem.checked = config.scanwifionstart;
 		}
 	</script>
 </body>
-</html>
+
+</html>