diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index f8ed555..63855ff 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -172,7 +172,7 @@ 48,0,V761,3CH,0,Gyro,Calib,Flip,RtnAct,Rtn 48,1,V761,4CH,0,Gyro,Calib,Flip,RtnAct,Rtn 46,0,V911s,V911s,1,Calib,Rate -46,1,V911s,E119,1,Calib,Rate +46,1,V911s,E119,1,Calib,Rate,6G_3D 22,0,WFLY,WFR0xS,0,CH5,CH6,CH7,CH8,CH9 30,0,WK2x01,WK2801,0,CH5,CH6,CH7,CH8 30,1,WK2x01,WK2401,0 diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index b80be9d..9439ed9 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 3 -#define VERSION_PATCH_LEVEL 2 +#define VERSION_PATCH_LEVEL 3 #define MODE_SERIAL 0 diff --git a/Multiprotocol/V911S_ccnrf.ino b/Multiprotocol/V911S_ccnrf.ino index df19361..d7cafcf 100644 --- a/Multiprotocol/V911S_ccnrf.ino +++ b/Multiprotocol/V911S_ccnrf.ino @@ -34,6 +34,7 @@ #define E119_FLAG_CALIB 0x40 // flags going to packet[2] #define V911S_FLAG_CALIB 0x01 +#define A220_FLAG_6G3D 0x04 static void __attribute__((unused)) V911S_send_packet() { @@ -70,8 +71,11 @@ static void __attribute__((unused)) V911S_send_packet() packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB); // long press on right button } else//E119 + { packet[ 1]=GET_FLAG(!CH6_SW,E119_FLAG_EXPERT) // short press on left button |GET_FLAG( CH5_SW,E119_FLAG_CALIB); // short press on right button + packet[ 2]=GET_FLAG( CH7_SW,A220_FLAG_6G3D); // short press on right button + } //packet[3..6]=trims TAER signed uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF); diff --git a/Protocols_Details.md b/Protocols_Details.md index ccc639e..cbbd1d4 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -1289,7 +1289,9 @@ Models: WLtoys V911S, XK A110 ### Sub_protocol E119 - *1* Models: Eachine E119, JJRC W01-J3, XK A220 P-40 -P-40 is using CH5 for 6G/3D. +CH1|CH2|CH3|CH4|CH5|CH6|CH7 +---|---|---|---|---|---|--- +A|E|T|R|CALIB|RATE|6G_3D ## XK - *62* @@ -1783,7 +1785,7 @@ Model: PROPEL 74-Z Speeder Bike Autobind protocol -Telemetry: RSSI is equal to TX_LQI which indicates how well the TX receives the RX (0-100%). A1 voltage should indicate the numbers of life remaining (not tested). A2 is giving the model status using a bit mask: 0x80=flying, 0x08=taking off, 0x04=landing, 0x00=landed/crashed +Telemetry: RSSI is equal to TX_LQI which indicates how well the TX receives the RX (0-100%). A1 (with a ratio of 25.5) voltage should indicate the numbers of life remaining 0.2->0.1->0.0(not tested). A2 (with a ratio of 25.5) is giving the model status: 12.8=flying, 0.8=taking off, 0.4=landing, 0=landed/crashed CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12|CH13|CH14 ---|---|---|---|---|---|---|---|---|----|----|----|----|----