From 69124a0be0d108313036540d22f0acd1dc1f45bc Mon Sep 17 00:00:00 2001 From: Ben Lye Date: Tue, 28 Nov 2017 20:49:14 +0000 Subject: [PATCH] Fix config files --- Multiprotocol/_Config.h | 17 ++++++++------- Multiprotocol/_MyConfig.h | 45 +++++++++++++++------------------------ 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index ce7e975..364684c 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -55,7 +55,7 @@ //Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares) //Instructions: https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders#compiling--uploading-firmware-with-the-flash-from-tx-bootloader //To enable this feature remove the "//" on the next line. Requires a compatible bootloader or upload method to be selected when you use the Multi 4-in-1 Boards Manager definitions. -#define CHECK_FOR_BOOTLOADER +//#define CHECK_FOR_BOOTLOADER /****************/ /*** RF CHIPS ***/ @@ -207,14 +207,14 @@ const int8_t AFHDS2AFailsafe[14]= { //#define MULTI_TELEMETRY //Comment a line to disable a specific protocol telemetry -//#define DSM_TELEMETRY // Forward received telemetry packet directly to TX to be decoded +#define DSM_TELEMETRY // Forward received telemetry packet directly to TX to be decoded #define SPORT_TELEMETRY // Use FrSkyX SPORT format to send telemetry to TX -//#define AFHDS2A_FW_TELEMETRY // Forward received telemetry packet directly to TX to be decoded +#define AFHDS2A_FW_TELEMETRY // Forward received telemetry packet directly to TX to be decoded #define HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX -//#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 +#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 ***/ @@ -231,7 +231,7 @@ const int8_t AFHDS2AFailsafe[14]= { /*************************/ //In this section you can configure all details about PPM. //If you do not plan to use the PPM mode comment this line using "//" to save Flash space, you don't need to configure anything below in this case -//#define ENABLE_PPM +#define ENABLE_PPM /*** TX END POINTS ***/ //It is important for the module to know the endpoints of your radio. @@ -353,6 +353,7 @@ const PPM_Parameters PPM_prot[15]= { BAYANG H8S3D X16_AH + IRDRONE MODE_ESKY NONE MODE_MT99XX diff --git a/Multiprotocol/_MyConfig.h b/Multiprotocol/_MyConfig.h index 322dbbd..f261014 100644 --- a/Multiprotocol/_MyConfig.h +++ b/Multiprotocol/_MyConfig.h @@ -1,35 +1,24 @@ //#define FORCE_GLOBAL_ID 0x12345678 #if not defined STM32_BOARD - #undef HUBSAN_A7105_INO - #undef AFHDS2A_A7105_INO + // #undef AFHDS2A_A7105_INO - #undef DEVO_CYRF6936_INO - #undef DSM_CYRF6936_INO - #undef J6PRO_CYRF6936_INO - #undef WK2x01_CYRF6936_INO + // #undef DEVO_CYRF6936_INO + // #undef J6PRO_CYRF6936_INO + // #undef WK2x01_CYRF6936_INO - #undef FRSKYV_CC2500_INO + // #undef FRSKYV_CC2500_INO + // #undef FRSKYX_CC2500_INO - #undef CG023_NRF24L01_INO - #undef CX10_NRF24L01_INO // Include Q2X2 protocol - #undef ESKY_NRF24L01_INO - #undef HISKY_NRF24L01_INO - #undef KN_NRF24L01_INO - #undef SLT_NRF24L01_INO - #undef SYMAX_NRF24L01_INO - #undef V2X2_NRF24L01_INO - #undef YD717_NRF24L01_INO - #undef MT99XX_NRF24L01_INO - #undef SHENQI_NRF24L01_INO - #undef FY326_NRF24L01_INO - #undef FQ777_NRF24L01_INO - #undef ASSAN_NRF24L01_INO - #undef HONTAI_NRF24L01_INO - #undef Q303_NRF24L01_INO - #undef GW008_NRF24L01_INO - #undef DM002_NRF24L01_INO - #undef CABELL_NRF24L01_INO - #undef ESKY150_NRF24L01_INO + // #undef KN_NRF24L01_INO + // #undef SLT_NRF24L01_INO + + // #undef FY326_NRF24L01_INO + // #undef FQ777_NRF24L01_INO + // #undef ASSAN_NRF24L01_INO + // #undef HONTAI_NRF24L01_INO + // #undef Q303_NRF24L01_INO + // #undef GW008_NRF24L01_INO + // #undef DM002_NRF24L01_INO + // #undef CABELL_NRF24L01_INO #endif - \ No newline at end of file