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"
#include "calibration.h"
#include "hal/adc_driver.h"
+1 -1
View File
@@ -21,7 +21,7 @@
#pragma once
#include "opentx_types.h"
#include "edgetx_types.h"
// Runs the main calibration steps
void menuCommonCalib(event_t event);
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include <math.h>
#include "hal/adc_driver.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
MenuHandlerFunc menuHandlers[5];
event_t menuEvent = 0;
+2 -5
View File
@@ -19,10 +19,9 @@
* GNU General Public License for more details.
*/
#ifndef _COMMON_MENUS_H_
#define _COMMON_MENUS_H_
#pragma once
#include "opentx_types.h"
#include "edgetx_types.h"
typedef int8_t horzpos_t;
typedef uint16_t vertpos_t;
@@ -62,5 +61,3 @@ inline MenuHandlerFunc lastPopMenu()
{
return menuHandlers[menuLevel + 1];
}
#endif // _COMMON_MENUS_H_
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#if defined(GVARS_IN_CURVES_SCREEN)
#warning "define still not added to CMakeLists.txt"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
enum MenuModelHeliItems {
ITEM_HELI_SWASHTYPE,
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "tasks/mixer_task.h"
#include "hal/adc_driver.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"
#include "tasks/mixer_task.h"
#include "hal/adc_driver.h"
#include "input_mapping.h"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include <math.h>
#define RECEIVER_OPTIONS_2ND_COLUMN (11*FW)
+1 -1
View File
@@ -18,7 +18,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void menuModelNotes(event_t event)
{
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#define RECEIVER_OPTIONS_2ND_COLUMN 80
@@ -208,7 +208,7 @@ void menuModelReceiverOptions(event_t event)
break;
case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2:
lcdDrawText(LCD_W/2, y+1, STR_OPENTX_UPGRADE_REQUIRED, SMLSIZE|CENTERED);
lcdDrawText(LCD_W/2, y+1, STR_EDGETX_UPGRADE_REQUIRED, SMLSIZE|CENTERED);
break;
default:
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
void onPXX2R9MBindModeMenu(const char * result)
{
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "usb_joystick.h"
#define _STR_MAX(x) "/" #x
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
const char * warningText = nullptr;
const char * warningInfoText;
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#if defined(GHOST) && defined(HARDWARE_EXTERNAL_MODULE)
@@ -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"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "timers_driver.h"
extern uint8_t g_moduleIdx;
@@ -20,7 +20,7 @@
*/
#include <stdio.h>
#include "opentx.h"
#include "edgetx.h"
#include "io/frsky_firmware_update.h"
#include "io/multi_firmware_update.h"
#include "io/bootloader_flash.h"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "timers_driver.h"
extern uint8_t g_moduleIdx;
+1 -1
View File
@@ -21,7 +21,7 @@
#include <algorithm>
#include <vector>
#include "opentx.h"
#include "edgetx.h"
#include "hal/module_port.h"
extern uint8_t g_moduleIdx;
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "hal/adc_driver.h"
#include "input_mapping.h"
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "options.h"
#include "hal/module_port.h"
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
#include "inactivity_timer.h"
static bool splashStarted = false;
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
extern bool displayTelemetryScreen();
extern void displayRssiLine();
+1 -1
View File
@@ -19,7 +19,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "edgetx.h"
constexpr uint32_t TEXT_FILE_MAXSIZE = 2048;
constexpr char CHECKABLE_PREFIX = '=';