chore: more OTX to ETX housekeeping (#5396)

This commit is contained in:
Peter Feerick
2024-08-14 21:02:29 +10:00
committed by GitHub
parent 0768091fe1
commit 839cfbd53c
487 changed files with 537 additions and 1651 deletions
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint8_t width, uint8_t height)
{
+1 -4
View File
@@ -19,8 +19,7 @@
* GNU General Public License for more details.
*/
#ifndef _GUI_H_
#define _GUI_H_
#pragma once
#include "gui_common.h"
#include "menus.h"
@@ -209,5 +208,3 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes
#else
#define displayFlightModes(...)
#endif
#endif // _GUI_H_
+1 -1
View File
@@ -34,7 +34,7 @@
#endif
#if !defined(BOOT)
#include "opentx.h"
#include "edgetx.h"
#include "hal/switch_driver.h"
#include "hal/adc_driver.h"
#include "switches.h"
+1 -1
View File
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include "opentx_types.h"
#include "edgetx_types.h"
#include "board.h"
#define BOX_WIDTH 23
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const MenuHandler menuTabModel[MENU_MODEL_PAGES_COUNT] = {
{ menuModelSelect, nullptr },
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const MenuHandler menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
#if defined(RADIO_TOOLS)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/rotary_encoder.h"
void runPopupCurvePreset(event_t event)
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void copySelection(char * dst, const char * src, uint8_t size)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelDisplayItems {
ITEM_DISPLAY_SCREEN_LABEL1,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
extern uint8_t g_moduleIdx;
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define EXPO_ONE_2ND_COLUMN (6*FW+1)
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "switches.h"
enum LogicalSwitchFields {
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "mixes.h"
enum MixFields {
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelOutputsItems {
ITEM_OUTPUTS_OFFSET,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define MODELSEL_W LCD_W
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "mixer_scheduler.h"
#include "hal/adc_driver.h"
#include "hal/switch_driver.h"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define MODEL_SPECIAL_FUNC_1ST_COLUMN (0)
#define MODEL_SPECIAL_FUNC_2ND_COLUMN (4*FW-1)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelTelemetryFrskyItems {
ITEM_TELEMETRY_SENSORS_LABEL,
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum SensorFields {
SENSOR_FIELD_NAME,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void menuModelTemplates(event_t event)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const unsigned char ASTERISK_BITMAP[] = {
#include "asterisk.lbm"
+1 -4
View File
@@ -19,8 +19,7 @@
* GNU General Public License for more details.
*/
#ifndef _POPUPS_H_
#define _POPUPS_H_
#pragma once
#include <keys.h>
@@ -46,5 +45,3 @@ enum {
};
#include "../common/stdlcd/popups.h"
#endif // _POPUPS_H_
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/adc_driver.h"
#include "gui/common/stdlcd/calibration.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/adc_driver.h"
#define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/rotary_encoder.h"
#include "hal/switch_driver.h"
#include "hal/key_driver.h"
+1 -1
View File
@@ -21,7 +21,7 @@
#define LANGUAGE_PACKS_DEFINITION
#include "opentx.h"
#include "edgetx.h"
#include "tasks/mixer_task.h"
#include "hal/adc_driver.h"
#include "hal/usb_driver.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const unsigned char splashdata[] = {
'S','P','S',0,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define SLEEP_BITMAP_WIDTH 42
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "stamp.h"
#define ABOUT_INDENT 4
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
constexpr coord_t CHANNEL_NAME_OFFSET = 1;
constexpr coord_t CHANNEL_VALUE_OFFSET = CHANNEL_NAME_OFFSET + 42;
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/adc_driver.h"
#include "hal/switch_driver.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "tasks.h"
#include "mixer_scheduler.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define STATUS_BAR_Y (7*FH+1)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
// For surface radio
void drawWheel(coord_t centrex, int16_t tval)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
uint8_t * lcdLoadBitmap(uint8_t * bmp, const char * filename, uint16_t width, uint16_t height)
{
+1 -4
View File
@@ -19,8 +19,7 @@
* GNU General Public License for more details.
*/
#ifndef _GUI_H_
#define _GUI_H_
#pragma once
#include "gui_common.h"
#include "lcd.h"
@@ -193,5 +192,3 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes
#define IS_MAIN_VIEW_DISPLAYED() menuHandlers[0] == menuMainView
#define IS_TELEMETRY_VIEW_DISPLAYED() menuHandlers[0] == menuViewTelemetry
#define IS_OTHER_VIEW_DISPLAYED() (menuHandlers[0] == menuMainViewChannelsMonitor || menuHandlers[0] == menuChannelsView)
#endif // _GUI_H_
+1 -1
View File
@@ -33,7 +33,7 @@
#endif
#if !defined(BOOT)
#include "opentx.h"
#include "edgetx.h"
#include "hal/switch_driver.h"
#include "hal/adc_driver.h"
#include "switches.h"
+1 -1
View File
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include "opentx_types.h"
#include "edgetx_types.h"
#include "board.h"
#define BOX_WIDTH 31
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const MenuHandler menuTabModel[] = {
{ menuModelSelect, nullptr },
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const MenuHandler menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
#if defined(RADIO_TOOLS)
+1 -4
View File
@@ -19,8 +19,7 @@
* GNU General Public License for more details.
*/
#ifndef _MENUS_H_
#define _MENUS_H_
#pragma once
#include "keys.h"
#include "common/stdlcd/menus.h"
@@ -128,5 +127,3 @@ void menuModelUSBJoystick(event_t event);
#endif
extern const MenuHandler menuTabModel[MENU_MODEL_PAGES_COUNT];
#endif // _MENUS_H_
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/rotary_encoder.h"
void runPopupCurvePreset(event_t event)
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void onModelCustomScriptMenu(const char *result)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelDisplayItems {
ITEM_DISPLAY_TOP_BAR_LABEL,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
extern uint8_t g_moduleIdx;
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void displayFlightModes(coord_t x, coord_t y, FlightModesType value)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
static int numFlightModes() { return modelFMEnabled() ? MAX_FLIGHT_MODES : 1; }
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define EXPO_ONE_2ND_COLUMN (LCD_W-8*FW-90)
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "switches.h"
enum LogicalSwitchFields {
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "mixes.h"
enum MixFields {
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum LimitsItems {
ITEM_LIMITS_CH_NAME,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define MODELSEL_W 133
+1 -1
View File
@@ -24,7 +24,7 @@
#include "hal/switch_driver.h"
#include "hal/module_port.h"
#include "opentx.h"
#include "edgetx.h"
#include "mixer_scheduler.h"
#include "switches.h"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define MODEL_SPECIAL_FUNC_1ST_COLUMN (4*FW+2)
#define MODEL_SPECIAL_FUNC_2ND_COLUMN (8*FW+2)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelTelemetryFrskyItems {
ITEM_TELEMETRY_SENSORS_LABEL,
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum SensorFields {
SENSOR_FIELD_NAME,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const unsigned char ASTERISK_BITMAP[] = {
#include "asterisk.lbm"
+1 -4
View File
@@ -19,8 +19,7 @@
* GNU General Public License for more details.
*/
#ifndef _POPUPS_H_
#define _POPUPS_H_
#pragma once
#define MESSAGEBOX_X 10
#define MESSAGEBOX_Y 8
@@ -44,5 +43,3 @@ enum {
};
#include "../common/stdlcd/popups.h"
#endif // _POPUPS_H_
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/adc_driver.h"
#include "gui/common/stdlcd/calibration.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "../../hal/adc_driver.h"
#define HOLDANAVALUEFRAMES 4 /* 4* 50ms = 200 ms update rate */
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/rotary_encoder.h"
#include "hal/switch_driver.h"
+1 -1
View File
@@ -24,7 +24,7 @@
#define LANGUAGE_PACKS_DEFINITION
#include "opentx.h"
#include "edgetx.h"
#include "tasks/mixer_task.h"
#include "input_mapping.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define MAXIMUM_SPLASH_IMAGE_SIZE 3072
const struct {
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define ANIMATIONS_BITMAP_WIDTH 30
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "stamp.h"
#define ABOUT_INDENT 6
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
struct ViewChannelsState {
bool longNames;
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/trainer_driver.h"
#include "hal/adc_driver.h"
#include "hal/switch_driver.h"
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#include "hal/adc_driver.h"
#include "opentx.h"
#include "edgetx.h"
#include "tasks.h"
#define STATS_1ST_COLUMN FW/2
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define STATUS_BAR_Y (7*FH+1)
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void drawStick(coord_t centrex, int16_t xval, int16_t yval)
{
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/rotary_encoder.h"
#include "LvglWrapper.h"
+1 -1
View File
@@ -22,7 +22,7 @@
#pragma once
#include <lvgl/lvgl.h>
#include "opentx_types.h"
#include "edgetx_types.h"
void initLvglTheme();
+1 -1
View File
@@ -23,7 +23,7 @@
#include "libopenui.h"
#include "lz4/lz4.h"
#include "opentx_helpers.h"
#include "edgetx_helpers.h"
LZ4BitmapBuffer::LZ4BitmapBuffer(uint8_t format, const LZ4Bitmap* lz4Data) :
BitmapBuffer(format, 0, 0, nullptr)
@@ -21,7 +21,7 @@
#pragma once
#include "opentx.h"
#include "edgetx.h"
class ChannelBar : public Window
{
@@ -21,7 +21,7 @@
#include "channel_range.h"
#include "opentx.h"
#include "edgetx.h"
#define SET_DIRTY() storageDirty(EE_MODEL)
+1 -1
View File
@@ -22,7 +22,7 @@
#include "curve.h"
#include "bitmaps.h"
#include "opentx.h"
#include "edgetx.h"
#include "strhelpers.h"
//-----------------------------------------------------------------------------
@@ -24,7 +24,7 @@
#include "gvar_numberedit.h"
#include "source_numberedit.h"
#include "model_curves.h"
#include "opentx.h"
#include "edgetx.h"
#define SET_DIRTY() storageDirty(EE_MODEL)
@@ -21,7 +21,7 @@
#include "fm_matrix.h"
#include "opentx.h"
#include "edgetx.h"
#include "etx_lv_theme.h"
template <class T>
@@ -20,7 +20,7 @@
*/
#include "gvar_numberedit.h"
#include "opentx.h"
#include "edgetx.h"
void GVarNumberEdit::value_changed(lv_event_t* e)
{
@@ -21,7 +21,7 @@
#include "input_source.h"
#include "opentx.h"
#include "edgetx.h"
#include "sourcechoice.h"
#include "switchchoice.h"
@@ -21,7 +21,7 @@
#include "source_numberedit.h"
#include "opentx.h"
#include "edgetx.h"
#include "sourcechoice.h"
void SourceNumberEdit::value_changed(lv_event_t* e)
@@ -25,7 +25,7 @@
#include "lcd.h"
#include "menu.h"
#include "menutoolbar.h"
#include "opentx.h"
#include "edgetx.h"
#include "strhelpers.h"
#include "switches.h"
@@ -23,7 +23,7 @@
#include "fullscreen_dialog.h"
#include "mainwindow.h"
#include "opentx.h"
#include "edgetx.h"
class SwitchWarnDialog : public FullScreenDialog
{
@@ -23,7 +23,7 @@
#include "dataconstants.h"
#include "menu.h"
#include "menutoolbar.h"
#include "opentx.h"
#include "edgetx.h"
#include "strhelpers.h"
#include "switches.h"
+1 -1
View File
@@ -20,7 +20,7 @@
#include <lvgl/lvgl.h>
#include "opentx_types.h"
#include "edgetx_types.h"
enum FontIndex {
FONT_STD_INDEX,
+1 -1
View File
@@ -21,7 +21,7 @@
#pragma once
#include "opentx_types.h"
#include "edgetx_types.h"
#include "colors.h"
@@ -27,7 +27,7 @@
#include "dma2d.h"
#include "fonts.h"
#include "lvgl/src/draw/sw/lv_draw_sw.h"
#include "opentx_helpers.h"
#include "edgetx_helpers.h"
#include "strhelpers.h"
BitmapBuffer::BitmapBuffer(uint8_t format, uint16_t width, uint16_t height) :
@@ -22,7 +22,7 @@
#include "bitmaps.h"
#include "board.h"
#include "dma2d.h"
#include "opentx.h"
#include "edgetx.h"
#include "strhelpers.h"
#include "telemetry/telemetry_sensors.h"
#include "translations.h"
@@ -20,7 +20,7 @@
#include "bitmapbuffer.h"
#include "lib_file.h"
#include "opentx_helpers.h"
#include "edgetx_helpers.h"
FIL imgFile __DMA;
+1 -1
View File
@@ -18,7 +18,7 @@
#include "dialog.h"
#include "opentx.h"
#include "edgetx.h"
#include "mainwindow.h"
#include "progress.h"
#include "etx_lv_theme.h"
+1 -1
View File
@@ -20,7 +20,7 @@
#include <algorithm>
#include "opentx.h"
#include "edgetx.h"
#include "lib_file.h"
#include "menu.h"
#include "menutoolbar.h"
@@ -24,7 +24,7 @@
#include "LvglWrapper.h"
#include "libopenui.h"
#include "mainwindow.h"
#include "opentx.h"
#include "edgetx.h"
#include "etx_lv_theme.h"
#include "view_main.h"
#include "hal/watchdog_driver.h"
@@ -20,7 +20,7 @@
#include "debug.h"
#include "hal.h"
#include "opentx_types.h"
#include "edgetx_types.h"
#include "colors.h"
#include "keys.h"
@@ -23,7 +23,7 @@
#include <algorithm>
#include "opentx.h"
#include "edgetx.h"
#include "etx_lv_theme.h"
static void input_mix_line_constructor(const lv_obj_class_t* class_p,
@@ -22,7 +22,7 @@
#pragma once
#include "button.h"
#include "opentx_types.h"
#include "edgetx_types.h"
#include "tabsgroup.h"
class ListLineButton : public ButtonBase
+1 -1
View File
@@ -21,7 +21,7 @@
#include <lvgl/lvgl.h>
#include "menutoolbar.h"
#include "opentx.h"
#include "edgetx.h"
#include "table.h"
#include "etx_lv_theme.h"
+1 -1
View File
@@ -22,7 +22,7 @@
#include "popups.h"
#include "libopenui.h"
#include "opentx.h"
#include "edgetx.h"
#include "pwr.h"
#include "hal/watchdog_driver.h"
#include "etx_lv_theme.h"
+1 -1
View File
@@ -21,7 +21,7 @@
#include "view_text.h"
#include "menu.h"
#include "opentx.h"
#include "edgetx.h"
#include "sdcard.h"
#include "etx_lv_theme.h"
#include "fullscreen_dialog.h"

Some files were not shown because too many files have changed in this diff Show More