mirror of
https://github.com/opentx/opentx.git
synced 2025-07-23 16:25:16 +03:00
merged changes from Issue020_ThrottleWarning
based on current next branch, includes all changes from old ThrottleWarning branch. Solves issue 020: Throttle warning if P1-P3 is selected as Thr source. Adds Turnigy TransmitterFix option code savings: 120 bytes without Transmitter fix 4 bytes but 1 more data if Transmitter Fix is activated. Added make option TURNIGY_TRANSMITTER_FIX for this purpose TURNIGY_TRANSMITTER_FIX = NO is default set to YES for new Turnigy9x transmitter which transmits even no pulses are generated.
This commit is contained in:
parent
1a6832c83a
commit
da23a624dc
3 changed files with 188 additions and 39 deletions
|
@ -803,6 +803,20 @@ enum PerOutMode {
|
|||
e_perout_mode_noinput = e_perout_mode_notrainer+e_perout_mode_notrims+e_perout_mode_nosticks
|
||||
};
|
||||
|
||||
|
||||
#ifdef INPUT_WARNINGS_GENERATE_SIM_DATA
|
||||
extern uint8_t checkWarningState;
|
||||
|
||||
enum InputWarningStates {
|
||||
e_InWarnBegin = 0,
|
||||
e_InWarnThrottleWarnActive = 1,
|
||||
e_InWarnStartSwitchWarn = 2,
|
||||
// e_InWarnSwitchWarnActive = 3, currently not needed
|
||||
e_InWarnFinished = 3,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
// Fiddle to force compiler to use a pointer
|
||||
#if defined(CPUARM) || defined(SIMU)
|
||||
#define FORCE_INDIRECT(ptr)
|
||||
|
@ -1211,8 +1225,8 @@ int applyCurve(int x, int8_t idx);
|
|||
void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS_INC);
|
||||
int16_t applyLimits(uint8_t channel, int32_t value);
|
||||
|
||||
void evalInputs(uint8_t mode);
|
||||
uint16_t anaIn(uint8_t chan);
|
||||
int16_t thrAnaIn(uint8_t chan);
|
||||
extern int16_t calibratedStick[NUM_STICKS+NUM_POTS];
|
||||
|
||||
#define FLASH_DURATION 20 /*200ms*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue