Initial TX16S (#7344)
* TX16S initial push - Radio booting, navigation keys ok * TX16S libsimu * Please Travis * Do not start radio on charger power * USB charger led handling * Revert "USB charger led handling" until we have proper details * Pseudo sport power pin * Please Travis * tx16s serial debug * Add tx16s calibration picture * Review anadir for tx16s, needs to be checked on more radios * Dump raw multi telem on AUX port * More work on TX16S * Fixes * Compilation fix * Compilation fix * Fix Aux Serial power * Various improvement * USB charger led handling * Cosmetics * Cosmetics * USB charger led handling * Add charge indicator on GUI
This commit is contained in:
@@ -64,6 +64,10 @@ const uint8_t LBM_TOPMENU_TXBATT[] = {
|
||||
#include "mask_txbat.lbm"
|
||||
};
|
||||
|
||||
const uint8_t LBM_TOPMENU_TXBATT_CHARGING[] = {
|
||||
#include "mask_txbat_charging.lbm"
|
||||
};
|
||||
|
||||
const uint8_t LBM_TOPMENU_ANTENNA[] = {
|
||||
#include "mask_antenna.lbm"
|
||||
};
|
||||
|
||||
@@ -34,6 +34,7 @@ extern const uint8_t LBM_TOPMENU_VOLUME_3[];
|
||||
extern const uint8_t LBM_TOPMENU_VOLUME_4[];
|
||||
extern const uint8_t LBM_TOPMENU_VOLUME_SCALE[];
|
||||
extern const uint8_t LBM_TOPMENU_TXBATT[];
|
||||
extern const uint8_t LBM_TOPMENU_TXBATT_CHARGING[];
|
||||
extern const uint8_t LBM_HTRIM_FRAME[];
|
||||
extern const uint8_t LBM_VTRIM_FRAME[];
|
||||
extern const uint8_t LBM_TRIM_SHADOW[];
|
||||
|
||||
@@ -347,6 +347,9 @@ bool menuRadioHardware(event_t event)
|
||||
#if defined(AUX_SERIAL)
|
||||
case ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE:
|
||||
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_AUX_SERIAL_MODE);
|
||||
#if defined(RADIO_TX16S)
|
||||
lcdDrawText(lcdNextPos, y, " (TTL)");
|
||||
#endif
|
||||
g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN+50, y, STR_AUX_SERIAL_MODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event);
|
||||
if (attr && checkIncDec_Ret) {
|
||||
auxSerialInit(g_eeGeneral.auxSerialMode, modelTelemetryProtocol());
|
||||
|
||||
@@ -139,6 +139,8 @@ class DarkblueTheme: public Theme
|
||||
delete calibHorus;
|
||||
#if defined(RADIO_T16)
|
||||
calibHorus = BitmapBuffer::load(getThemePath("t16.bmp"));
|
||||
#elif defined(RADIO_TX16S)
|
||||
calibHorus = BitmapBuffer::load(getThemePath("tx16s.bmp"));
|
||||
#elif defined(PCBX10)
|
||||
if(STICKS_PWM_ENABLED()) {
|
||||
calibHorus = BitmapBuffer::load(getThemePath("X10S.bmp"));
|
||||
|
||||
@@ -176,6 +176,8 @@ class DefaultTheme: public Theme
|
||||
delete calibHorus;
|
||||
#if defined(RADIO_T16)
|
||||
calibHorus = BitmapBuffer::load(getThemePath("t16.bmp"));
|
||||
#elif defined(RADIO_TX16S)
|
||||
calibHorus = BitmapBuffer::load(getThemePath("tx16s.bmp"));
|
||||
#elif defined(PCBX10)
|
||||
if(STICKS_PWM_ENABLED()) {
|
||||
calibHorus = BitmapBuffer::load(getThemePath("X10S.bmp"));
|
||||
|
||||
@@ -90,7 +90,12 @@ void drawTopBar()
|
||||
|
||||
/* Tx battery */
|
||||
uint8_t bars = GET_TXBATT_BARS(5);
|
||||
lcdDrawBitmapPattern(LCD_W-130, 24, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR);
|
||||
#if defined(USB_CHARGER)
|
||||
if(usbChargerLed())
|
||||
lcdDrawBitmapPattern(LCD_W-130, 24, LBM_TOPMENU_TXBATT_CHARGING, MENU_TITLE_COLOR);
|
||||
else
|
||||
#endif
|
||||
lcdDrawBitmapPattern(LCD_W-130, 24, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR);
|
||||
for (unsigned int i = 0; i < 5; i++) {
|
||||
lcdDrawSolidFilledRect(LCD_W-122+4*i, 30, 2, 8, i >= bars ? MENU_TITLE_DISABLE_COLOR : MENU_TITLE_COLOR);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user