chore: Reset Session, not "Flight" (#6897)

This commit is contained in:
Peter Feerick
2026-01-22 12:11:04 +10:00
committed by GitHub
parent 5b5cf1d9a4
commit b1f1a85350
44 changed files with 16107 additions and 17375 deletions
+2 -2
View File
@@ -318,12 +318,12 @@ void onMainViewMenu(const char * result)
pushModelNotes();
}
else if (result == STR_RESET_SUBMENU) {
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_FLIGHT, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_SESSION, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
}
else if (result == STR_RESET_TELEMETRY) {
telemetryReset();
}
else if (result == STR_RESET_FLIGHT) {
else if (result == STR_RESET_SESSION) {
flightReset();
}
else if (result == STR_STATISTICS) {
+2 -2
View File
@@ -408,12 +408,12 @@ void onMainViewMenu(const char * result)
pushModelNotes();
}
else if (result == STR_RESET_SUBMENU) {
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_FLIGHT, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
POPUP_MENU_START(onMainViewMenu, 5, STR_RESET_SESSION, STR_RESET_TIMER1, STR_RESET_TIMER2, STR_RESET_TIMER3, STR_RESET_TELEMETRY);
}
else if (result == STR_RESET_TELEMETRY) {
telemetryReset();
}
else if (result == STR_RESET_FLIGHT) {
else if (result == STR_RESET_SESSION) {
flightReset();
}
else if (result == STR_STATISTICS) {
@@ -128,7 +128,7 @@ const QMTopDef qmTopItems[] = {
{ ICON_TOOLS_RESET, STR_DEF(STR_QM_RESET), STR_DEF(STR_QM_RESET), QM_ACTION, QM_TOOLS_RESET, nullptr,
[]() {
Menu* resetMenu = new Menu();
resetMenu->addLine(STR_RESET_FLIGHT, []() { flightReset(); });
resetMenu->addLine(STR_RESET_SESSION, []() { flightReset(); });
resetMenu->addLine(STR_RESET_TIMER1, []() { timerReset(0); });
resetMenu->addLine(STR_RESET_TIMER2, []() { timerReset(1); });
resetMenu->addLine(STR_RESET_TIMER3, []() { timerReset(2); });
@@ -169,7 +169,7 @@ const PageDef toolsMenuItems[] = {
{ ICON_TOOLS_RESET, STR_DEF(STR_QM_RESET), STR_DEF(STR_QM_RESET), PAGE_ACTION, QM_TOOLS_RESET, nullptr, nullptr,
[]() {
Menu* resetMenu = new Menu();
resetMenu->addLine(STR_RESET_FLIGHT, []() { flightReset(); });
resetMenu->addLine(STR_RESET_SESSION, []() { flightReset(); });
resetMenu->addLine(STR_RESET_TIMER1, []() { timerReset(0); });
resetMenu->addLine(STR_RESET_TIMER2, []() { timerReset(1); });
resetMenu->addLine(STR_RESET_TIMER3, []() { timerReset(2); });
@@ -51,7 +51,7 @@ void menuViewTelemetry(event_t event)
incrTelemetryScreen();
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
POPUP_MENU_START(onMainViewMenu, 2, STR_RESET_TELEMETRY, STR_RESET_FLIGHT);
POPUP_MENU_START(onMainViewMenu, 2, STR_RESET_TELEMETRY, STR_RESET_SESSION);
}
for (int i=0; i<=TELEMETRY_SCREEN_TYPE_MAX; i++) {
+1 -1
View File
@@ -984,7 +984,7 @@
#define TR_PASTE_BEFORE "粘贴到本条之前"
#define TR_DELETE "删除"
#define TR_INSERT "插入"
#define TR_RESET_FLIGHT "复位飞行数据"
#define TR_RESET_SESSION "复位飞行数据"
#define TR_RESET_TIMER1 "复位计时器1"
#define TR_RESET_TIMER2 "复位计时器2"
#define TR_RESET_TIMER3 "复位计时器3"
+1 -1
View File
@@ -982,7 +982,7 @@
#define TR_PASTE_BEFORE "Vložit před"
#define TR_DELETE "Odstranit"
#define TR_INSERT "Přidat"
#define TR_RESET_FLIGHT "Reset relace"
#define TR_RESET_SESSION "Reset relace"
#define TR_RESET_TIMER1 "Čas1"
#define TR_RESET_TIMER2 "Čas2"
#define TR_RESET_TIMER3 "Čas3"
+1 -1
View File
@@ -989,7 +989,7 @@
#define TR_PASTE_BEFORE "Sæt ind før"
#define TR_DELETE "Slet"
#define TR_INSERT "Indsæt"
#define TR_RESET_FLIGHT "Nulstil flyvning"
#define TR_RESET_SESSION "Nulstil flyvning"
#define TR_RESET_TIMER1 "Nulstil tidtag 1"
#define TR_RESET_TIMER2 "Nulstil tidtag 2"
#define TR_RESET_TIMER3 "Nulstil tidtag 3"
+1 -1
View File
@@ -978,7 +978,7 @@
#define TR_PASTE_BEFORE "Einfügen davor"
#define TR_DELETE "Zeile löschen"
#define TR_INSERT "Neue Zeile"
#define TR_RESET_FLIGHT "Reset Flugdaten"
#define TR_RESET_SESSION "Reset Flugdaten"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
+1 -1
View File
@@ -985,7 +985,7 @@
#define TR_PASTE_BEFORE "Paste before"
#define TR_DELETE "Delete"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "Reset session"
#define TR_RESET_SESSION "Reset session"
#define TR_RESET_TIMER1 "Reset timer1"
#define TR_RESET_TIMER2 "Reset timer2"
#define TR_RESET_TIMER3 "Reset timer3"
+1 -1
View File
@@ -978,7 +978,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Borrar"
#define TR_INSERT "Insertar"
#define TR_RESET_FLIGHT "Reset Vuelo"
#define TR_RESET_SESSION "Reset Vuelo"
#define TR_RESET_TIMER1 "Reset Reloj 1"
#define TR_RESET_TIMER2 "Reset Reloj 2"
#define TR_RESET_TIMER3 "Reset Reloj 3"
+1 -1
View File
@@ -978,7 +978,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Delete"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "Reset Flight"
#define TR_RESET_SESSION "Reset Flight"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
+1 -1
View File
@@ -982,7 +982,7 @@
#define TR_PASTE_BEFORE "Coller Avant"
#define TR_DELETE "Supprimer"
#define TR_INSERT "Insérer"
#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinit. vol")
#define TR_RESET_SESSION TR("Réinit. vol", "Réinit. vol")
#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinit. Chrono1")
#define TR_RESET_TIMER2 TR("Réinit. Timer2", "Réinit. Chrono2")
#define TR_RESET_TIMER3 TR("Réinit. Timer3", "Réinit. Chrono3")
+1 -1
View File
@@ -987,7 +987,7 @@
#define TR_PASTE_BEFORE "הדבק לפני"
#define TR_DELETE "מחק"
#define TR_INSERT "Insert"
#define TR_RESET_FLIGHT "איפוס טיסה"
#define TR_RESET_SESSION "איפוס טיסה"
#define TR_RESET_TIMER1 "איפוס שעון 1 "
#define TR_RESET_TIMER2 "איפוס שעון 2"
#define TR_RESET_TIMER3 "איפוס שעון 3"
+1 -1
View File
@@ -984,7 +984,7 @@
#define TR_PASTE_BEFORE "Incolla Prima"
#define TR_DELETE "Elimina"
#define TR_INSERT TR("Inser.","Inserisci")
#define TR_RESET_FLIGHT "Azzera volo"
#define TR_RESET_SESSION "Azzera volo"
#define TR_RESET_TIMER1 "Azzera Timer1"
#define TR_RESET_TIMER2 "Azzera Timer2"
#define TR_RESET_TIMER3 "Azzera Timer3"
+1 -1
View File
@@ -983,7 +983,7 @@
#define TR_PASTE_BEFORE "前に貼り付け"
#define TR_DELETE "削除"
#define TR_INSERT "挿入"
#define TR_RESET_FLIGHT "飛行記録リセット"
#define TR_RESET_SESSION "飛行記録リセット"
#define TR_RESET_TIMER1 "タイマー1 リセット"
#define TR_RESET_TIMER2 "タイマー2 リセット"
#define TR_RESET_TIMER3 "タイマー3 リセット"
+1 -1
View File
@@ -1028,7 +1028,7 @@
#define TR_PASTE_BEFORE "앞에 붙여넣기"
#define TR_DELETE "삭제"
#define TR_INSERT "삽입"
#define TR_RESET_FLIGHT "세션 초기화"
#define TR_RESET_SESSION "세션 초기화"
#define TR_RESET_TIMER1 "타이머1 초기화"
#define TR_RESET_TIMER2 "타이머2 초기화"
#define TR_RESET_TIMER3 "타이머3 초기화"
+1 -1
View File
@@ -980,7 +980,7 @@
#define TR_PASTE_BEFORE "Paste Before"
#define TR_DELETE "Verwijderen"
#define TR_INSERT "Invoegen"
#define TR_RESET_FLIGHT "Reset Vliegdata"
#define TR_RESET_SESSION "Reset Vliegdata"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
+1 -1
View File
@@ -977,7 +977,7 @@
#define TR_PASTE_BEFORE "Wklej przed"
#define TR_DELETE "Kasuj"
#define TR_INSERT "Wstaw"
#define TR_RESET_FLIGHT "Resetuj sesję"
#define TR_RESET_SESSION "Resetuj sesję"
#define TR_RESET_TIMER1 "Zeruj Timer1"
#define TR_RESET_TIMER2 "Zeruj Timer2"
#define TR_RESET_TIMER3 "Zeruj Timer3"
+1 -1
View File
@@ -985,7 +985,7 @@
#define TR_PASTE_BEFORE "Colar depois"
#define TR_DELETE "Apagar"
#define TR_INSERT "Inserir"
#define TR_RESET_FLIGHT "Reinic. sessão"
#define TR_RESET_SESSION "Reinic. sessão"
#define TR_RESET_TIMER1 "Reset timer1"
#define TR_RESET_TIMER2 "Reset timer2"
#define TR_RESET_TIMER3 "Reset timer3"
+1 -1
View File
@@ -986,7 +986,7 @@
#define TR_PASTE_BEFORE "Вставить перед"
#define TR_DELETE "Удалить"
#define TR_INSERT "Вставить"
#define TR_RESET_FLIGHT "Сброс сесии"
#define TR_RESET_SESSION "Сброс сесии"
#define TR_RESET_TIMER1 "Сбросить таймер1"
#define TR_RESET_TIMER2 "Сбросить таймер2"
#define TR_RESET_TIMER3 "Сбросить таймер3"
+1 -1
View File
@@ -985,7 +985,7 @@
#define TR_PASTE_BEFORE "Klistra in före"
#define TR_DELETE "Radera"
#define TR_INSERT "Addera"
#define TR_RESET_FLIGHT "Återställ session"
#define TR_RESET_SESSION "Återställ session"
#define TR_RESET_TIMER1 "Återställ timer1"
#define TR_RESET_TIMER2 "Återställ timer2"
#define TR_RESET_TIMER3 "Återställ timer3"
+1 -1
View File
@@ -981,7 +981,7 @@
#define TR_PASTE_BEFORE "貼上到本條之前"
#define TR_DELETE "刪除"
#define TR_INSERT "插入"
#define TR_RESET_FLIGHT "復位飛行數據"
#define TR_RESET_SESSION "復位飛行數據"
#define TR_RESET_TIMER1 "重啟計時器1"
#define TR_RESET_TIMER2 "重啟計時器2"
#define TR_RESET_TIMER3 "重啟計時器3"
+1 -1
View File
@@ -985,7 +985,7 @@
#define TR_PASTE_BEFORE "Вставити до"
#define TR_DELETE "Видалити"
#define TR_INSERT "Вставити"
#define TR_RESET_FLIGHT "Скинути сесію"
#define TR_RESET_SESSION "Скинути сесію"
#define TR_RESET_TIMER1 "Скинути таймер1"
#define TR_RESET_TIMER2 "Скинути таймер2"
#define TR_RESET_TIMER3 "Скинути таймер3"
+1 -1
View File
@@ -854,7 +854,7 @@
#define STR_REPEAT_AT_ZERO currentLangStrings->STR_REPEAT_AT_ZERO
#define STR_REPEAT currentLangStrings->STR_REPEAT
#define STR_RESET_BTN currentLangStrings->STR_RESET_BTN
#define STR_RESET_FLIGHT currentLangStrings->STR_RESET_FLIGHT
#define STR_RESET_SESSION currentLangStrings->STR_RESET_SESSION
#define STR_RESET_SUBMENU currentLangStrings->STR_RESET_SUBMENU
#define STR_RESET_TELEMETRY currentLangStrings->STR_RESET_TELEMETRY
#define STR_RESET_TIMER1 currentLangStrings->STR_RESET_TIMER1
+1 -1
View File
@@ -853,7 +853,7 @@ STR(RENAME_FILE)
STR(REPEAT_AT_ZERO)
STR(REPEAT)
STR(RESET_BTN)
STR(RESET_FLIGHT)
STR(RESET_SESSION)
STR(RESET_SUBMENU)
STR(RESET_TELEMETRY)
STR(RESET_TIMER1)