diff --git a/ESP32_AP-Flasher/data/fonts/bahnschrift80.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift80.vlw deleted file mode 100644 index 84d11fff..00000000 Binary files a/ESP32_AP-Flasher/data/fonts/bahnschrift80.vlw and /dev/null differ diff --git a/ESP32_AP-Flasher/data/fonts/calibrib30.vlw b/ESP32_AP-Flasher/data/fonts/calibrib30.vlw index f2da8ab3..6c813489 100644 Binary files a/ESP32_AP-Flasher/data/fonts/calibrib30.vlw and b/ESP32_AP-Flasher/data/fonts/calibrib30.vlw differ diff --git a/ESP32_AP-Flasher/data/fonts/calibrib35.vlw b/ESP32_AP-Flasher/data/fonts/calibrib35.vlw deleted file mode 100644 index f6a1d70d..00000000 Binary files a/ESP32_AP-Flasher/data/fonts/calibrib35.vlw and /dev/null differ diff --git a/ESP32_AP-Flasher/data/fonts/calibrib40.vlw b/ESP32_AP-Flasher/data/fonts/calibrib40.vlw deleted file mode 100644 index 4ed81027..00000000 Binary files a/ESP32_AP-Flasher/data/fonts/calibrib40.vlw and /dev/null differ diff --git a/ESP32_AP-Flasher/data/fonts/calibrib50.vlw b/ESP32_AP-Flasher/data/fonts/calibrib50.vlw index 6c0b0dd1..b2b327fa 100644 Binary files a/ESP32_AP-Flasher/data/fonts/calibrib50.vlw and b/ESP32_AP-Flasher/data/fonts/calibrib50.vlw differ diff --git a/ESP32_AP-Flasher/data/fonts/calibrib62.vlw b/ESP32_AP-Flasher/data/fonts/calibrib62.vlw index 97ea7ad3..fb235b10 100644 Binary files a/ESP32_AP-Flasher/data/fonts/calibrib62.vlw and b/ESP32_AP-Flasher/data/fonts/calibrib62.vlw differ diff --git a/ESP32_AP-Flasher/data/www/index.html b/ESP32_AP-Flasher/data/www/index.html index b6f07e69..ea9c7520 100644 --- a/ESP32_AP-Flasher/data/www/index.html +++ b/ESP32_AP-Flasher/data/www/index.html @@ -81,7 +81,7 @@

diff --git a/ESP32_AP-Flasher/data/www/upload-test.html b/ESP32_AP-Flasher/data/www/upload-test.html index dc460b2f..a21e671a 100644 --- a/ESP32_AP-Flasher/data/www/upload-test.html +++ b/ESP32_AP-Flasher/data/www/upload-test.html @@ -10,6 +10,8 @@


+
+


diff --git a/ESP32_AP-Flasher/include/language.h b/ESP32_AP-Flasher/include/language.h index c09587e6..a26b1dba 100644 --- a/ESP32_AP-Flasher/include/language.h +++ b/ESP32_AP-Flasher/include/language.h @@ -4,12 +4,12 @@ static int defaultLanguage = 0; -static String languageList[] = {"EN - English", "NL - Dutch", "DE - Deutsch"}; +static String languageList[] = {"EN - English", "NL - Nederlands", "DE - Deutsch"}; /*EN English language section*/ static String languageEnDaysShort[] = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"}; -static String languageEnDays[] = {"sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"}; -static String languageEnMonth[] = {"january", "february", "march", "april", "may", "june", "july", "august", "september", "october", "november", "december"}; +static String languageEnDays[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"}; +static String languageEnMonth[] = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"}; /*END English language section END*/ /*NL Dutch language section*/ @@ -20,8 +20,8 @@ static String languageNlMonth[] = {"januari", "februari", "maart", "april", "mei /*DE German language section*/ static String languageDeDaysShort[] = {"SO", "MO", "DI", "MI", "DO", "FR", "SA"}; -static String languageDeDays[] = {"sonntag", "montag", "dienstag", "mittwoch", "donnerstag", "freitag", "samstag"}; -static String languageDeMonth[] = {"januar", "februar", "maerz", "april", "mai", "juni", "juli", "august", "september", "oktober", "november", "dezember"}; +static String languageDeDays[] = {"Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"}; +static String languageDeMonth[] = {"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"}; /*END German language section END*/ static String* languageDaysShort[] = {languageEnDaysShort, languageNlDaysShort, languageDeDaysShort}; diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp index baf4f40a..11621352 100644 --- a/ESP32_AP-Flasher/src/newproto.cpp +++ b/ESP32_AP-Flasher/src/newproto.cpp @@ -87,7 +87,8 @@ void prepareIdleReq(uint8_t* dst, uint16_t nextCheckin) { bool prepareDataAvail(String* filename, uint8_t dataType, uint8_t* dst, uint16_t nextCheckin) { if (nextCheckin > MIN_RESPONSE_TIME) nextCheckin = MIN_RESPONSE_TIME; - + if (wsClientCount()) nextCheckin=0; + uint8_t src[8]; *((uint64_t*)src) = swap64(*((uint64_t*)dst)); uint8_t mac[6];