Merge remote-tracking branch 'refs/remotes/pascallanger/master' into benlye-multi-new

This commit is contained in:
Ben Lye
2017-11-26 12:45:20 +00:00
23 changed files with 1064 additions and 441 deletions

View File

@@ -139,10 +139,16 @@
//#define Q303_NRF24L01_INO
//#define GW008_NRF24L01_INO
//#define DM002_NRF24L01_INO
//#define CABELL_NRF24L01_INO
/**************************/
/*** FAILSAFE SETTINGS ***/
/**************************/
//SHFSS failsafe is by default set to all channels hold their positions except throttle forced to low (980µs)
//You can uncomment the setting below to use channels 9(1) to 16(8) instead
//#define SFHSS_FAILSAFE_CH9_16
#define AFHDS2A_FAILSAFE
#ifdef AFHDS2A_FAILSAFE
/*
@@ -208,7 +214,7 @@ const int8_t AFHDS2AFailsafe[14]= {
//#define AFHDS2A_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define BAYANG_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define HUBSAN_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define CABELL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
/****************************/
/*** SERIAL MODE SETTINGS ***/
@@ -401,6 +407,11 @@ const PPM_Parameters PPM_prot[15]= {
NONE
MODE_DM002
NONE
MODE_CABELL
CABELL_V3
CABELL_V3_TELEMETRY
CABELL_SET_FAIL_SAFE
CABELL_UNBIND
*/
// RX_Num is used for model match. Using RX_Num values different for each receiver will prevent starting a model with the false config loaded...