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

chore(firmware): cleanup legacy code and '#define' entries (#6735)

Browse Source
This commit is contained in:
philmoz
2025-10-30 16:31:41 +10:00
committed by GitHub
parent 4101d3fe0b
commit 2faf1278ca
52 changed files with 57 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/CMakeLists.txt
+4
View File
@@ -59,6 +59,7 @@ if(PCB STREQUAL X9D+ AND PCBREV STREQUAL 2019)
else()
option(USBJ_EX "Enable USB Joystick Extension" ON)
endif()
option(AUDIO "Enable audio" ON)
if(PCB STREQUAL X7 AND PCBREV STREQUAL LR3PRO)
option(POWER_LED_BLUE "Override Power LED to be normally Blue" ON)
@@ -456,6 +457,9 @@ if(GUI)
endforeach()
endif()
if(AUDIO)
add_definitions(-DAUDIO)
endif()
if(USBJ_EX)
add_definitions(-DUSBJ_EX)
radio/src/audio.h
+11 -21
View File
@@ -467,14 +467,6 @@ void codecsInit();
void audioEvent(unsigned int index);
void audioPlay(unsigned int index, uint8_t id=0);
#if defined(AUDIO) && defined(BUZZER)
#define AUDIO_BUZZER(a, b) do { a; b; } while(0)
#elif defined(AUDIO)
#define AUDIO_BUZZER(a, b) a
#else
#define AUDIO_BUZZER(a, b) b
#endif
void onKeyError();
void audioKeyPress();
@@ -492,18 +484,18 @@ void audioTimerCountdown(uint8_t timer, int value);
#define AUDIO_HELLO() audioPlay(AUDIO_HELLO)
#define AUDIO_BYE() audioPlay(AU_BYE, ID_PLAY_PROMPT_BASE + AU_BYE)
#define AUDIO_WARNING1() AUDIO_BUZZER(audioEvent(AU_WARNING1), beep(3))
#define AUDIO_WARNING2() AUDIO_BUZZER(audioEvent(AU_WARNING2), beep(2))
#define AUDIO_TX_BATTERY_LOW() AUDIO_BUZZER(audioEvent(AU_TX_BATTERY_LOW), beep(4))
#define AUDIO_ERROR() AUDIO_BUZZER(audioEvent(AU_ERROR), beep(4))
#define AUDIO_WARNING1() audioEvent(AU_WARNING1)
#define AUDIO_WARNING2() audioEvent(AU_WARNING2)
#define AUDIO_TX_BATTERY_LOW() audioEvent(AU_TX_BATTERY_LOW)
#define AUDIO_ERROR() audioEvent(AU_ERROR)
#define AUDIO_TIMER_COUNTDOWN(idx, val) audioTimerCountdown(idx, val)
#define AUDIO_TIMER_ELAPSED(idx) AUDIO_BUZZER(audioEvent(AU_TIMER1_ELAPSED+idx), beep(3))
#define AUDIO_INACTIVITY() AUDIO_BUZZER(audioEvent(AU_INACTIVITY), beep(3))
#define AUDIO_MIX_WARNING(x) AUDIO_BUZZER(audioEvent(AU_MIX_WARNING_1+x-1), beep(1))
#define AUDIO_POT_MIDDLE(x) AUDIO_BUZZER(audioEvent(AU_STICK1_MIDDLE+x), beep(2))
#define AUDIO_TRIM_MIDDLE() AUDIO_BUZZER(audioEvent(AU_TRIM_MIDDLE), beep(2))
#define AUDIO_TRIM_MIN() AUDIO_BUZZER(audioEvent(AU_TRIM_MIN), beep(2))
#define AUDIO_TRIM_MAX() AUDIO_BUZZER(audioEvent(AU_TRIM_MAX), beep(2))
#define AUDIO_TIMER_ELAPSED(idx) audioEvent(AU_TIMER1_ELAPSED+idx)
#define AUDIO_INACTIVITY() audioEvent(AU_INACTIVITY)
#define AUDIO_MIX_WARNING(x) audioEvent(AU_MIX_WARNING_1+x-1)
#define AUDIO_POT_MIDDLE(x) audioEvent(AU_STICK1_MIDDLE+x)
#define AUDIO_TRIM_MIDDLE() audioEvent(AU_TRIM_MIDDLE)
#define AUDIO_TRIM_MIN() audioEvent(AU_TRIM_MIN)
#define AUDIO_TRIM_MAX() audioEvent(AU_TRIM_MAX)
#define AUDIO_TRIM_PRESS(val) audioTrimPress(val)
#define AUDIO_PLAY(p) audioEvent(p)
#define AUDIO_VARIO(fq, t, p, f) audioQueue.playTone(fq, t, p, f)
@@ -519,8 +511,6 @@ void audioTimerCountdown(uint8_t timer, int value);
#else // AUDIO
#include "buzzer.h"
#define AUDIO_TIMER_COUNTDOWN(idx, val)
#define AUDIO_TIMER_ELAPSED(idx)
#define AUDIO_TRIM_MIN()
radio/src/buzzer.cpp
-61
View File
@@ -1,61 +0,0 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* 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.
*/
#include "edgetx.h"
uint8_t g_beepCnt;
uint8_t beepAgain = 0;
uint8_t beepAgainOrig = 0;
uint8_t beepOn = false;
bool warble = false;
bool warbleC;
// The various "beep" tone lengths
static const uint8_t beepTab[] = {
// key, trim, warn2, warn1, error
1, 1, 2, 10, 60, //xShort
1, 1, 4, 20, 80, //short
1, 1, 8, 30, 100, //normal
2, 2, 15, 40, 120, //long
5, 5, 30, 50, 150, //xLong
};
void beep(uint8_t val)
{
#if defined(HAPTIC) && !defined(AUDIO)
// completely untested
if (val == 0)
haptic.play(5, 0, PLAY_NOW);
else
haptic.event(AU_ERROR);
#endif
#if !defined(AUDIO)
if (g_eeGeneral.alarmsFlash && val>1) {
flashCounter = FLASH_DURATION;
}
#endif
if (g_eeGeneral.beepMode>0 || (g_eeGeneral.beepMode==0 && val!=0) || (g_eeGeneral.beepMode==-1 && val>=3)) {
_beep(*(beepTab+5*(2+g_eeGeneral.beepLength)+val));
}
}
radio/src/buzzer.h
-119
View File
@@ -1,119 +0,0 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* 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.
*/
#pragma once
#if defined(BUZZER)
extern uint8_t beepAgainOrig;
extern uint8_t beepOn;
extern bool warble;
extern bool warbleC;
#if defined(HAPTIC)
extern uint8_t hapticTick;
#endif /* HAPTIC */
#endif /* BUZZER */
#if defined(BUZZER)
#if defined(SIMU)
inline void _beep(uint8_t b)
{
g_beepCnt = b;
}
#else /* SIMU */
inline void _beep(uint8_t b)
{
buzzerSound(b);
}
#endif /* SIMU */
void beep(uint8_t val);
#else /* BUZZER */
inline void beep(uint8_t) { }
#endif /* BUZZER */
#if !defined(AUDIO)
#if defined(BUZZER)
#define AUDIO_HELLO() PUSH_SYSTEM_PROMPT(AUDIO_HELLO)
#define AUDIO_BYE()
#define AUDIO_TX_BATTERY_LOW() PUSH_SYSTEM_PROMPT(AU_TX_BATTERY_LOW)
#define AUDIO_INACTIVITY() PUSH_SYSTEM_PROMPT(AU_INACTIVITY)
#define AUDIO_ERROR_MESSAGE(e) PUSH_SYSTEM_PROMPT((e))
#define AUDIO_TIMER_MINUTE(t) playDuration(t)
// TODO
#define AUDIO_TIMER_30() PUSH_SYSTEM_PROMPT(AU_TIMER_30)
#define AUDIO_TIMER_20() PUSH_SYSTEM_PROMPT(AU_TIMER_20)
#define AUDIO_KEY_PRESS() beep(0)
#define AUDIO_KEY_ERROR() beep(2)
#define AUDIO_WARNING2() beep(2)
#define AUDIO_WARNING1() beep(3)
#define AUDIO_ERROR() beep(4)
#define AUDIO_MIX_WARNING(x) beep(1)
#define AUDIO_POT_MIDDLE(x) beep(2)
#define AUDIO_TIMER_COUNTDOWN(idx, val) beep(2)
#define AUDIO_TIMER_ELAPSED(idx) beep(3)
#define AUDIO_VARIO_UP() _beep(1)
#define AUDIO_VARIO_DOWN() _beep(1)
#define AUDIO_TRIM_PRESS(f) { if (!IS_KEY_FIRST(event)) warble = true; beep(1); }
#define AUDIO_TRIM_MIDDLE() beep(2)
#define AUDIO_TRIM_MIN() beep(2)
#define AUDIO_TRIM_MAX() beep(2)
#define AUDIO_PLAY(p) beep(3)
#define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
#else /* BUZZER */
#define AUDIO_HELLO()
#define AUDIO_BYE()
#define AUDIO_TX_BATTERY_LOW()
#define AUDIO_INACTIVITY()
#define AUDIO_ERROR_MESSAGE(e)
#define AUDIO_TIMER_MINUTE(t)
#define AUDIO_TIMER_30()
#define AUDIO_TIMER_20()
#define AUDIO_WARNING2()
#define AUDIO_WARNING1()
#define AUDIO_ERROR()
#define AUDIO_MIX_WARNING(x)
#define AUDIO_POT_MIDDLE(x)
#define AUDIO_TIMER_LT10(m, x)
#define AUDIO_TIMER_00(m)
#define AUDIO_VARIO_UP()
#define AUDIO_VARIO_DOWN()
#define AUDIO_TRIM(event, f)
#define AUDIO_TRIM_MIDDLE(f)
#define AUDIO_TRIM_END(f)
#define AUDIO_PLAY(p)
#define IS_AUDIO_BUSY() false
#endif /* BUZZER */
#define AUDIO_RESET()
#define AUDIO_FLUSH()
#define PLAY_PHASE_OFF(phase)
#define PLAY_PHASE_ON(phase)
#define PLAY_SWITCH_MOVED(sw)
#define PLAY_LOGICAL_SWITCH_OFF(sw)
#define PLAY_LOGICAL_SWITCH_ON(sw)
#define PLAY_MODEL_NAME()
#define START_SILENCE_PERIOD()
#endif /* !AUDIO */
radio/src/datastructs_private.h
+1 -7
View File
@@ -945,12 +945,6 @@ PACK(struct TrainerData {
char bluetoothName[LEN_BLUETOOTH_NAME];
#endif
#if defined(BUZZER)
#define BUZZER_FIELD int8_t buzzerMode:2 // -2=quiet, -1=only alarms, 0=no keys, 1=all (only used on AVR radios without audio hardware)
#else
#define BUZZER_FIELD int8_t spare2:2 SKIP
#endif
PACK(struct switchDef {
CUST_IDX(sw, sw_idx_read, sw_idx_write);
NOBACKUP(char name[LEN_SWITCH_NAME]);
@@ -998,7 +992,7 @@ PACK(struct RadioData {
uint8_t internalModule ENUM(ModuleType);
NOBACKUP(TrainerData trainer);
NOBACKUP(uint8_t view); // index of view in main screen
NOBACKUP(BUZZER_FIELD); /* 2bits */
NOBACKUP(int8_t buzzerModeSkip:2 SKIP); // 2 bits for alignment
NOBACKUP(uint8_t fai:1);
NOBACKUP(int8_t beepMode:2 ENUM(BeeperMode) CUST(r_beeperMode,w_beeperMode));
NOBACKUP(uint8_t alarmsFlash:1);
radio/src/edgetx.cpp
+6 -8
View File
@@ -53,7 +53,7 @@
#include "bluetooth_driver.h"
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#include "radio_calibration.h"
#include "view_main.h"
#include "view_text.h"
@@ -179,7 +179,7 @@ void per10ms()
#if defined(GUI)
if (lightOffCounter) lightOffCounter--;
if (flashCounter) flashCounter--;
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
if (noHighlightCounter) noHighlightCounter--;
#endif
#endif
@@ -1366,7 +1366,7 @@ void edgeTxInit()
{
TRACE("edgeTxInit");
#if defined(COLORLCD)
#if defined(COLORLCD)
// SD_CARD_PRESENT() does not work properly on most
// B&W targets, so that we need to delay the detection
// until the SD card is mounted (requires RTOS scheduler running)
@@ -1379,7 +1379,7 @@ void edgeTxInit()
if (!(startOptions & OPENTX_START_NO_SPLASH))
startSplash();
#if defined(LIBOPENUI)
#if defined(COLORLCD)
initLvglTheme();
// create ViewMain
ViewMain::instance();
@@ -1387,9 +1387,7 @@ void edgeTxInit()
// TODO add a function for this (duplicated)
menuHandlers[0] = menuMainView;
menuHandlers[1] = menuModelSelect;
#endif
#if defined(GUI) && !defined(COLORLCD)
lcdRefreshWait();
lcdClear();
lcdRefresh();
@@ -1555,11 +1553,11 @@ void edgeTxInit()
#if defined(GUI)
if (calibration_needed) {
cancelSplash();
#if defined(LIBOPENUI)
#if defined(COLORLCD)
startCalibration();
#else
chainMenu(menuFirstCalib);
#endif // defined(LIBOPENUI)
#endif // defined(COLORLCD)
}
else if (!(startOptions & OPENTX_START_NO_CHECKS)) {
checkAlarm();
radio/src/edgetx.h
+2 -7
View File
@@ -38,7 +38,7 @@
#include "usbd_msc_conf.h"
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#include "libopenui.h"
#else
#include "lib_file.h"
@@ -548,7 +548,6 @@ enum AUDIO_SOUNDS {
#include "audio.h"
#endif
#include "buzzer.h"
#include "translations/translations.h"
#if defined(HAPTIC)
@@ -809,11 +808,7 @@ constexpr uint32_t EARTH_RADIUS = 6371009;
void varioWakeup();
#if defined(AUDIO) && defined(BUZZER)
#define IS_SOUND_OFF() (g_eeGeneral.buzzerMode==e_mode_quiet && g_eeGeneral.beepMode==e_mode_quiet)
#else
#define IS_SOUND_OFF() (g_eeGeneral.beepMode == e_mode_quiet)
#endif
#define IS_SOUND_OFF() (g_eeGeneral.beepMode == e_mode_quiet)
#define IS_IMPERIAL_ENABLE() (g_eeGeneral.imperial)
radio/src/functions.cpp
-2
View File
@@ -537,12 +537,10 @@ const char* funcGetLabel(uint8_t func)
case FUNC_PLAY_SOUND:
return STR_SOUND;
#endif
#if defined(VOICE)
case FUNC_PLAY_TRACK:
return STR_PLAY_TRACK;
case FUNC_PLAY_VALUE:
return STR_PLAY_VALUE;
#endif
#if defined(LUA)
case FUNC_PLAY_SCRIPT:
return STR_SF_PLAY_SCRIPT;
radio/src/gui/128x64/radio_setup.cpp
+1 -15
View File
@@ -51,7 +51,6 @@ enum {
CASE_RTCLOCK(ITEM_RADIO_SETUP_TIME)
ITEM_RADIO_SETUP_SOUND_LABEL,
CASE_AUDIO(ITEM_RADIO_SETUP_BEEP_MODE)
CASE_BUZZER(ITEM_RADIO_SETUP_BUZZER_MODE)
ITEM_RADIO_SETUP_SPEAKER_VOLUME,
ITEM_RADIO_SETUP_BEEP_VOLUME,
ITEM_RADIO_SETUP_BEEP_LENGTH,
@@ -178,7 +177,6 @@ void menuRadioSetup(event_t event)
// Sound
0,
CASE_AUDIO(SOUND_ROW(0))
CASE_BUZZER(SOUND_ROW(0))
SOUND_ROW(0),
SOUND_ROW(0),
SOUND_ROW(0),
@@ -343,21 +341,10 @@ void menuRadioSetup(event_t event)
#if defined(AUDIO)
case ITEM_RADIO_SETUP_BEEP_MODE:
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#if defined(BUZZER) // AUDIO + BUZZER
case ITEM_RADIO_SETUP_BUZZER_MODE:
g_eeGeneral.buzzerMode = editChoice(LCD_W-2, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#endif
#elif defined(BUZZER) // BUZZER only
case ITEM_RADIO_SETUP_BUZZER_MODE:
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#endif
#if defined(VOICE)
case ITEM_RADIO_SETUP_SPEAKER_VOLUME:
{
lcdDrawTextIndented(y, STR_VOLUME);
@@ -371,7 +358,6 @@ void menuRadioSetup(event_t event)
}
break;
}
#endif
case ITEM_RADIO_SETUP_BEEP_VOLUME:
g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME);
radio/src/gui/212x64/radio_setup.cpp
+1 -1
View File
@@ -364,7 +364,7 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_BEEP_MODE:
g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH);
g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_GENERAL_VOLUME:
radio/src/gui/colorlcd/CMakeLists.txt
+1 -1
View File
@@ -210,4 +210,4 @@ set(SRC ${SRC}
${RADIO_SRC_DIR}/thirdparty/lz4/lz4.c
)
add_definitions(-DLIBOPENUI)
add_definitions(-DCOLORLCD)
radio/src/gui/colorlcd/radio/radio_setup.cpp
+1 -1
View File
@@ -191,7 +191,7 @@ class DateTimeWindow : public Window
static SetupLineDef soundPageSetupLines[] = {
{
// Beeps mode
STR_SPEAKER,
STR_MODE,
[](Window* parent, coord_t x, coord_t y) {
new Choice(parent, {x, y, 0, 0}, STR_VBEEPMODE, -2, 1,
GET_SET_DEFAULT(g_eeGeneral.beepMode));
radio/src/gui/common/stdlcd/feature_control.h
-6
View File
@@ -53,12 +53,6 @@
#define CASE_RTCLOCK(x)
#endif
#if defined(BUZZER)
#define CASE_BUZZER(x) x,
#else
#define CASE_BUZZER(x)
#endif
#if defined(AUDIO)
#define CASE_AUDIO(x) x,
#else
radio/src/gui/gui_common.cpp
+1 -1
View File
@@ -596,7 +596,7 @@ bool isSwitch2POSWarningStateAvailable(int state)
bool isThrottleSourceAvailable(int src)
{
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
src = throttleSource2Source(src);
#endif
return isSourceAvailable(src) &&
radio/src/gui/gui_common.h
+2 -2
View File
@@ -37,7 +37,7 @@
#define CASE_ROTARY_ENCODER(x)
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
typedef std::function<bool(int)> IsValueAvailable;
#else
typedef bool (*IsValueAvailable)(int);
@@ -110,7 +110,7 @@ bool confirmModelChange();
bool isSwitch2POSWarningStateAvailable(int state);
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#define IS_INSTANT_TRIM_ALLOWED() true
#elif defined(GUI)
#define IS_INSTANT_TRIM_ALLOWED() (IS_MAIN_VIEW_DISPLAYED() || IS_TELEMETRY_VIEW_DISPLAYED() || IS_OTHER_VIEW_DISPLAYED())
radio/src/io/bootloader_flash.cpp
+1 -1
View File
@@ -29,7 +29,7 @@
#include "hal/watchdog_driver.h"
#include "os/sleep.h"
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
#include "lib_file.h"
#endif
radio/src/io/multi_firmware_update.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include <memory>
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
#include "lib_file.h"
#endif
radio/src/lua/api_general.cpp
+1 -1
View File
@@ -37,7 +37,7 @@
#include "hal/rgbleds.h"
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#include "api_colorlcd.h"
#include "standalone_lua.h"
#endif
radio/src/main.cpp
+5 -5
View File
@@ -28,7 +28,7 @@
#include "edgetx.h"
#include "lua/lua_states.h"
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#include "LvglWrapper.h"
#include "view_main.h"
#include "startup_shutdown.h"
@@ -58,7 +58,7 @@ uint8_t mainRequestFlags = 0;
static bool _usbDisabled = false;
#if defined(LIBOPENUI)
#if defined(COLORLCD)
static Menu* _usbMenu = nullptr;
void closeUsbMenu()
@@ -539,7 +539,7 @@ void perMain()
}
if (usbPlugged() && getSelectedUsbMode() == USB_MASS_STORAGE_MODE) {
#if defined(LIBOPENUI)
#if defined(COLORLCD)
LvglWrapper::instance()->run();
usbConnectedWindow->checkEvents();
#else
@@ -555,7 +555,7 @@ void perMain()
checkFailsafeMulti();
#endif
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
event_t evt = getEvent();
#endif
@@ -565,7 +565,7 @@ void perMain()
#if defined(GUI)
DEBUG_TIMER_START(debugTimerGuiMain);
#if defined(LIBOPENUI)
#if defined(COLORLCD)
guiMain(0);
// For color screens show a popup deferred from another task
show_ui_popup();
radio/src/sdcard.cpp
+2 -2
View File
@@ -191,7 +191,7 @@ const char * getBasename(const char * path)
return path;
}
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen, const char * selection, uint8_t flags)
{
static uint16_t lastpopupMenuOffset = 0;
@@ -341,7 +341,7 @@ bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen
return popupMenuItemsCount;
}
#endif // !LIBOPENUI
#endif // !COLORLCD
const char * sdCopyFile(const char * srcPath, const char * destPath)
{
radio/src/strhelpers.cpp
+4 -4
View File
@@ -361,7 +361,7 @@ char *getGVarString(char *dest, int idx)
return dest;
}
#if defined(LIBOPENUI)
#if defined(COLORLCD)
char *getValueOrGVarString(char *dest, size_t len, gvar_t value,
LcdFlags flags, const char *suffix,
gvar_t offset, bool usePPMUnit)
@@ -766,7 +766,7 @@ char *getSourceString(char (&destRef)[L], mixsrc_t idx, bool defaultOnly)
}
} else if (idx <= MIXSRC_LAST_GVAR) {
idx -= MIXSRC_FIRST_GVAR;
#if defined(LIBOPENUI)
#if defined(COLORLCD)
char *s = strAppendStringWithIndex(dest, STR_GV, idx + 1);
if (!defaultOnly && g_model.gvars[idx].name[0]) {
s = strAppend(s, ":");
@@ -884,7 +884,7 @@ char *getSwitchPositionName(swsrc_t idx, bool defaultOnly)
char *getGVarString(int idx) { return getGVarString(_static_str_buffer, idx); }
#if defined(LIBOPENUI)
#if defined(COLORLCD)
char *getValueWithUnit(char *dest, size_t len, int32_t val, uint8_t unit,
LcdFlags flags)
{
@@ -1139,7 +1139,7 @@ std::string getTelemTime(TelemetryItem &telemetryItem)
formatNumberAsString(telemetryItem.datetime.sec, LEADING0 | LEFT, 2);
}
#endif // defined(LIBOPENUI)
#endif // defined(COLORLCD)
#endif // !defined(BOOT)
char *strAppendUnsigned(char *dest, uint32_t value, uint8_t digits,
radio/src/targets/horus/CMakeLists.txt
+2 -2
View File
@@ -180,8 +180,8 @@ set(RADIO_DEPENDENCIES
${BITMAPS_TARGET}
)
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSTM32F429xx -DSDRAM -DCOLORLCD -DHARDWARE_KEYS)
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSTM32F429xx -DSDRAM -DHARDWARE_KEYS)
add_definitions(-DRTCLOCK)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)
radio/src/targets/pa01/CMakeLists.txt
-2
View File
@@ -66,14 +66,12 @@ set(FUNCTION_SWITCHES ON)
add_definitions(
-DSTM32H750ZBTx -DSTM32H750xx
-DSDRAM -DCCMRAM
-DCOLORLCD -DLIBOPENUI
-DHARDWARE_KEYS -DSOFTWARE_KEYBOARD
-DWS2812_MAX_LEDS=24
)
set(SDRAM ON)
add_definitions(-DAUDIO -DVOICE)
add_definitions(-DSOFTWARE_VOLUME)
add_definitions(-DRTCLOCK)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
radio/src/targets/pl18/CMakeLists.txt
+1 -2
View File
@@ -126,13 +126,12 @@ set(SOFTWARE_KEYBOARD ON)
add_definitions(
-DSTM32F429_439xx -DSTM32F429xx
-DSDRAM -DCOLORLCD -DLIBOPENUI
-DSDRAM
-DHARDWARE_TOUCH -DHARDWARE_KEYS
-DSOFTWARE_KEYBOARD)
set(SDRAM ON)
add_definitions(-DAUDIO -DVOICE)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
add_definitions(-DCROSSFIRE_NATIVE)
add_definitions(-DHARDWARE_EXTERNAL_MODULE)
radio/src/targets/st16/CMakeLists.txt
+1 -2
View File
@@ -67,14 +67,13 @@ set(FUNCTION_SWITCHES ON)
add_definitions(
-DSTM32H750IBTx -DSTM32H750xx
-DSDRAM -DCCMRAM
-DCOLORLCD -DLIBOPENUI
-DHARDWARE_TOUCH -DHARDWARE_KEYS -DSOFTWARE_KEYBOARD
-DWS2812_MAX_LEDS=24
)
set(SDRAM ON)
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DRTCLOCK)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
if(INTERNAL_GPS)
radio/src/targets/stm32h7s78-dk/CMakeLists.txt
+3 -3
View File
@@ -44,9 +44,9 @@ set(FIRMWARE_QSPI ON)
add_definitions(
-DSTM32H7S7xx -DFIRMWARE_QSPI
-DSDRAM -DCOLORLCD -DLIBOPENUI -DPCBHORUS -DPCBX10 -DRADIO_H7RS
-DSDRAM -DPCBHORUS -DPCBX10 -DRADIO_H7RS
-DHARDWARE_TOUCH -DSOFTWARE_KEYBOARD
-DAUDIO -DVOICE -DSOFTWARE_VOLUME
-DSOFTWARE_VOLUME
)
# Make malloc() thread-safe
@@ -55,7 +55,7 @@ add_definitions(-DTHREADSAFE_MALLOC)
set(SDRAM ON)
set(FIRMWARE_STRIP_BOOTLOADER ON)
# add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
# add_definitions(-DRTCLOCK)
# VCP CLI
set(CLI ON CACHE BOOL "Enable CLI")
radio/src/targets/t15pro/CMakeLists.txt
-2
View File
@@ -66,13 +66,11 @@ set(FUNCTION_SWITCHES_WITH_RGB YES)
add_definitions(
-DSTM32H750XBTx -DSTM32H750xx
-DSDRAM -DCCMRAM
-DCOLORLCD -DLIBOPENUI
-DHARDWARE_TOUCH -DHARDWARE_KEYS -DSOFTWARE_KEYBOARD
)
set(SDRAM ON)
add_definitions(-DAUDIO -DVOICE)
add_definitions(-DSOFTWARE_VOLUME)
add_definitions(-DRTCLOCK)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
radio/src/targets/taranis/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ set(HSE_VALUE 12000000)
set(TARGET_DIR taranis)
set(PPM_LIMITS_SYMETRICAL YES)
add_definitions(-DPCBTARANIS -DAUDIO -DVOICE)
add_definitions(-DPCBTARANIS)
if(PCB STREQUAL X9E)
set(DEFAULT_INTERNAL_MODULE XJT_PXX1 CACHE STRING "Default internal module")
radio/src/targets/tx15/CMakeLists.txt
+1 -2
View File
@@ -78,14 +78,13 @@ set(AUX2_SERIAL YES)
add_definitions(
-DSTM32H750XBTx -DSTM32H750xx
-DSDRAM -DCCMRAM
-DCOLORLCD -DLIBOPENUI
-DHARDWARE_TOUCH -DHARDWARE_KEYS -DSOFTWARE_KEYBOARD
-DWS2812_MAX_LEDS=26
)
set(SDRAM ON)
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DRTCLOCK)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
radio/src/tasks.cpp
+2 -2
View File
@@ -33,7 +33,7 @@
#include "tasks/mixer_task.h"
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#include "startup_shutdown.h"
#endif
@@ -55,7 +55,7 @@ bool perMainEnabled = true;
static void menusTask()
{
#if defined(LIBOPENUI)
#if defined(COLORLCD)
LvglWrapper::instance();
#endif
radio/src/tests/gtests.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
listeners.Append(new TersePrinter(defaultPrinter));
}
#if defined(LIBOPENUI)
#if defined(COLORLCD)
lcdInitDisplayDriver();
#endif
radio/src/translations/i18n/cn.h
-2
View File
@@ -1010,8 +1010,6 @@
#define TR_ANADIAGS_UNFILTRAW "未经过滤的原始ADC值"
#define TR_ANADIAGS_MINMAX "最低值、最高值、行程量"
#define TR_ANADIAGS_MOVE "移动ADC输入以查看行程量"
#define TR_SPEAKER "扬声器"
#define TR_BUZZER "蜂鸣器"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("对频", "对频"))
#define TR_MODULE_UNBIND BUTTON("解绑")
radio/src/translations/i18n/cz.h
-2
View File
@@ -1008,8 +1008,6 @@
#define TR_ANADIAGS_UNFILTRAW "Nefiltrované surové hodnoty analogů"
#define TR_ANADIAGS_MINMAX "Min., max. a rozsah"
#define TR_ANADIAGS_MOVE "Posuňte analogy do jejich maximálních poloh!"
#define TR_SPEAKER "Repro"
#define TR_BUZZER "Pípák"
#define TR_BYTES "[B]"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("Odpárovat")
radio/src/translations/i18n/da.h
-2
View File
@@ -1015,8 +1015,6 @@
#define TR_ANADIAGS_UNFILTRAW "Ufilteret rå analog"
#define TR_ANADIAGS_MINMAX "Min., max. og interval"
#define TR_ANADIAGS_MOVE "Flyt analoge til deres yderpunkter!"
#define TR_SPEAKER "Højttaler"
#define TR_BUZZER "Biper"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Tils", "Tilslut"))
#define TR_MODULE_UNBIND BUTTON("Afkobl")
radio/src/translations/i18n/de.h
-2
View File
@@ -1004,8 +1004,6 @@
#define TR_ANADIAGS_UNFILTRAW "analoge Geber ungefiltert und unbearbeitet"
#define TR_ANADIAGS_MINMAX "Min., Max. und Bereich"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Lautspr"
#define TR_BUZZER "Summer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd","Binden")) //9XR-Pro
#define TR_MODULE_UNBIND BUTTON("Trennen")
radio/src/translations/i18n/en.h
-2
View File
@@ -1011,8 +1011,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Speaker"
#define TR_BUZZER "Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/es.h
-2
View File
@@ -1004,8 +1004,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Altavoz"
#define TR_BUZZER "Zumbador"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Enl.]"
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/fi.h
-2
View File
@@ -1004,8 +1004,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Speaker"
#define TR_BUZZER "Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/fr.h
-2
View File
@@ -1008,8 +1008,6 @@
#define TR_ANADIAGS_UNFILTRAW "Analog. bruts non filtrés"
#define TR_ANADIAGS_MINMAX "Min., max. et courses"
#define TR_ANADIAGS_MOVE "Déplacer les analogiques à leurs extrêmes!"
#define TR_SPEAKER "HP."
#define TR_BUZZER "Bipeur"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("Délier")
radio/src/translations/i18n/he.h
-2
View File
@@ -1013,8 +1013,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "רמקול"
#define TR_BUZZER "זמזם"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "צימוד"))
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/it.h
-2
View File
@@ -1010,8 +1010,6 @@
#define TR_ANADIAGS_UNFILTRAW "Analogici RAW non filtrati"
#define TR_ANADIAGS_MINMAX "Min., max. e range"
#define TR_ANADIAGS_MOVE "Muovi analogici ai loro estremi!"
#define TR_SPEAKER "Speaker"
#define TR_BUZZER "Buzzer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND TR("[Bnd]","[Bind]")
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/jp.h
-2
View File
@@ -1009,8 +1009,6 @@
#define TR_ANADIAGS_UNFILTRAW "素の状態のアナログ信号をフィルターしない値で表示"
#define TR_ANADIAGS_MINMAX "最低値、最高値、範囲を表示"
#define TR_ANADIAGS_MOVE "アナログ信号を末端まで動かした値を表示"
#define TR_SPEAKER "スピーカー"
#define TR_BUZZER "ブザー"
#define TR_BYTES "バイト"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("バインド解除")
radio/src/translations/i18n/ko.h
-2
View File
@@ -1055,8 +1055,6 @@
#define TR_ANADIAGS_UNFILTRAW "필터링 안 된 원시 아날로그"
#define TR_ANADIAGS_MINMAX "최소, 최대, 범위"
#define TR_ANADIAGS_MOVE "아날로그를 끝까지 움직이세요!"
#define TR_SPEAKER "스피커"
#define TR_BUZZER "부저"
#define TR_BYTES "바이트"
#define TR_MODULE_BIND BUTTON(TR("바인드", "바인딩"))
#define TR_MODULE_UNBIND BUTTON("바인딩 해제")
radio/src/translations/i18n/nl.h
-2
View File
@@ -1006,8 +1006,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Speaker"
#define TR_BUZZER "Zoemer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/pl.h
-2
View File
@@ -1003,8 +1003,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Głośnik"
#define TR_BUZZER "Brzęczyk"
#define TR_BYTES "bajty"
#define TR_MODULE_BIND TR("[BND]","[Bind]")
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/pt.h
-2
View File
@@ -1011,8 +1011,6 @@
#define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs"
#define TR_ANADIAGS_MINMAX "Min., max. and range"
#define TR_ANADIAGS_MOVE "Move analogs to their extremes!"
#define TR_SPEAKER "Speaker"
#define TR_BUZZER "Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/ru.h
-2
View File
@@ -1012,8 +1012,6 @@
#define TR_ANADIAGS_UNFILTRAW "Неотфильтр необработ аналог сигн"
#define TR_ANADIAGS_MINMAX "Мин., Макс. и Диапазон"
#define TR_ANADIAGS_MOVE "Двигайте аналоговые датчики!"
#define TR_SPEAKER "Динамик"
#define TR_BUZZER "Звук сигнал"
#define TR_BYTES "Байты"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_MODULE_UNBIND BUTTON("Unbind")
radio/src/translations/i18n/se.h
-2
View File
@@ -1011,8 +1011,6 @@
#define TR_ANADIAGS_UNFILTRAW "Ofiltrerade råa analoga"
#define TR_ANADIAGS_MINMAX "Min., max. och omfång"
#define TR_ANADIAGS_MOVE "Rör analoga till sina ytterlägen!"
#define TR_SPEAKER "Högtalare"
#define TR_BUZZER "Summer"
#define TR_BYTES "byte"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Parkoppla"))
#define TR_MODULE_UNBIND BUTTON("Glöm")
radio/src/translations/i18n/tw.h
-2
View File
@@ -1007,8 +1007,6 @@
#define TR_ANADIAGS_UNFILTRAW "未經過濾的原始ADC值"
#define TR_ANADIAGS_MINMAX "最低值、最高值、行程量"
#define TR_ANADIAGS_MOVE "移動ADC輸入以查看行程量"
#define TR_SPEAKER "揚聲器"
#define TR_BUZZER "蜂鳴器"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("對頻", "對頻"))
#define TR_MODULE_UNBIND BUTTON("解綁")
radio/src/translations/i18n/ua.h
-2
View File
@@ -1011,8 +1011,6 @@
#define TR_ANADIAGS_UNFILTRAW "Неформатовані сирі аналоги"
#define TR_ANADIAGS_MINMAX "Min., max. і діапазон"
#define TR_ANADIAGS_MOVE "Перемістити аналоги до екстремумів!"
#define TR_SPEAKER "Гучномовець"
#define TR_BUZZER "Дзвоник"
#define TR_BYTES "байти"
#define TR_MODULE_BIND BUTTON(TR("Прив.", "Прив'язати"))
#define TR_MODULE_UNBIND BUTTON("Відв'язати")
radio/src/translations/string_list.h
-5
View File
@@ -1173,11 +1173,6 @@ STR(WARN_BATTVOLTAGE)
STR(EXIT_BTN)
#if defined(AUDIO) && defined(BUZZER)
STR(SPEAKER)
STR(BUZZER)
#endif
STR(RX)
STR(MAIN_VIEW_1)
radio/src/translations/translations.h
-5
View File
@@ -33,10 +33,5 @@
#include "translations/string_list.h"
#if !(defined(AUDIO) && defined(BUZZER))
#define STR_SPEAKER STR_MODE
#define STR_BUZZER STR_MODE
#endif
#undef STR
#undef STRARRAY