Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/next' into

Browse source 
bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/.gitignore
	radio/src/opentx.cpp
This commit is contained in:
Bertrand Songis 2014-02-21 14:26:11 +01:00
commit 9ade773618
432 changed files with 50699 additions and 11677 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/opentx.h
View file

@ -803,6 +803,18 @@ enum PerOutMode {
e_perout_mode_noinput = e_perout_mode_notrainer+e_perout_mode_notrims+e_perout_mode_nosticks
};
#if defined(MODULE_ALWAYS_SEND_PULSES)
extern uint8_t startupWarningState;
enum StartupWarningStates {
STARTUP_WARNING_THROTTLE,
STARTUP_WARNING_SWITCHES,
STARTUP_WARNING_DONE,
};
#endif
// Fiddle to force compiler to use a pointer
#if defined(CPUARM) || defined(SIMU)
#define FORCE_INDIRECT(ptr)
@ -1211,8 +1223,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*/