diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index feffb6d4..e76fb1fa 100644 Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 7e4a9ae3..e0759d1c 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -37,8 +37,8 @@ build_flags = -D ILI9341_DRIVER -D SMOOTH_FONT -upload_port = COM11 -monitor_port = COM11 +;upload_port = COM11 +;monitor_port = COM11 ; ---------------------------------------------------------------------------------------- ; !!! this configuration expects the Mini_AP ; @@ -325,6 +325,7 @@ build_src_filter = [env:ESP32_S3_16_8_YELLOW_AP] board = esp32-s3-devkitc-1 board_build.partitions = large_spiffs_16MB.csv + build_unflags = -std=gnu++11 -D ARDUINO_USB_MODE=1 diff --git a/ESP32_AP-Flasher/src/language.cpp b/ESP32_AP-Flasher/src/language.cpp index 7d5b9923..61eabf54 100644 --- a/ESP32_AP-Flasher/src/language.cpp +++ b/ESP32_AP-Flasher/src/language.cpp @@ -7,7 +7,7 @@ int defaultLanguage = 0; -String languageList[] = {"EN - English", "NL - Nederlands", "DE - Deutsch", "NO - Norwegian"}; +String languageList[] = {"EN - English", "NL - Nederlands", "DE - Deutsch", "NO - Norwegian", "FR - French"}; /*EN English language section*/ String languageEnDaysShort[] = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"}; @@ -33,9 +33,15 @@ String languageNoDays[] = {"Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", String languageNoMonth[] = {"Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"}; /*END Norwegian language section END*/ -String* languageDaysShort[] = {languageEnDaysShort, languageNlDaysShort, languageDeDaysShort, languageNoDaysShort}; -String* languageDays[] = {languageEnDays, languageNlDays, languageDeDays, languageNoDays}; -String* languageMonth[] = {languageEnMonth, languageNlMonth, languageDeMonth, languageNoMonth}; +/*FR French language section*/ +String languageFrDaysShort[] = {"DI", "LU", "MA", "ME", "JE", "VE", "SA"}; +String languageFrDays[] = {"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"}; +String languageFrMonth[] = {"Janvier", "Fevrier", "Mars", "Avril", "Mai", "Juin", "Juillet", "Aout", "Septembre", "Octobre", "Novembre", "Decembre"}; +/*END French language section END*/ + +String* languageDaysShort[] = {languageEnDaysShort, languageNlDaysShort, languageDeDaysShort, languageNoDaysShort, languageFrDaysShort}; +String* languageDays[] = {languageEnDays, languageNlDays, languageDeDays, languageNoDays, languageFrDays}; +String* languageMonth[] = {languageEnMonth, languageNlMonth, languageDeMonth, languageNoMonth, languageFrMonth}; int currentLanguage = defaultLanguage; diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html index 3d2fa76a..88ea06d1 100644 --- a/ESP32_AP-Flasher/wwwroot/index.html +++ b/ESP32_AP-Flasher/wwwroot/index.html @@ -287,6 +287,7 @@ +