New UI merged

This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
+15 -11
View File
@@ -35,7 +35,7 @@
#define LUA_EXPORT_EXTRA(...)
#endif
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define MAX_MODELS 60
#define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32
#define MAX_FLIGHT_MODES 9
@@ -99,7 +99,7 @@ enum CurveType {
#define MIN_POINTS_PER_CURVE 3
#define MAX_POINTS_PER_CURVE 17
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_MODEL_NAME 15
#define LEN_TIMER_NAME 8
#define LEN_FLIGHT_MODE_NAME 10
@@ -136,7 +136,7 @@ enum CurveType {
#define MAX_CURVE_POINTS 512
#endif
#if defined(PCBTARANIS) || defined(PCBSKY9X) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBSKY9X) || defined(PCBNV14)
#define NUM_MODULES 2
#else
#define NUM_MODULES 1
@@ -179,7 +179,7 @@ enum BeeperMode {
e_mode_all
};
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBNV14)
enum ModuleIndex {
INTERNAL_MODULE,
EXTERNAL_MODULE,
@@ -214,7 +214,7 @@ enum TrainerMode {
#define TRAINER_MODE_MAX() HAS_WIRELESS_TRAINER_HARDWARE() ? TRAINER_MODE_MASTER_BATTERY_COMPARTMENT : TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBNV14)
#define IS_INTERNAL_MODULE_ENABLED() (g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE)
#elif defined(PCBSKY9X)
#define IS_INTERNAL_MODULE_ENABLED() (false)
@@ -236,7 +236,7 @@ enum UartModes {
UART_MODE_MAX = UART_MODE_COUNT-1
};
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_SWITCH_NAME 3
#define LEN_ANA_NAME 3
#define LEN_MODEL_FILENAME 16
@@ -592,6 +592,7 @@ enum MixSources {
MIXSRC_Thr, LUA_EXPORT("thr", "Throttle")
MIXSRC_Ail, LUA_EXPORT("ail", "Aileron")
MIXSRC_LAST_STICK = MIXSRC_Ail,
MIXSRC_FIRST_POT,
#if defined(PCBHORUS)
MIXSRC_S1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer S1")
@@ -623,7 +624,7 @@ enum MixSources {
MIXSRC_SLIDER3, LUA_EXPORT("lcs", "Left center slider (X9E only)")
MIXSRC_SLIDER4, LUA_EXPORT("rcs", "Right center slider (X9E only)")
MIXSRC_LAST_POT = MIXSRC_SLIDER4,
#elif defined(PCBX7) || defined(PCBXLITE)
#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBNV14)
MIXSRC_POT1 = MIXSRC_FIRST_POT, LUA_EXPORT("s1", "Potentiometer 1")
MIXSRC_POT2, LUA_EXPORT("s2", "Potentiometer 2")
MIXSRC_LAST_POT = MIXSRC_POT2,
@@ -661,6 +662,7 @@ enum MixSources {
MIXSRC_CYC1 = MIXSRC_FIRST_HELI, LUA_EXPORT("cyc1", "Cyclic 1")
MIXSRC_CYC2, LUA_EXPORT("cyc2", "Cyclic 2")
MIXSRC_CYC3, LUA_EXPORT("cyc3", "Cyclic 3")
MIXSRC_LAST_HELI = MIXSRC_CYC3,
MIXSRC_FIRST_TRIM,
MIXSRC_TrimRud = MIXSRC_FIRST_TRIM, LUA_EXPORT("trim-rud", "Rudder trim")
@@ -840,12 +842,14 @@ enum Functions {
};
enum TimerModes {
TMRMODE_NONE,
TMRMODE_ABS,
TMRMODE_OFF,
TMRMODE_ON,
TMRMODE_START,
TMRMODE_THR,
TMRMODE_THR_REL,
TMRMODE_THR_TRG,
TMRMODE_COUNT
TMRMODE_THR_START,
TMRMODE_COUNT,
TMRMODE_MAX = TMRMODE_COUNT - 1
};
enum CountDownModes {