From 2ff56febb841abcada6fd58a0645c60a51706fc3 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 11 Feb 2019 00:14:06 +0100 Subject: [PATCH 01/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 673a08dc7..4b4f8e893 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1486,3 +1486,4 @@ Lee Bennett Morgantech Marek Přikryl Peter Scott +Ernst Camenzind From 26692b457bbeed8c8dd82ed88100e2c6e8249556 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 12 Feb 2019 20:07:43 +0100 Subject: [PATCH 02/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 4b4f8e893..b02c82c9a 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1487,3 +1487,4 @@ Morgantech Marek Přikryl Peter Scott Ernst Camenzind +Steve Robbins From 5780a8fd785d4b8925d3f3e31fbfceb70d68edaa Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 18 Feb 2019 09:19:58 +0100 Subject: [PATCH 03/22] Add telem1-32 and lua mixer outputs to LUA --- radio/src/dataconstants.h | 4 ++-- radio/src/lua/api_general.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index a82ecb289..c22d85869 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -524,7 +524,7 @@ enum MixSources { MIXSRC_LAST_INPUT = MIXSRC_FIRST_INPUT+MAX_INPUTS-1, #if defined(LUA_INPUTS) - MIXSRC_FIRST_LUA, + MIXSRC_FIRST_LUA, LUA_EXPORT_MULTIPLE("lua", "Lua mix output %d", MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS) MIXSRC_LAST_LUA = MIXSRC_FIRST_LUA+(MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS)-1, #endif @@ -699,7 +699,7 @@ enum MixSources { MIXSRC_TIMER3, LUA_EXPORT("timer3", "Timer 3 value [seconds]") MIXSRC_LAST_TIMER = MIXSRC_TIMER3, - MIXSRC_FIRST_TELEM, + MIXSRC_FIRST_TELEM, LUA_EXPORT_MULTIPLE("telem", "Telemetry sensor %d", MAX_TELEMETRY_SENSORS) MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+3*MAX_TELEMETRY_SENSORS-1 }; diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index c0b377298..be543535f 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -301,7 +301,10 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags) continue; } if (index < luaMultipleFields[n].count) { - field.id = luaMultipleFields[n].id + index; + if(luaMultipleFields[n].id == MIXSRC_FIRST_TELEM) + field.id = luaMultipleFields[n].id + index*3; + else + field.id = luaMultipleFields[n].id + index; if (flags & FIND_FIELD_DESC) { snprintf(field.desc, sizeof(field.desc)-1, luaMultipleFields[n].desc, index+1); field.desc[sizeof(field.desc)-1] = '\0'; From 5e7722b7669dd5d33695a826218937771d55c86b Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 20 Feb 2019 20:51:39 +0100 Subject: [PATCH 04/22] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index b02c82c9a..493fd260a 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1488,3 +1488,5 @@ Marek Přikryl Peter Scott Ernst Camenzind Steve Robbins +Jean Noel Berlan +Walter Szempruch From 627c0282c9304f2e6c9215c502ed7d380247b0e1 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 22 Feb 2019 19:25:01 +0100 Subject: [PATCH 05/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 493fd260a..c5c876d29 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1490,3 +1490,4 @@ Ernst Camenzind Steve Robbins Jean Noel Berlan Walter Szempruch +Petr Kysela From 16ed585a9e73b548615a391936dc31072457bd6f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 23 Feb 2019 23:28:18 +0100 Subject: [PATCH 06/22] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index c5c876d29..a9970cb87 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1491,3 +1491,5 @@ Steve Robbins Jean Noel Berlan Walter Szempruch Petr Kysela +Gerhard Zdzuj +Joseph S Robinson From edfeab0d192f38752b2644c35c32cd56e189dd70 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 24 Feb 2019 22:15:32 +0100 Subject: [PATCH 07/22] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index a9970cb87..b4bd5cc3c 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1493,3 +1493,5 @@ Walter Szempruch Petr Kysela Gerhard Zdzuj Joseph S Robinson +Zdenek Trojanek +Fred Page From 84a7758614c5f074a3ee58bfeba8d1c3bad414f3 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 28 Feb 2019 22:20:13 +0100 Subject: [PATCH 08/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index b4bd5cc3c..25d6a0479 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1495,3 +1495,4 @@ Gerhard Zdzuj Joseph S Robinson Zdenek Trojanek Fred Page +Burt Pickard-Richardson From a8dcc20a82aa2ef9896c8c874a94982147d82ff4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 1 Mar 2019 14:58:35 +0100 Subject: [PATCH 09/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 25d6a0479..e909900df 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1496,3 +1496,4 @@ Joseph S Robinson Zdenek Trojanek Fred Page Burt Pickard-Richardson +Eric Destrebecq From 484995586f29ec6b494aedff1b35cc80b34673a2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 8 Mar 2019 08:51:16 +0100 Subject: [PATCH 10/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index e909900df..4aaccbf95 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1497,3 +1497,4 @@ Zdenek Trojanek Fred Page Burt Pickard-Richardson Eric Destrebecq +Derek Quigley From ce08e3132a4eced2cc664903d4a9f2cc4917c1ff Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 9 Mar 2019 00:15:45 +0100 Subject: [PATCH 11/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 4aaccbf95..35412bc95 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1498,3 +1498,4 @@ Fred Page Burt Pickard-Richardson Eric Destrebecq Derek Quigley +Lionel Lunan From f81f1c3d2d0eab62bd1878ea816a73465553815c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 9 Mar 2019 14:27:19 +0100 Subject: [PATCH 12/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 35412bc95..55d587d83 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1499,3 +1499,4 @@ Burt Pickard-Richardson Eric Destrebecq Derek Quigley Lionel Lunan +Paul Dittman From ed92672139e759460915c73cf77f9b58dc236072 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 9 Mar 2019 20:25:44 +0100 Subject: [PATCH 13/22] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 55d587d83..e20a3ca6b 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1500,3 +1500,5 @@ Eric Destrebecq Derek Quigley Lionel Lunan Paul Dittman +Justin Delaire +Damir Pooshs From 7804f0df2a7032a90cbc884ca0e4018bfa7d2eb5 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 10 Mar 2019 12:31:56 +0100 Subject: [PATCH 14/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index e20a3ca6b..7901cd43e 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1502,3 +1502,4 @@ Lionel Lunan Paul Dittman Justin Delaire Damir Pooshs +Alvin Burke From 283c2464123989bba90885e455da5d8b0d6c62f2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 10 Mar 2019 20:27:41 +0100 Subject: [PATCH 15/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 7901cd43e..0e02ca63f 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1503,3 +1503,4 @@ Paul Dittman Justin Delaire Damir Pooshs Alvin Burke +Pete Rathbun From 14551408ab97ec3b54998c33706abe94c796b1e3 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 11 Mar 2019 16:00:22 +0100 Subject: [PATCH 16/22] Add FrSky SBEC configuration tool (Neuron, FrESC,...) --- radio/sdcard/FrSky-utilities/FrSky SBEC.lua | 285 ++++++++++++++++++++ 1 file changed, 285 insertions(+) create mode 100644 radio/sdcard/FrSky-utilities/FrSky SBEC.lua diff --git a/radio/sdcard/FrSky-utilities/FrSky SBEC.lua b/radio/sdcard/FrSky-utilities/FrSky SBEC.lua new file mode 100644 index 000000000..473b6569b --- /dev/null +++ b/radio/sdcard/FrSky-utilities/FrSky SBEC.lua @@ -0,0 +1,285 @@ + +---- ######################################################################### +---- # # +---- # Copyright (C) OpenTX # +-----# # +---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html # +---- # # +---- # This program is free software; you can redistribute it and/or modify # +---- # it under the terms of the GNU General Public License version 2 as # +---- # published by the Free Software Foundation. # +---- # # +---- # This program is distributed in the hope that it will be useful # +---- # but WITHOUT ANY WARRANTY; without even the implied warranty of # +---- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +---- # GNU General Public License for more details. # +---- # # +---- ######################################################################### + +local version = "v1.2" + +local VALUE = 0 +local COMBO = 1 +local FLPOI = 2 + + +local edit = false +local page = 1 +local current = 1 --row +local refreshState = 0 +local refreshIndex = 0 +local refreshIndex3 = 0 +local pageOffset = 0 +local pages = {} +local fields = {} +local modifications = {} +local thistime = getTime() +local lastTime = thistime +local margin = 1 +local spacing = 8 +local configFields = {} +local counter = 0 + +local function drawScreenTitle(title,page, pages) + if math.fmod(math.floor(getTime()/100),10) == 0 then + title = version + end + if LCD_W == 480 then + lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR) + lcd.drawText(1, 5, title, MENU_TITLE_COLOR) + lcd.drawText(LCD_W-40, 5, page.."/"..pages, MENU_TITLE_COLOR) + else + lcd.drawScreenTitle(title, page, pages) + end +end + +local settingsFields = { + {"SBEC OUTPUT (V)", VALUE, 0x80, nil, 50, 84 }, + --{"Physical ID", VALUE, 0x01, nil, 0, 26 }, + --{"Application IDgroup", VALUE, 0x0D, nil, 0, 15 }, + --{"Data rate(*100ms)", VALUE, 0x22, nil, 1, 255 }, +} + +-- Change display attribute to current field +local function addField(step) + local field = fields[current] + local min, max + if field[2] == VALUE then + min = field[5] + max = field[6] + elseif field[2] == COMBO then + min = 0 + max = #(field[5]) - 1 + end + if field[2] ~= FLPOT then --only read ? + if field[2] == VALUE and field[6] > 256 then + if field[4] > 1000 then + step = step * 50 + field[4] = math.floor(field[4]/50) + field[4] = field[4] *50 + elseif field[4] > 500 then + step = step * 20 + field[4] = math.floor(field[4]/20) + field[4] = field[4] *20 + elseif field[4] > 200 then + step = step * 10 + field[4] = math.floor(field[4]/10) + field[4] = field[4] *10 + else + step = step * 1 + field[4] = math.floor(field[4]/1) + field[4] = field[4] *1 + end + end + if (step < 0 and field[4] > min) or (step > 0 and field[4] < max) then + field[4] = field[4] + step + end + else + field[4] = field[4] + end +end + + +-- Select the next or previous editable field +local function selectField(step) + current = current + step + if current > #fields then + current = #fields + elseif current < 1 then + current = 1 + end + if current > 7 + pageOffset then + pageOffset = current - 7 + elseif current <= pageOffset then + pageOffset = current - 1 + end +end + +local function drawProgressBar() + if LCD_W == 480 then + local width = (300 * refreshIndex) / #fields + lcd.drawRectangle(100, 10, 300, 6) + lcd.drawFilledRectangle(102, 13, width, 2); + else + local width = (60 * refreshIndex) / #fields + lcd.drawRectangle(45, 1, 60, 6) + lcd.drawFilledRectangle(47, 3, width, 2); + end +end + +-- Redraw the current page +local function redrawFieldsPage() + lcd.clear() + drawScreenTitle("SBEC", page, #pages) + if refreshIndex < #fields then + drawProgressBar() + end + for index = 1, 7, 1 do + local field = fields[pageOffset+index] + if field == nil then + break + end + local attr = current == (pageOffset+index) and ((edit == true and BLINK or 0) + INVERS) or 0 + lcd.drawText(1, margin+ spacing * index, field[1]) + if field[4] == nil then + lcd.drawText(LCD_W, margin+ spacing * index, "---", attr + RIGHT) + else + if field[2] == VALUE then + if field[3] == 0x80 then + lcd.drawNumber(LCD_W, margin+ spacing * index, field[4] , attr + RIGHT + PREC1) + else + lcd.drawNumber(LCD_W, margin+ spacing * index, field[4] , attr + RIGHT) + end + end + end + end +end + +local function telemetryRead(fieldx) + return sportTelemetryPush(0x08, 0x30, 0x0e50, fieldx) +end + +local function telemetryIdle(field) + return sportTelemetryPush(0x08,0x21,0x0e50,field) +end + +local function telemetryUnIdle(field) + return sportTelemetryPush(0x08,0x20,0x0e50,field) +end + +local function telemetryWrite(fieldx, valuex) + return sportTelemetryPush(0x08, 0x31, 0x0e50, fieldx + valuex*256) +end + +local telemetryPopTimeout = 0 +local function refreshNext() + if refreshState == 0 then + if #modifications > 0 then + local modificationstmp = modifications[1][2] + telemetryWrite(modifications[1][1], modificationstmp) + refreshIndex = 0 + modifications[1] = nil + elseif refreshIndex < #fields then + local field = fields[refreshIndex + 1] + if telemetryRead(field[3]) == true then + refreshState = 1 + telemetryPopTimeout = getTime() + 80 + end + end + elseif refreshState == 1 then + local physicalId, primId, dataId, value = sportTelemetryPop() + if primId == 0x32 and dataId >= 0x0e50 and dataId <= 0x0e5f then + local fieldId = value % 256 + local field = fields[refreshIndex + 1] + if fieldId == field[3] then + local value = math.floor(value / 256) + if field[2] == VALUE then + value = value + end + + fields[refreshIndex + 1][4] = value + refreshIndex = refreshIndex + 1 + refreshState = 0 + end + elseif getTime() > telemetryPopTimeout then + refreshState = 0 + end + end +end + +local function updateField(field) + local value = field[4] + if field[2] == VALUE and #field == 6 then + value = value + end + modifications[#modifications+1] = {field[3], value} +end + +-- Main1 +local function runFieldsPage(event) + if event == EVT_EXIT_BREAK then + telemetryUnIdle(0x80) + return 2 + elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then + if fields[current][4] ~= nil then + edit = not edit + if edit == false then + updateField(fields[current]) + end + end + elseif edit then + if event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_PLUS_REPT or event == EVT_RIGHT_FIRST then + addField(1) + elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT or event == EVT_LEFT_FIRST then + addField(-1) + end + else + if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_DOWN_FIRST then + selectField(1) + elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT or event == EVT_UP_FIRST then + selectField(-1) + end + end + redrawFieldsPage() + return 0 +end + + +local function runSettingsPage(event) + fields = settingsFields + return runFieldsPage(event) +end + +-- Init +local function init() + current, edit, refreshState, refreshIndex = 1, false, 0, 0 + if LCD_W == 480 then + margin = 10 + spacing = 20 + end + + pages = { + runSettingsPage, + } + + telemetryIdle(0x80) +end + +local function run(event) + if event == nil then + error("Cannot run as a model script!") + return 2 + elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_SHIFT_BREAK then + --selectPage(1) + elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST or event == EVT_SHIFT_LONG then + --killEvents(event); + --selectPage(-1) + end + local result = pages[page](event) + + refreshNext() + + return result +end + +return { init=init, background=background, run=run } From 9ad34c512f7ad9773b7ccb663013a1b0f7e78ad5 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 14 Mar 2019 12:54:59 +0100 Subject: [PATCH 17/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 0e02ca63f..23deac17c 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1504,3 +1504,4 @@ Justin Delaire Damir Pooshs Alvin Burke Pete Rathbun +Christophe Molliex From 89e02180476194ea9892f55833877bd0731403ca Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 16 Mar 2019 08:55:05 +0100 Subject: [PATCH 18/22] Improve navigation --- radio/src/gui/128x64/model_logical_switches.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/128x64/model_logical_switches.cpp b/radio/src/gui/128x64/model_logical_switches.cpp index cebf9c9a2..0d2303bfe 100644 --- a/radio/src/gui/128x64/model_logical_switches.cpp +++ b/radio/src/gui/128x64/model_logical_switches.cpp @@ -269,7 +269,13 @@ void menuModelLogicalSwitches(event_t event) POPUP_MENU_ADD_ITEM(STR_PASTE); if (cs->func || cs->v1 || cs->v2 || cs->delay || cs->duration || cs->andsw) POPUP_MENU_ADD_ITEM(STR_CLEAR); - POPUP_MENU_START(onLogicalSwitchesMenu); + if(popupMenuNoItems == 1) { + popupMenuNoItems = 0; + s_currIdx = sub; + pushMenu(menuModelLogicalSwitchOne); + } + else + POPUP_MENU_START(onLogicalSwitchesMenu); } for (uint8_t i=0; i Date: Sat, 16 Mar 2019 10:16:55 +0100 Subject: [PATCH 19/22] Move analogs and switches debugs for main RADIO menu --- radio/src/gui/128x64/menus.h | 8 +------- radio/src/gui/128x64/radio_calibration.cpp | 2 +- radio/src/gui/128x64/radio_diaganas.cpp | 2 +- radio/src/gui/128x64/radio_diagkeys.cpp | 2 +- radio/src/gui/128x64/radio_hardware.cpp | 19 ++++++++++++++++++- radio/src/translations.cpp | 4 ++++ radio/src/translations.h | 4 ++++ radio/src/translations/cz.h.txt | 4 ++++ radio/src/translations/de.h.txt | 4 ++++ radio/src/translations/en.h.txt | 4 ++++ radio/src/translations/es.h.txt | 4 ++++ radio/src/translations/fi.h.txt | 4 ++++ radio/src/translations/fr.h.txt | 4 ++++ radio/src/translations/it.h.txt | 4 ++++ radio/src/translations/nl.h.txt | 4 ++++ radio/src/translations/pl.h.txt | 4 ++++ radio/src/translations/pt.h.txt | 4 ++++ radio/src/translations/se.h.txt | 4 ++++ 18 files changed, 74 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 2a0a565d6..ee5c9e552 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -76,10 +76,7 @@ enum MenuRadioIndexes MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_VERSION, - MENU_RADIO_SWITCHES_TEST, - MENU_RADIO_ANALOGS_TEST, MENU_RADIO_HARDWARE, - MENU_RADIO_CALIBRATION, MENU_RADIO_PAGES_COUNT }; @@ -99,10 +96,7 @@ static const MenuHandlerFunc menuTabGeneral[] = { menuRadioSpecialFunctions, menuRadioTrainer, menuRadioVersion, - menuRadioDiagKeys, - menuRadioDiagAnalogs, - menuRadioHardware, - menuRadioCalibration + menuRadioHardware }; enum MenuModelIndexes { diff --git a/radio/src/gui/128x64/radio_calibration.cpp b/radio/src/gui/128x64/radio_calibration.cpp index de1a5e3c7..ee6d8d68a 100644 --- a/radio/src/gui/128x64/radio_calibration.cpp +++ b/radio/src/gui/128x64/radio_calibration.cpp @@ -172,7 +172,7 @@ void menuCommonCalib(event_t event) void menuRadioCalibration(event_t event) { - check_simple(event, MENU_RADIO_CALIBRATION, menuTabGeneral, DIM(menuTabGeneral), 0); + check_submenu_simple(event, 0); TITLE(STR_MENUCALIBRATION); menuCommonCalib(READ_ONLY() ? 0 : event); if (menuEvent) { diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 0385c4227..7665f7ca4 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -31,7 +31,7 @@ void menuRadioDiagAnalogs(event_t event) #define ANAS_ITEMS_COUNT 1 #endif - SIMPLE_MENU(STR_MENU_RADIO_ANALOGS, menuTabGeneral, MENU_RADIO_ANALOGS_TEST, HEADER_LINE+ANAS_ITEMS_COUNT); + SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, HEADER_LINE+ANAS_ITEMS_COUNT); for (uint8_t i=0; i 9 diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 4cd34b416..35a3d73fa 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -36,7 +36,7 @@ void displaySwitchState(uint8_t x, uint8_t y, uint8_t sw) void menuRadioDiagKeys(event_t event) { - SIMPLE_MENU(STR_MENU_RADIO_SWITCHES, menuTabGeneral, MENU_RADIO_SWITCHES_TEST, 1); + SIMPLE_SUBMENU(STR_MENU_RADIO_SWITCHES, 1); lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM); diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 85bb01e33..6025a9b6e 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -122,6 +122,7 @@ enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_BLUETOOTH_NAME, #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, + ITEM_RADIO_HARDWARE_DEBUG, ITEM_RADIO_HARDWARE_MAX }; @@ -151,7 +152,7 @@ enum MenuRadioHardwareItems { void menuRadioHardware(event_t event) { - MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/ }); + MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/, 1 /* debugs */ }); uint8_t sub = menuVerticalPosition - HEADER_LINE; @@ -168,6 +169,10 @@ void menuRadioHardware(event_t event) switch(k) { case ITEM_RADIO_HARDWARE_LABEL_STICKS: lcdDrawTextAlignedLeft(y, STR_STICKS); + lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_CALIB_BTN, attr); + if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { + pushMenu(menuRadioCalibration); + } break; case ITEM_RADIO_HARDWARE_STICK1: case ITEM_RADIO_HARDWARE_STICK2: @@ -280,6 +285,18 @@ void menuRadioHardware(event_t event) case ITEM_RADIO_HARDWARE_JITTER_FILTER: g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event); break; + + case ITEM_RADIO_HARDWARE_DEBUG: + lcdDrawTextAlignedLeft(y, STR_DEBUG); + lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0); + lcdDrawText(lcdLastRightPos + 2, y, STR_SWITCHES_BTN, menuHorizontalPosition == 1 ? attr : 0); + if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { + if (menuHorizontalPosition == 0) + pushMenu(menuRadioDiagAnalogs); + else + pushMenu(menuRadioDiagKeys); + } + break; } } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 6684816da..c804a3fb3 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -453,6 +453,10 @@ const char STR_SUBTYPE[] = TR_SUBTYPE; #endif const char STR_RESET_BTN[] = TR_RESET_BTN; +const char STR_DEBUG[] = TR_DEBUG; +const char STR_SWITCHES_BTN[] = TR_SWITCHES_BTN; +const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN; +const char STR_CALIB_BTN[] = TR_CALIB_BTN; #if defined(SDCARD) const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL; diff --git a/radio/src/translations.h b/radio/src/translations.h index 2ec3981dd..3cfadc987 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -649,6 +649,10 @@ extern const char STR_PERSISTENT_MAH[]; #endif extern const char STR_RESET_BTN[]; +extern const char STR_DEBUG[]; +extern const char STR_SWITCHES_BTN[]; +extern const char STR_ANALOGS_BTN[]; +extern const char STR_CALIB_BTN[]; #if defined(SDCARD) extern const char STR_BACKUP_MODEL[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4294d322a..4ac05bd81 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -958,6 +958,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Volby") #define TR_TRAINER "Trenér" #define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index ab02c533b..959a58842 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -963,6 +963,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "DSC Buchse PPM In/Out" #define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 322932530..fd1c75c68 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -962,6 +962,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX antenna problem!" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 53da96ac6..af679dd62 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -969,6 +969,10 @@ #define TR_MODULE_BIND "[Enlace]" #define TR_MODULE_RANGE "[Limites]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Ajuste]" #define TR_TRAINER "Aprendiz" #define TR_ANTENNAPROBLEM CENTER "¡Problema antena TX!" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b09f22406..ec3405e32 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -961,6 +961,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 26a901ffc..3437cea2b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -973,6 +973,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Prt", "Port.")) #define TR_RESET_BTN BUTTON("RAZ") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Déf") #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 32d1eebc0..5f6fdfcfa 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -963,6 +963,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER TR("Trainer","Maestro/Allievo") #define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index ab9e48e41..23899ffeb 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -964,6 +964,10 @@ #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_RANGE TR("[Rng]", "[Range]") #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer Poort" #define TR_ANTENNAPROBLEM CENTER "TX-Antenneprobleem!" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 8f7af0ef1..276042762 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -964,6 +964,10 @@ #define TR_MODULE_BIND TR("[BND]","[Bind]") #define TR_MODULE_RANGE TR("[Zas]","Zasięg") #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Port Trenera" #define TR_ANTENNAPROBLEM CENTER "Problem z anteną TX" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 255b5f3f6..915760275 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -968,6 +968,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 9d2c71498..9b6cef3bc 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -975,6 +975,10 @@ #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_RANGE TR("[Tst]", "[Testa]") #define TR_RESET_BTN "[Nollställ]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Spara]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "Fel på TX-antennen" From 0aa3153f4dedb697c8b63698650ba61efd410927 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 16 Mar 2019 10:57:03 +0100 Subject: [PATCH 20/22] Move analogs and switches debugs for main RADIO menu, X9 version --- radio/src/gui/212x64/menu_radio.cpp | 7 ++----- radio/src/gui/212x64/menus.h | 3 --- radio/src/gui/212x64/radio_calibration.cpp | 4 ++-- radio/src/gui/212x64/radio_diaganas.cpp | 2 +- radio/src/gui/212x64/radio_diagkeys.cpp | 4 ++-- radio/src/gui/212x64/radio_hardware.cpp | 20 +++++++++++++++++++- radio/src/translations/cz.h.txt | 4 ++-- radio/src/translations/de.h.txt | 4 ++-- radio/src/translations/en.h.txt | 4 ++-- radio/src/translations/es.h.txt | 4 ++-- radio/src/translations/fi.h.txt | 4 ++-- radio/src/translations/fr.h.txt | 4 ++-- radio/src/translations/it.h.txt | 4 ++-- radio/src/translations/nl.h.txt | 4 ++-- radio/src/translations/pl.h.txt | 4 ++-- radio/src/translations/pt.h.txt | 4 ++-- radio/src/translations/se.h.txt | 4 ++-- 17 files changed, 48 insertions(+), 36 deletions(-) diff --git a/radio/src/gui/212x64/menu_radio.cpp b/radio/src/gui/212x64/menu_radio.cpp index 819e4da8f..e0452d8ec 100644 --- a/radio/src/gui/212x64/menu_radio.cpp +++ b/radio/src/gui/212x64/menu_radio.cpp @@ -2,7 +2,7 @@ * Copyright (C) OpenTX * * Based on code named - * th9x - http://code.google.com/p/th9x + * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x * @@ -26,10 +26,7 @@ const MenuHandlerFunc menuTabGeneral[] = { menuRadioSpecialFunctions, menuRadioTrainer, menuRadioVersion, - menuRadioDiagKeys, - menuRadioDiagAnalogs, - menuRadioHardware, - menuRadioCalibration + menuRadioHardware }; void menuRadioSpecialFunctions(event_t event) diff --git a/radio/src/gui/212x64/menus.h b/radio/src/gui/212x64/menus.h index 91fb3be07..4051a931f 100644 --- a/radio/src/gui/212x64/menus.h +++ b/radio/src/gui/212x64/menus.h @@ -66,10 +66,7 @@ enum MenuRadioIndexes { MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_VERSION, - MENU_RADIO_SWITCHES_TEST, - MENU_RADIO_ANALOGS_TEST, MENU_RADIO_HARDWARE, - MENU_RADIO_CALIBRATION, MENU_RADIO_PAGES_COUNT }; diff --git a/radio/src/gui/212x64/radio_calibration.cpp b/radio/src/gui/212x64/radio_calibration.cpp index 339db6a02..e6b85c622 100644 --- a/radio/src/gui/212x64/radio_calibration.cpp +++ b/radio/src/gui/212x64/radio_calibration.cpp @@ -2,7 +2,7 @@ * Copyright (C) OpenTX * * Based on code named - * th9x - http://code.google.com/p/th9x + * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x * @@ -195,7 +195,7 @@ void menuCommonCalib(event_t event) void menuRadioCalibration(event_t event) { - check_simple(STR_MENUCALIBRATION, event, MENU_RADIO_CALIBRATION, menuTabGeneral, DIM(menuTabGeneral), 0); + check_submenu_simple(STR_MENUCALIBRATION, event, 0); menuCommonCalib(READ_ONLY() ? 0 : event); if (menuEvent) { menuCalibrationState = CALIB_START; diff --git a/radio/src/gui/212x64/radio_diaganas.cpp b/radio/src/gui/212x64/radio_diaganas.cpp index 46e426c19..39f656b81 100644 --- a/radio/src/gui/212x64/radio_diaganas.cpp +++ b/radio/src/gui/212x64/radio_diaganas.cpp @@ -22,7 +22,7 @@ void menuRadioDiagAnalogs(event_t event) { - SIMPLE_MENU(STR_MENU_RADIO_ANALOGS, menuTabGeneral, MENU_RADIO_ANALOGS_TEST, 0); + SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, 0); for (uint8_t i=0; i Date: Sat, 16 Mar 2019 11:18:23 +0100 Subject: [PATCH 21/22] Cosmetics --- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 0ba362fe9..e98794833 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -960,7 +960,7 @@ #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Volby") #define TR_TRAINER "Trenér" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 8cf560640..52dce402d 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -965,7 +965,7 @@ #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "DSC Buchse PPM In/Out" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 1a92fbeb2..f04ada9cd 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -964,7 +964,7 @@ #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 6f78403bb..a00d60d29 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -971,7 +971,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Ajuste]" #define TR_TRAINER "Aprendiz" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 87a23b751..818aaa110 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -963,7 +963,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 3eaca3a75..cf2b657fe 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -975,7 +975,7 @@ #define TR_RESET_BTN BUTTON("RAZ") #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Déf") #define TR_TRAINER "Ecolage" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index c324fd8d0..83d79217b 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -965,7 +965,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER TR("Trainer","Maestro/Allievo") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index e16ea7eeb..c5774188e 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -966,7 +966,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer Poort" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 66912d5ff..ed2a754c9 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -966,7 +966,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Port Trenera" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index d6ecbd14a..fe87fcff8 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -970,7 +970,7 @@ #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index f4400ce4d..9e3e6f898 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -977,7 +977,7 @@ #define TR_RESET_BTN "[Nollställ]" #define TR_DEBUG "Debug" #define TR_SWITCHES_BTN BUTTON(TR("SW","Switches")) -#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs")) +#define TR_ANALOGS_BTN BUTTON(TR("Analog","Analogs")) #define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Spara]" #define TR_TRAINER "Trainer" From b5b7df37178ef6087a9fc79be4639bdb3b3bfa96 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 16 Mar 2019 13:30:06 +0100 Subject: [PATCH 22/22] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 23deac17c..8cf42101f 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -1505,3 +1505,4 @@ Damir Pooshs Alvin Burke Pete Rathbun Christophe Molliex +Ulf Hedlund