piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Split UART_MODE_NONE and UART_MODE_DEBUG

Browse Source
This commit is contained in:
Raphael Coeffic
2022-03-20 16:30:59 +01:00
parent f95597a7ce
commit 6b9c4fe165
18 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/dataconstants.h
+1 -2
View File
@@ -233,12 +233,11 @@ enum UartModes {
UART_MODE_LUA,
UART_MODE_CLI,
UART_MODE_GPS,
UART_MODE_DEBUG,
UART_MODE_COUNT SKIP,
UART_MODE_MAX SKIP = UART_MODE_COUNT-1
};
#define UART_MODE_DEBUG UART_MODE_NONE
#define LEN_SWITCH_NAME 3
#define LEN_ANA_NAME 3
#define LEN_MODEL_FILENAME 16
radio/src/gui/gui_common.cpp
+3
View File
@@ -377,6 +377,9 @@ int hasSerialMode(int mode)
bool isSerialModeAvailable(uint8_t port_nr, int mode)
{
if (mode == UART_MODE_NONE)
return true;
auto p = hasSerialMode(mode);
if (p >= 0 && p != port_nr) return false;
return true;
radio/src/storage/yaml/yaml_datastructs_funcs.cpp
+1
View File
@@ -1768,6 +1768,7 @@ static const struct YamlIdStr enum_UartModes[] = {
{ UART_MODE_LUA, "LUA" },
{ UART_MODE_CLI, "CLI" },
{ UART_MODE_GPS, "GPS" },
{ UART_MODE_DEBUG, "DEBUG" },
{ 0, NULL }
};
radio/src/targets/horus/board.cpp
+3 -1
View File
@@ -165,7 +165,9 @@ void boardInit()
__enable_irq();
initSerialPorts();
#if defined(DEBUG)
serialInit(SP_AUX1, UART_MODE_DEBUG);
#endif
TRACE("\nHorus board started :)");
TRACE("RCC->CSR = %08x", RCC->CSR);
radio/src/targets/nv14/board.cpp
+2 -5
View File
@@ -120,11 +120,8 @@ void boardInit()
__enable_irq();
#endif
#if defined(DEBUG) && defined(AUX_SERIAL)
auxSerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
#endif
#if defined(DEBUG) && defined(AUX2_SERIAL)
aux2SerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
#if defined(DEBUG)
serialInit(SP_AUX1, UART_MODE_DEBUG);
#endif
TRACE("\nNV14 board started :)");
radio/src/targets/taranis/board.cpp
+3 -1
View File
@@ -227,7 +227,9 @@ void boardInit()
i2cInit();
usbInit();
initSerialPorts();
#if defined(DEBUG)
serialInit(SP_AUX1, UART_MODE_DEBUG);
#endif
#if defined(HAPTIC)
hapticInit();
radio/src/translations/cn.h.txt
+1 -1
View File
@@ -63,7 +63,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\010"
#define TR_AUX_SERIAL_MODES "调试\0 " "回传镜像" "回传输入" "SBUS教练" "LUA脚本\0""CLI\0 "
#define TR_AUX_SERIAL_MODES "调试\0 " "回传镜像" "回传输入" "SBUS教练" "LUA脚本\0""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\004"
#define TR_SWTYPES "无\0 " "回弹" "2段\0""3段\0"
radio/src/translations/cz.h.txt
+1 -5
View File
@@ -61,11 +61,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "VYP\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "VYP\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\013"
#define TR_SWTYPES "Žádný\0 ""Bez aretace""2-polohový\0""3-polohový\0"
radio/src/translations/de.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "AUS\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "AUS\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Kein\0 ""Taster""2POS\0 ""3POS\0"
radio/src/translations/en.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 ""GPS\0 "
#else
#define TR_AUX_SERIAL_MODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 ""GPS\0 "
#endif
#define TR_AUX_SERIAL_MODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "None\0 ""Toggle""2POS\0 ""3POS\0"
radio/src/translations/es.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Telem Mirror\0""Telemetría\0 ""Entrenador SBUS""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "OFF\0 ""Telem Mirror\0""Telemetría\0 ""Entrenador SBUS""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "OFF\0 ""Telem Mirror\0""Telemetría\0 ""Entrenador SBUS""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\007"
#define TR_SWTYPES "Nada\0 ""Palanca""2POS\0 ""3POS\0 "
radio/src/translations/fi.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "POIS\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "POIS\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "None\0 ""Toggle""2POS\0 ""3POS\0"
radio/src/translations/fr.h.txt
+1 -5
View File
@@ -65,11 +65,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\016"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "OFF\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "OFF\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Rien\0 ""Levier""2-POS\0""3-POS\0"
radio/src/translations/it.h.txt
+1 -5
View File
@@ -63,11 +63,7 @@
#define TR_TRNCHN "ch1ch2ch3ch4"
#define LEN_AUX_SERIAL_MODES "\016"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Dis.\0 ""Toggle""2POS\0 ""3POS\0"
radio/src/translations/nl.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\015"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "UIT\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "UIT\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Geen\0 ""Wissel""2POS\0 ""3POS\0"
radio/src/translations/pl.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "KN1KN2KN3KN4"
#define LEN_AUX_SERIAL_MODES "\015" /*13 decimal*/
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "Wyłącz\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "Wyłącz\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Brak\0 ""Chwil.""2POZ\0 ""3POZ\0"
radio/src/translations/pt.h.txt
+1 -5
View File
@@ -62,11 +62,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_AUX_SERIAL_MODES "\017"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "None\0 ""Toggle""2POS\0 ""3POS\0"
radio/src/translations/se.h.txt
+1 -5
View File
@@ -68,11 +68,7 @@
#define TR_TRNCHN "KN1KN2KN3KN4"
#define LEN_AUX_SERIAL_MODES "\022"
#if defined(CLI) || defined(DEBUG)
#define TR_AUX_SERIAL_MODES "Debug\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#else
#define TR_AUX_SERIAL_MODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 "
#endif
#define TR_AUX_SERIAL_MODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 ""CLI\0 ""GPS\0 ""Debug\0 "
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Ingen\0""Flipp\0""2Pos\0 ""3Pos\0"