From 3fe6dc64fa4e56e7e5efd762b45c9d9aba5cbf89 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Fri, 15 Apr 2022 17:29:25 +0200 Subject: [PATCH] KF606/MIG320: Added LED control --- Lua_scripts/MultiChan.txt | 2 +- Multiprotocol/KF606_ccnrf.ino | 3 ++- Multiprotocol/Multiprotocol.h | 2 +- Protocols_Details.md | 10 +++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index aeaa1f1..8da7c8a 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -115,7 +115,7 @@ 71,0,JJRC345,JJRC345,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3 71,1,JJRC345,SkyTmblr,1,Flip,HLess,RTH,LED,UNK1,UNK2,UNK3 49,0,KF606,KF606,1,Trim -49,1,KF606,MIG320,1,Trim +49,1,KF606,MIG320,1,Trim,LED 9,0,KN,WLToys,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim 9,1,KN,Feilun,0,DRate,THold,IdleUp,Gyro,Ttrim,Atrim,Etrim 73,0,Kyosho,Std,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14 diff --git a/Multiprotocol/KF606_ccnrf.ino b/Multiprotocol/KF606_ccnrf.ino index 88b746c..aadf8e4 100644 --- a/Multiprotocol/KF606_ccnrf.ino +++ b/Multiprotocol/KF606_ccnrf.ino @@ -46,7 +46,7 @@ static void __attribute__((unused)) KF606_send_packet() if(sub_protocol == KF606_KF606) { packet[2] = convert_channel_8b_limit_deadband(AILERON,0x20,0x80,0xE0,40); // Aileron: Max values:20..80..E0, Low rates:50..80..AF, High rates:3E..80..C1 - packet[3] = convert_channel_16b_limit(CH5,0xC1,0xDF); // Aileron trim must be on a separated channel C1..D0..DF + packet[3] = convert_channel_16b_limit(CH5,0xC1,0xDF); // Aileron trim must be on a separated channel C1..D0..DF } else { @@ -57,6 +57,7 @@ static void __attribute__((unused)) KF606_send_packet() packet[3] = 0x01; else if(packet[3] > 0x1F) packet[3] = 0x1F; + packet[3] |= GET_FLAG(CH6_SW, 0xC0); // 0xC0 and 0xE0 are both turning the LED off, not sure if there is another hidden feature } } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 10e5114..631c7d0 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 11 +#define VERSION_PATCH_LEVEL 12 #define MODE_SERIAL 0 diff --git a/Protocols_Details.md b/Protocols_Details.md index ea9098c..7ab3dda 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -1025,16 +1025,20 @@ New generation of GD models ## KF606 - *49* +### Sub_protocol KF606 - *0* +Model: KF606 + CH1|CH2|CH3|CH4|CH5 ---|---|---|---|--- A||T||TRIM -### Sub_protocol KF606 - *0* -Model: KF606 - ### Sub_protocol MIG320 - *1* Model: Zhiyang MIG-320 +CH1|CH2|CH3|CH4|CH5|CH6 +---|---|---|---|---|--- +A||T||TRIM|LED + ## MJXQ - *18* Autobind protocol