From 24c7238a8bed8ecef56a97df1e88f200861fa4b1 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 5 May 2024 17:16:06 +0200 Subject: [PATCH 1/3] updated example --- pio_local.ini_example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pio_local.ini_example b/pio_local.ini_example index b056295cc..a653bedad 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -26,10 +26,11 @@ default_envs = esp32_4M [env] ; upload settings upload_protocol = custom -custom_emsesp_ip = 10.10.10.173 +custom_emsesp_ip = ems-esp.local custom_username = admin custom_password = admin upload_port = /dev/ttyUSB* +; upload_port = COM5 [env:esp32_4M] extra_scripts = From 4a1319d95af94f8e76af808369c33312618398cc Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 5 May 2024 17:16:31 +0200 Subject: [PATCH 2/3] move esp status to under status (not in settings) --- interface/src/AuthenticatedRouting.tsx | 5 +---- interface/src/project/ApplicationSettings.tsx | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/src/AuthenticatedRouting.tsx b/interface/src/AuthenticatedRouting.tsx index 00ca0d836..3b5344168 100644 --- a/interface/src/AuthenticatedRouting.tsx +++ b/interface/src/AuthenticatedRouting.tsx @@ -43,10 +43,7 @@ const AuthenticatedRouting: FC = () => { } /> } /> } /> - } - /> + } /> } /> )} diff --git a/interface/src/project/ApplicationSettings.tsx b/interface/src/project/ApplicationSettings.tsx index ce07a69a7..f833f1e96 100644 --- a/interface/src/project/ApplicationSettings.tsx +++ b/interface/src/project/ApplicationSettings.tsx @@ -115,7 +115,7 @@ const ApplicationSettings: FC = () => { }); }; - useLayoutTitle(LL.APPLICATION_SETTINGS()); + useLayoutTitle(LL.APPLICATION()); const content = () => { if (!data) { From 837d70e79da993cbefe4d4bff28b8f5adc25e3e5 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 5 May 2024 17:16:59 +0200 Subject: [PATCH 3/3] rename Application Settings --- interface/src/framework/Settings.tsx | 10 +--------- interface/src/framework/system/SystemStatus.tsx | 2 +- interface/src/i18n/de/index.ts | 2 +- interface/src/i18n/en/index.ts | 2 +- interface/src/i18n/fr/index.ts | 2 +- interface/src/i18n/it/index.ts | 2 +- interface/src/i18n/nl/index.ts | 2 +- interface/src/i18n/no/index.ts | 2 +- interface/src/i18n/pl/index.ts | 2 +- interface/src/i18n/sk/index.ts | 2 +- interface/src/i18n/sv/index.ts | 2 +- interface/src/i18n/tr/index.ts | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/interface/src/framework/Settings.tsx b/interface/src/framework/Settings.tsx index c21a0bd15..9ce091ce2 100644 --- a/interface/src/framework/Settings.tsx +++ b/interface/src/framework/Settings.tsx @@ -79,7 +79,7 @@ const Settings: FC = () => { @@ -125,14 +125,6 @@ const Settings: FC = () => { - - { bgcolor="#68374d" label={LL.SYSTEM_MEMORY()} text={formatNumber(data.free_heap) + ' KB'} - to="/settings/espsystemstatus" + to="/system/espsystemstatus" /> diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index d9803fdff..c356736d3 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -96,7 +96,7 @@ const de: Translation = { NUM_SECONDS: '{num} Sekunde{{n}}', NUM_HOURS: '{num} Stunde{{n}}', NUM_MINUTES: '{num} Minute{{n}}', - APPLICATION_SETTINGS: 'Anwendungseinstellungen', + APPLICATION: 'Anwendungseinstellungen', CUSTOMIZATIONS: 'Anpassungen', APPLICATION_RESTARTING: 'EMS-ESP startet neu', INTERFACE_BOARD_PROFILE: 'Interface Platinenprofil', diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index b1bfb6af9..aa639f59a 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -96,7 +96,7 @@ const en: Translation = { NUM_SECONDS: '{num} second{{s}}', NUM_HOURS: '{num} hour{{s}}', NUM_MINUTES: '{num} minute{{s}}', - APPLICATION_SETTINGS: 'Application Settings', + APPLICATION: 'Application', CUSTOMIZATIONS: 'Customizations', APPLICATION_RESTARTING: 'EMS-ESP is restarting', INTERFACE_BOARD_PROFILE: 'Interface Board Profile', diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index b5d4fb4c1..591122f05 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -96,7 +96,7 @@ const fr: Translation = { NUM_SECONDS: '{num} seconde{{s}}', NUM_HOURS: '{num} heure{{s}}', NUM_MINUTES: '{num} minute{{s}}', - APPLICATION_SETTINGS: "Paramètres de l'application", + APPLICATION: "l'application", CUSTOMIZATIONS: 'Personnalisation', APPLICATION_RESTARTING: 'EMS-ESP redémarre', INTERFACE_BOARD_PROFILE: "Profile de carte d'interface", diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts index d132675bc..4b4034407 100644 --- a/interface/src/i18n/it/index.ts +++ b/interface/src/i18n/it/index.ts @@ -96,7 +96,7 @@ const it: Translation = { NUM_SECONDS: '{num} secondi {{s}}', NUM_HOURS: '{num} ore {{s}}', NUM_MINUTES: '{num} minuti {{s}}', - APPLICATION_SETTINGS: 'Impostazione Applicazione', + APPLICATION: 'Applicazione', CUSTOMIZATIONS: 'Personalizzazione', APPLICATION_RESTARTING: 'EMS-ESP sta riavviando', INTERFACE_BOARD_PROFILE: 'Profilo scheda di interfaccia', diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index 06c6b50d6..9ccf45d92 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -96,7 +96,7 @@ const nl: Translation = { NUM_SECONDS: '{num} second{{en}}', NUM_HOURS: '{num} {{uur|uren}}', NUM_MINUTES: '{num} {{minuut|minuten}}', - APPLICATION_SETTINGS: 'Applicatieinstellingen', + APPLICATION: 'Applicatie', CUSTOMIZATIONS: 'Aanpassingen van entiteiten', APPLICATION_RESTARTING: 'EMS-ESP herstarten', INTERFACE_BOARD_PROFILE: 'Interface Apparaatprofiel', diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 5258f4417..02979838b 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -96,7 +96,7 @@ const no: Translation = { NUM_SECONDS: '{num} Sekund{{er}}', NUM_HOURS: '{num} Time{{r}}', NUM_MINUTES: '{num} Minutt{{er}}', - APPLICATION_SETTINGS: 'Innstillinger', + APPLICATION: 'Søknad', CUSTOMIZATIONS: 'Tilpasninger', APPLICATION_RESTARTING: 'EMS-ESP restarter', INTERFACE_BOARD_PROFILE: 'Interface Prosessor Profil', diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index c47e162fc..4c7af7d71 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -96,7 +96,7 @@ const pl: BaseTranslation = { NUM_SECONDS: '{num} sekun{{d|da|dy|dy|d}}', NUM_HOURS: '{num} godzi{{n|na|ny|ny|n}}', NUM_MINUTES: '{num} minu{{t|ta|ty|ty|t}}', - APPLICATION_SETTINGS: 'Ustawienia aplikacji', + APPLICATION: 'Aplikacji', CUSTOMIZATIONS: 'Personalizacja', APPLICATION_RESTARTING: 'Trwa ponowne uruchamianie', INTERFACE_BOARD_PROFILE: 'Profil płytki interfejsu', diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index 076ff9442..3778cddd5 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -96,7 +96,7 @@ const sk: Translation = { NUM_SECONDS: '{num} sek{{únd|unda|undy|undy|únd|únd}}', NUM_HOURS: '{num} hod{{ín|ina|iny|iny|ín|ín}}', NUM_MINUTES: '{num} minú{{t|ta|ty|ty|t|t}}', - APPLICATION_SETTINGS: 'Nastavenia aplikácie', + APPLICATION: 'Aplikácie', CUSTOMIZATIONS: 'Prispôsobenia', APPLICATION_RESTARTING: 'EMS-ESP sa reštartuje', INTERFACE_BOARD_PROFILE: 'Profil dosky rozhrania', diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts index 388077908..7f42be3f3 100644 --- a/interface/src/i18n/sv/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -96,7 +96,7 @@ const sv: Translation = { NUM_SECONDS: '{num} sekund{{er}}', NUM_HOURS: '{num} timmar', NUM_MINUTES: '{num} minut{{er}}', - APPLICATION_SETTINGS: 'Inställningar', + APPLICATION: 'Apliká', CUSTOMIZATIONS: 'Anpassningr', APPLICATION_RESTARTING: 'EMS-ESP startar om', INTERFACE_BOARD_PROFILE: 'Interface Hårdvaruprofil', diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts index eb0d7b46f..41e757b80 100644 --- a/interface/src/i18n/tr/index.ts +++ b/interface/src/i18n/tr/index.ts @@ -96,7 +96,7 @@ const tr: Translation = { NUM_SECONDS: '{num} saniye{{ler}}', NUM_HOURS: '{num} saat{{ler}}', NUM_MINUTES: '{num} dakika{{lar}}', - APPLICATION_SETTINGS: 'Uygulama Ayarları', + APPLICATION: 'Uygulama', CUSTOMIZATIONS: 'Özelleştirme', APPLICATION_RESTARTING: 'EMS-ESP yeniden başlatılıyor', INTERFACE_BOARD_PROFILE: 'Arabirim Kart Profili',