UI improvements

This commit is contained in:
Raphael Coeffic
2022-03-20 16:30:58 +01:00
parent f1dc564c76
commit 074a141d81
10 changed files with 75 additions and 35 deletions
@@ -309,6 +309,7 @@ static const etx_serial_driver_t usbSerialDriver = {
};
const etx_serial_port_t UsbSerialPort = {
"VCP",
&usbSerialDriver,
nullptr,
};
+1 -1
View File
@@ -54,6 +54,7 @@ set(INTERNAL_MODULES PXX1;PXX2;MULTI;CRSF CACHE STRING "Internal modules")
# VCP CLI
set(ENABLE_SERIAL_PASSTHROUGH ON CACHE BOOL "Enable serial passthrough")
set(CLI ON CACHE BOOL "Enable CLI")
set(AUX_SERIAL ON)
if (PCB STREQUAL X10)
set(PCBREV "STD" CACHE STRING "PCB Revision")
@@ -100,7 +101,6 @@ if (PCB STREQUAL X10)
set(USB_CHARGER YES)
set(DEFAULT_THEME "DARKBLUE")
set(SBUS_TRAINER ON)
set(AUX_SERIAL ON)
add_definitions(-DMANUFACTURER_RADIOMASTER)
if (NOT BLUETOOTH)
set(AUX2_SERIAL ON)
+8
View File
@@ -349,6 +349,7 @@ void set_aux_pwr(uint8_t on)
}
const etx_serial_port_t auxSerialPort = {
"AUX1",
&AuxSerialDriver,
set_aux_pwr,
};
@@ -366,6 +367,13 @@ void set_aux2_pwr(uint8_t on)
}
const etx_serial_port_t aux2SerialPort = {
#if !defined(PCBX12S)
"AUX2",
#else
// AUX2 is hardwired to the internal GPS
// on the X12S, let's hide the setting
nullptr,
#endif
&Aux2SerialDriver,
set_aux2_pwr,
};
+3 -6
View File
@@ -747,21 +747,18 @@ void rtcSetTime(const struct gtm * t)
}
#if defined(USB_SERIAL)
const etx_serial_port_t UsbSerialPort = {
nullptr,
nullptr,
};
const etx_serial_port_t UsbSerialPort = { "VCP", nullptr, nullptr };
#endif
#if defined(AUX_SERIAL)
const etx_serial_port_t auxSerialPort = { nullptr, nullptr };
const etx_serial_port_t auxSerialPort = { "AUX1", nullptr, nullptr };
#define AUX_SERIAL_PORT &auxSerialPort
#else
#define AUX_SERIAL_PORT nullptr
#endif
#if defined(AUX2_SERIAL)
const etx_serial_port_t aux2SerialPort = { nullptr, nullptr };
const etx_serial_port_t aux2SerialPort = { "AUX2", nullptr, nullptr };
#define AUX2_SERIAL_PORT &aux2SerialPort
#else
#define AUX2_SERIAL_PORT nullptr
+1
View File
@@ -419,6 +419,7 @@ void initJackDetect(void)
#if defined(AUX_SERIAL)
const etx_serial_port_t auxSerialPort = {
"AUX1",
&AuxSerialDriver,
nullptr
};