v3.0.0: unified setCiphers, missing cars

- Update ESP32 NetworkClientSecure to use same syntax as ESP8266 BearSSL
- Add missingCars flag to departures
- Add factory-Images for ESP32 to GitHub-actions-builds

Author: soundstorm

.github/workflows/DBTFT-pio-build.yml

@@ -44,25 +44,33 @@ jobs:
         run: pio ci -c ./examples/DBTFT/platformio.ini -e 2432s028r --build-dir /tmp/pio-build --keep-build-dir ./examples/DBTFT/src
 
       - name: Copy CYD-ILI9341 firmware
-        run: cp /tmp/pio-build/.pio/build/2432s028r/firmware.bin /tmp/CYD-ILI9341.bin
+        run: |
+          cp /tmp/pio-build/.pio/build/2432s028r/firmware.bin /tmp/CYD-ILI9341.bin
+          cp /tmp/pio-build/.pio/build/2432s028r/firmware.factory.bin /tmp/CYD-ILI9341-factory.bin
 
       - name: Upload CYD-ILI9341
         uses: actions/upload-artifact@v4
         with:
           name: CYD-ILI9341
-          path: /tmp/CYD-ILI9341.bin
+          path: |
+            /tmp/CYD-ILI9341.bin
+            /tmp/CYD-ILI9341-factory.bin
 
       - name: Build PlatformIO Project CYD 7798
         run: pio ci -c ./examples/DBTFT/platformio.ini -e 2432s028r_dualusb --build-dir /tmp/pio-build --keep-build-dir ./examples/DBTFT/src
 
       - name: Copy CYD-ST7798 firmware
-        run: cp /tmp/pio-build/.pio/build/2432s028r_dualusb/firmware.bin /tmp/CYD-ST7798.bin
+        run: |
+          cp /tmp/pio-build/.pio/build/2432s028r_dualusb/firmware.bin /tmp/CYD-ST7798.bin
+          cp /tmp/pio-build/.pio/build/2432s028r_dualusb/firmware.factory.bin /tmp/CYD-ST7798-factory.bin
 
       - name: Upload CYD-ST7798
         uses: actions/upload-artifact@v4
         with:
           name: CYD-ST7798
-          path: /tmp/CYD-ST7798.bin
+          path: |
+            /tmp/CYD-ST7798.bin
+            /tmp/CYD-ST7798-factory.bin
 
       - name: Attach binaries to release
         if: startsWith(github.ref, 'refs/tags/')
@@ -71,4 +79,6 @@ jobs:
           files: |
             /tmp/ESP8266-ILI9341.bin
             /tmp/CYD-ILI9341.bin
+            /tmp/CYD-ILI9341-factory.bin
             /tmp/CYD-ST7798.bin
+            /tmp/CYD-ST7798-factory.bin

DBAPI.cpp

@@ -65,11 +65,10 @@ DBstation* DBAPI::getStation(
 	*/
 #ifdef ESP8266
 	BearSSL::WiFiClientSecure client;
-	client.setCiphers(dbCipherList, sizeof(dbCipherList) / sizeof(dbCipherList[0]));
 #else
 	WiFiClientSecure client;
-	client.setCiphersuites(dbCipherList);
 #endif
+	client.setCiphers(dbCipherList, sizeof(dbCipherList) / sizeof(dbCipherList[0]));
 	client.setInsecure(); // Don't check fingerprint
 	if (!client.connect(host, 443)) {
 		DB_DEBUG_MSG("DBAPI: Connection to Host failed.\n");
@@ -241,11 +240,10 @@ DBdeparr* DBAPI::getStationBoard(
 		// Init new client for each request	
 #ifdef ESP8266
 		BearSSL::WiFiClientSecure client;
-		client.setCiphers(dbCipherList, sizeof(dbCipherList) / sizeof(dbCipherList[0]));
 #else
 		WiFiClientSecure client;
-		client.setCiphersuites(dbCipherList);
 #endif
+		client.setCiphers(dbCipherList, sizeof(dbCipherList) / sizeof(dbCipherList[0]));
 		client.setInsecure(); // Don't check fingerprint
 		if (!client.connect(host, 443)) {
 			DB_DEBUG_MSG("DBAPI: Connection to Host failed.\n");

README.md

@@ -15,6 +15,9 @@ Wenn nicht PlatformIO genutzt wird, werden folgende Bibliotheken zusätzlich ben
 - https://github.com/paulstoffregen/Time
 - https://github.com/bbx10/Hash_tng (nur für ESP32)
 
+Außerdem muss für ESP32 eine angepasste NetworkClientSecure-Bibliothek verwendet werden.
+Diese befindet sich in einem separaten [Branch](https://github.com/ArduinoHannover/arduino-esp32/tree/add-setciphers).
+
 ## Beispielcode
 
 Der DBTFT-Beispielcode ist für einen ESP8266 mit ILI9341 oder ein "Cheap Yellow Display" (ESP32 mit ILI9341 oder ST7798) ausgelegt.
@@ -101,6 +104,7 @@ Mittels bitweiser Oder-Verknüpfung (`|`) können mehrere Verkehrsmittel angefra
 | `realTime` | `time_t` | Tatsächliche Abfahrtszeit als Unix-Timestamp |
 | `delay` | `int16_t` | Verspätung |
 | `cancelled` | `bool` | Zug entfällt |
+| `missingCars` | `bool` | Fehlende Wagen |
 | `platform` | `char[8]` | Geplantes Gleis (ggf. inkl. Abschnitt), sofern existent, sonst leer |
 | `newPlatform` | `char[8]` | Tatsächliches Gleis, sofern geändert, sonst leer |
 | `target` | `char[50]` | Zielhaltestelle |

examples/DBTFT/platformio.ini

@@ -13,7 +13,7 @@ platform = espressif8266
 board = d1_mini
 framework = arduino
 lib_deps = 
-	soundstorm/DBAPI @ ^2.4.2
+	soundstorm/DBAPI @ ^3.0.0
 	arduino-libraries/NTPClient @ ^3.2.1
 	adafruit/Adafruit GFX Library@^1.11.10
 	adafruit/Adafruit ILI9341 @ ^1.5.12
@@ -26,13 +26,13 @@ monitor_speed = 115200
 [env:2432s028r]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.39/platform-espressif32.zip
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/ArduinoHannover/arduino-esp32.git#adjust-cipher-suits
+    platformio/framework-arduinoespressif32 @ https://github.com/ArduinoHannover/arduino-esp32.git#add-setciphers
 board = esp32dev
 framework = arduino
 build_flags = -D BOARD_2432S028R
 lib_ldf_mode = deep
 lib_deps = 
-	soundstorm/DBAPI @ ^2.4.2
+	soundstorm/DBAPI @ ^3.0.0
 	arduino-libraries/NTPClient @ ^3.2.1
 	adafruit/Adafruit GFX Library@^1.11.10
 	adafruit/Adafruit ILI9341 @ ^1.5.12
@@ -46,13 +46,13 @@ board_build.partitions = esp32_4M.csv ;0x140000 by default is apprently not enou
 [env:2432s028r_dualusb]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.39/platform-espressif32.zip
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/ArduinoHannover/arduino-esp32.git#adjust-cipher-suits
+    platformio/framework-arduinoespressif32 @ https://github.com/ArduinoHannover/arduino-esp32.git#add-setciphers
 board = esp32dev
 framework = arduino
 build_flags = -D BOARD_2432S028R -D USE_ST7798
 lib_ldf_mode = deep
 lib_deps = 
-	soundstorm/DBAPI @ ^2.4.2
+	soundstorm/DBAPI @ ^3.0.0
 	arduino-libraries/NTPClient @ ^3.2.1
 	adafruit/Adafruit GFX Library@^1.11.10
 	adafruit/Adafruit ST7735 and ST7789 Library@^1.11.0

library.json

@@ -1,6 +1,6 @@
 {
     "name": "DBAPI",
-    "version": "2.4.2",
+    "version": "3.0.0",
     "description": "Hacon/Hafas/DB API for ESP8266 / ESP32 (WiFiClientSecure)",
     "keywords": "train, deutsche bahn, travel",
     "repository":