From d990ebe49ef88565c8a9856257c1796c89e33e6f Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Tue, 20 Nov 2018 21:15:31 +0100 Subject: [PATCH] _Config.h file update --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/_Config.h | 258 +++++++++++++++++----------------- 2 files changed, 128 insertions(+), 132 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index ee4a7e0..d132933 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 18 +#define VERSION_PATCH_LEVEL 19 //****************** // Protocols diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index ab7893e..1b95374 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -375,11 +375,11 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { /* 6 */ {PROTO_DSM , DSM2_22 , 0 , P_HIGH , NO_AUTOBIND , 8 }, // option=number of channels /* 7 */ {PROTO_DSM , DSMX_11 , 0 , P_HIGH , NO_AUTOBIND , 8 }, // option=number of channels /* 8 */ {PROTO_DSM , DSMX_22 , 0 , P_HIGH , NO_AUTOBIND , 8 }, // option=number of channels -/* 9 */ {PROTO_SLT , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, +/* 9 */ {PROTO_SLT , SLT_V1 , 0 , P_HIGH , NO_AUTOBIND , 6 }, /* 10 */ {PROTO_HUBSAN, H107 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 11 */ {PROTO_HUBSAN, H301 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 12 */ {PROTO_HUBSAN, H501 , 0 , P_HIGH , NO_AUTOBIND , 0 }, -/* 13 */ {PROTO_HISKY , Hisky , 0 , P_HIGH , NO_AUTOBIND , 0 }, +/* 13 */ {PROTO_HISKY, Hisky , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 14 */ {PROTO_V2X2 , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, #endif #if NBR_BANKS > 2 @@ -389,7 +389,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { /* 2 */ {PROTO_ESKY150, 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 3 */ {PROTO_ASSAN, 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 4 */ {PROTO_CORONA, COR_V2 , 0 , P_HIGH , NO_AUTOBIND , 0 }, -/* 5 */ {PROTO_SYMAX , SYMAX , 0 , P_HIGH , NO_AUTOBIND , 0 }, +/* 5 */ {PROTO_SYMAX, SYMAX , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 6 */ {PROTO_KN , WLTOYS , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 7 */ {PROTO_BAYANG, BAYANG , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 8 */ {PROTO_BAYANG, H8S3D , 0 , P_HIGH , NO_AUTOBIND , 0 }, @@ -451,53 +451,37 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { // Option: the value is between -128 and +127. // The option value is only valid for some protocols, read this page for more information: https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/blob/master/Protocols_Details.md -/* Available protocols and associated sub protocols to pick and choose from - PROTO_FLYSKY - Flysky - V9X9 - V6X6 - V912 - CX20 - PROTO_HUBSAN - H107 - H301 - H501 - PROTO_FRSKYV +/* Available protocols and associated sub protocols to pick and choose from (Listed in alphabetical order) + PROTO_AFHDS2A + PWM_IBUS + PPM_IBUS + PWM_SBUS + PPM_SBUS + PROTO_ASSAN NONE - PROTO_FRSKYD + PROTO_BAYANG + BAYANG + H8S3D + X16_AH + IRDRONE + PROTO_BUGS NONE - PROTO_FRSKYX - CH_16 - CH_8 - EU_16 - EU_8 - PROTO_HISKY - Hisky - HK310 - PROTO_V2X2 - V2X2 - JXD506 - PROTO_DSM - DSM2_22 - DSM2_11 - DSMX_22 - DSMX_11 - PROTO_DEVO + PROTO_BUGSMINI NONE - PROTO_YD717 - YD717 - SKYWLKR - SYMAX4 - XINXUN - NIHUI - PROTO_KN - WLTOYS - FEILUN - PROTO_SYMAX - SYMAX - SYMAX5C - PROTO_SLT + PROTO_CABELL + CABELL_V3 + CABELL_V3_TELEMETRY + CABELL_SET_FAIL_SAFE + CABELL_UNBIND + PROTO_CFLIE NONE + PROTO_CG023 + CG023 + YD829 + PROTO_CORONA + COR_V1 + COR_V2 + FD_V3 PROTO_CX10 CX10_GREEN CX10_BLUE @@ -505,29 +489,72 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { JC3015_1 JC3015_2 MK33041 - PROTO_Q2X2 - Q222 - Q242 - Q282 - PROTO_SLT - SLT - VISTA - PROTO_CG023 - CG023 - YD829 - PROTO_BAYANG - BAYANG - H8S3D - X16_AH - IRDRONE + PROTO_DEVO + NONE + PROTO_DM002 + NONE + PROTO_DSM + DSM2_22 + DSM2_11 + DSMX_22 + DSMX_11 + PROTO_E01X + E012 + E015 PROTO_ESKY NONE - PROTO_MT99XX - MT99 - H7 - YZ - LS - FY805 + PROTO_ESKY150 + NONE + PROTO_FLYSKY + Flysky + V9X9 + V6X6 + V912 + CX20 + PROTO_FQ777 + NONE + PROTO_FRSKYD + NONE + PROTO_FRSKYV + NONE + PROTO_FRSKYX + CH_16 + CH_8 + EU_16 + EU_8 + PROTO_FY326 + FY326 + FY319 + PROTO_GD00X + NONE + PROTO_GW008 + NONE + PROTO_H8_3D + H8_3D + H20H + H20MINI + H30MINI + PROTO_HISKY + Hisky + HK310 + PROTO_HITEC + OPT_FW + OPT_HUB + MINIMA + PROTO_HONTAI + HONTAI + JJRCX1 + X5C1 + FQ777_951 + PROTO_HUBSAN + H107 + H301 + H501 + PROTO_J6PRO + NONE + PROTO_KN + WLTOYS + FEILUN PROTO_MJXQ WLH08 X600 @@ -535,71 +562,26 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { H26D E010 H26WH - PROTO_SHENQI + PROTO_MT99XX + MT99 + H7 + YZ + LS + FY805 + PROTO_NCC1701 NONE - PROTO_FY326 - FY326 - FY319 - PROTO_SFHSS - NONE - PROTO_J6PRO - NONE - PROTO_FQ777 - NONE - PROTO_ASSAN - NONE - PROTO_HONTAI - HONTAI - JJRCX1 - X5C1 - FQ777_951 - PROTO_AFHDS2A - PWM_IBUS - PPM_IBUS - PWM_SBUS - PPM_SBUS - PROTO_WK2x01 - WK2801 - WK2401 - W6_5_1 - W6_6_1 - W6_HEL - W6_HEL_I + PROTO_Q2X2 + Q222 + Q242 + Q282 PROTO_Q303 Q303 CX35 CX10D CX10WD - PROTO_GW008 + PROTO_SFHSS NONE - PROTO_DM002 - NONE - PROTO_CABELL - CABELL_V3 - CABELL_V3_TELEMETRY - CABELL_SET_FAIL_SAFE - CABELL_UNBIND - PROTO_ESKY150 - PROTO_H8_3D - H8_3D - H20H - H20MINI - H30MINI - PROTO_CORONA - COR_V1 - COR_V2 - FD_V3 - PROTO_CFLIE - NONE - PROTO_HITEC - OPT_FW - OPT_HUB - MINIMA - PROTO_WFLY - NONE - PROTO_BUGS - NONE - PROTO_BUGSMINI + PROTO_SHENQI NONE PROTO_SLT SLT_V1 @@ -607,15 +589,29 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { Q100 Q200 MR100 + PROTO_SYMAX + SYMAX + SYMAX5C PROTO_TRAXXAS NONE - PROTO_NCC1701 - NONE - PROTO_E01X - E012 - E015 + PROTO_V2X2 + V2X2 + JXD506 PROTO_V911S NONE - PROTO_GD00X + PROTO_WFLY NONE + PROTO_WK2x01 + WK2801 + WK2401 + W6_5_1 + W6_6_1 + W6_HEL + W6_HEL_I + PROTO_YD717 + YD717 + SKYWLKR + SYMAX4 + XINXUN + NIHUI */