prepare release

Author: dewenni

README.md

@@ -92,6 +92,7 @@ The project home is here: [Project Home](http://www.bastelbudenbuben.de/2017/04/
   - [Setup-Mode](#setup-mode)
   - [Configuration](#configuration)
   - [Filemanager](#filemanager)
+  - [Teach-in of roller shutters](#teach-in-of-roller-shutters)
   - [Migration](#migration)
 - [WebUI](#webui)
   - [Channels](#channels)
@@ -217,8 +218,12 @@ There are two predefined Options:
 
 ## Setup Mode
 
-There is a "Setup Mode" available. The "Setup Mode" is activated, when you press the "reset-button" of the ESP two times within 3 Seconds.
-The "Setup Mode" will also activated if there is no wifi connection configured.
+A `Setup Mode` is available. Setup mode is activated when the ESP is restarted **5** times.
+A maximum of 5 seconds may elapse after each restart.
+
+Example: restart 1/5 - wait 2s - restart 2/5 - wait 2s - restart 3/5 - wait 2s - restart 4/5 - wait 2s - restart /5/5 => Setup-Mode
+
+The "Setup Mode" will also activated if there is no valid wifi and no valid ETH connection configured.
 
 If the ESP goes into "Setup Mode", it will automatically create a own network access point with ssid  
 📶 `"ESP32_Jarolift"`  
@@ -277,6 +282,31 @@ The configuration is stored in the ```config.json``` file. To backup and restore
 
 ![filemanager](/Doc/webUI_tools.png)
 
+## Teach-in of roller shutters
+
+There are basically several ways to teach-in a roller shutter.
+There are the same options as when using the original remote controls.
+
+### Teach-in by pressing the teach-in button on the motor
+
+Every TDEF motor has a button for programming new remote controls.
+If you press this button, the motor confirms the learning process with a vibration.
+
+> [!TIP]
+> If you cannot reach the button, you can also switch the motor off for a few seconds. For example, by briefly switching off the fuse.
+
+Now press the corresponding ‘Learn button’ in the WebUI in the settings for the respective roller shutter within 5 seconds.
+If the roller shutter has been successfully programmed, the motor will vibrate again.
+
+### Programming by copying an existing radio code
+
+Alternatively, you can also use an already programmed remote control and ‘copy’ it.
+To do this, press the UP and DOWN buttons simultaneously on the already programmed transmitter. Then, on this transmitter, press the STOP button
+eight times on this transmitter. The motor will vibrate briefly to confirm.
+
+Now press the corresponding ‘Learn button’ in the WebUI in the settings for the respective roller shutter within 5 seconds.
+If the roller shutter has been successfully learnt, the motor will vibrate again.
+
 ## Migration
 
 It is possible to migrate from a latest version of [madmartin/Jarolift_MQTT](https://github.com/madmartin/Jarolift_MQTT) to this project.

README_DE.md

@@ -91,6 +91,7 @@ Die Homepage des Projekts ist hier: [Project Home](http://www.bastelbudenbuben.d
   - [Setup-Mode](#setup-mode)
   - [Konfiguration](#konfiguration)
   - [Filemanager](#filemanager)
+  - [Anlernen von Rolläden](#anlernen-von-rolläden)
   - [Migration](#migration)
 - [WebUI](#webui)
   - [Kanäle](#kanäle)
@@ -216,8 +217,12 @@ Es gibt zwei vordefinierte Optionen:
 
 ## Setup Mode
 
-Es gibt einen „Setup Mode“. Der „Setup Mode“ wird aktiviert, wenn der „Reset-Knopf“ des ESP zweimal innerhalb von 3 Sekunden gedrückt wird.
-Der „Setup Mode“ wird auch aktiviert, wenn (zu Beginn) keine WLAN-Verbindung konfiguriert ist.
+Es ist ein `Setup Mode` verfügbar. Der „Setup Mode“ wird aktiviert, wenn der ESP **5** mal neu gestartet wird.
+Nach jdem Neustart dürfen maximal bis zu 5 Sekunden vergehen.
+
+Beispiel: restart 1/5 - 2s warten - restart 2/5 - 2s warten - restart 3/5 - 2s warten - restart 4/5 - 2s warten - restart /5/5 => Setup-Mode
+
+Der `Setup-Mode` wird auch aktiviert, wenn kein gültiges WLAN und keine gültige ETH-Verbindung konfiguriert ist.
 
 Wenn der ESP in den „Setup Mode“ geht, erstellt er automatisch einen eigenen Netzwerk Accesspoint mit der ssid
 📶 `"ESP32_Jarolift"`  
@@ -274,7 +279,32 @@ Die Konfiguration wird in der Datei ``config.json`` gespeichert. Zur Sicherung u
 
 ![filemanager](/Doc/webUI_tools.png)
 
-## Migration
+## Anlernen von Rolläden
+
+Es gibt grundsätzlich mehrere Möglichkeiten um einen Rolladen anzulernen.
+Es existieren die gleichen Möglichkeiten wie bei der Nutzung der original Fernbedienungen.
+
+### Anlernen durch drücken der Anlerntaste am Motor
+
+Jeder TDEF Motor hat eine Taste zum anlernen von neuen Fernbedienungen.
+Drückt man diese Taste, bestätgt der Motor den Anlernvorgang mit einem vibrieren.
+
+> [!TIP]
+> Wenn man an die Taste nicht ran kommt, kann man den Motor auch für ein paar Sekunden Stromlos schalten. Z.B. in dem man die Sicherung kurz raus macht.
+
+Jetzt innerhalb von 5 Sekunden den entsprechenden "Lern-Button" im WebUI in den Settings bei dem jeweiligen Rolladen drücken.
+Wenn der Rolladen erfolgreich eingelernt wurde, vibriert der Motor erneut.
+
+### Anlernen durch Kopieren eines bestehenden Funkcodes
+
+Alternativ kann man auch eine bereits eingelernte Fernbedienung nutzen und diese "Kopieren".
+Dazu auf dem bereits eingelernten Sender die AUF- und AB-Taste gleichzeitig. Danach, auf diesem Sender, die STOP-Taste
+acht mal drücken. Der Motor wird zur Bestätigung kurz vibrieren.
+
+Jetzt innerhalb von 5 Sekunden den entsprechenden "Lern-Button" im WebUI in den Settings bei dem jeweiligen Rolladen drücken.
+Wenn der Rolladen erfolgreich eingelernt wurde, vibriert der Motor erneut.
+
+## Migration von madmartin/Jarolift_MQTT
 
 Es ist möglich, von einer vorherigen Version von [madmartin/Jarolift_MQTT](https://github.com/madmartin/Jarolift_MQTT) zu diesem Projekt zu migrieren.
 

changeNew.md

@@ -1,4 +1,4 @@
-# v1.5.3
+# v1.6.0
 
 ## what's new
 
@@ -9,9 +9,21 @@ this is a minor update and bugfix version
 For a first impression of the functions and the WebUI, a limited demo is also available.  
 This can be accessed via the following link: [WebUI-DEMO](https://dewenni.github.io/ESP32-Jarolift-Controller/)
 
+### Changed condition for Setup-Mode
+
+Setup mode is now activated when the ESP is restarted **5** times.
+A maximum of 5 seconds may elapse after each restart.
+
+Example: restart 1/5 - wait 2s - restart 2/5 - wait 2s - restart 3/5 - wait 2s - restart 4/5 - wait 2s - restart /5/5 => Setup-Mode
+
 
 ## changelog
 
 - [UPDATE]  ESP32Async/AsyncTCP @ 3.3.5
 - [UPDATE]  ESP32Async/ESPAsyncWebServer @ 3.7.0
-- [ADD] add a [WebUI-DEMO](https://dewenni.github.io/ESP32-Jarolift-Controller/) under github-pages
+- [IMPROVE] Added validation for IP input fields in the setup area to avoid wrong syntax #27
+- [IMPROVE] Conversion of the storage of the device counter from EEPROM to NVS
+- [IMPROVE] remove callback function for internal messages in jarolift-controller library
+- [IMPROVE] change "Double-Reset-Detection" to "Multi-Reset-Detection" now it needs 5 restarts within 5s timeout to enter Setup-Mode #26
+- [NEW] Add a [WebUI-DEMO](https://dewenni.github.io/ESP32-Jarolift-Controller/) under github-pages
+- [NEW] Added some description for possible teach-in procedures.

changelog.md

@@ -1,5 +1,37 @@
 **Changelog**
 
+# v1.6.0
+
+## what's new
+
+this is a minor update and bugfix version
+
+### WebUI-Demo
+
+For a first impression of the functions and the WebUI, a limited demo is also available.  
+This can be accessed via the following link: [WebUI-DEMO](https://dewenni.github.io/ESP32-Jarolift-Controller/)
+
+### Changed condition for Setup-Mode
+
+Setup mode is now activated when the ESP is restarted **5** times.
+A maximum of 5 seconds may elapse after each restart.
+
+Example: restart 1/5 - wait 2s - restart 2/5 - wait 2s - restart 3/5 - wait 2s - restart 4/5 - wait 2s - restart /5/5 => Setup-Mode
+
+
+## changelog
+
+- [UPDATE]  ESP32Async/AsyncTCP @ 3.3.5
+- [UPDATE]  ESP32Async/ESPAsyncWebServer @ 3.7.0
+- [IMPROVE] Added validation for IP input fields in the setup area to avoid wrong syntax #27
+- [IMPROVE] Conversion of the storage of the device counter from EEPROM to NVS
+- [IMPROVE] remove callback function for internal messages in jarolift-controller library
+- [IMPROVE] change "Double-Reset-Detection" to "Multi-Reset-Detection" now it needs 5 restarts within 5s timeout to enter Setup-Mode #26
+- [NEW] Add a [WebUI-DEMO](https://dewenni.github.io/ESP32-Jarolift-Controller/) under github-pages
+- [NEW] Added some description for possible teach-in procedures.
+
+---
+
 # v1.5.1
 
 ## what's new

include/config.h

@@ -4,7 +4,7 @@
 /*-------------------------------------------------------------------------------
 General Configuration
 --------------------------------------------------------------------------------*/
-#define VERSION "v1.5.1" // internal program version
+#define VERSION "v1.6.0" // internal program version
 
 #define WIFI_RECONNECT 30000 // Delay between wifi reconnection tries
 #define MQTT_RECONNECT 10000 // Delay between mqtt reconnection tries

include/gzip_css.h

@@ -1,2 +1,2 @@
-const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0x4f, 0x5d, 0xa4, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
+const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0x85, 0x69, 0xa7, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
 const unsigned int gzip_login_html_size = 448;