diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index b9dbd07..71550ca 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -198,7 +198,7 @@ 81,0,E010r5,E010r5,1,Flip,LED,CALIB,HLess,RTH,GLIDE 82,0,LOLI,Std,0,CH5,CH6,CH7,CH8,1SwSePpPw,2SwSePw,3SwSe,4SwSe,5SwSeSb,6SwSe,7SwSePw,8SwSe 83,0,E129,E129,1,TakLan,EmStop,TrimA,TrimE,TrimR -83,1,E129,C186,1,TakLan,EmStop,TrimA,TrimE,TrimR +83,1,E129,C186,1,TakLan,EmStop,TrimA,TrimE,TrimR,Loop 84,0,JOYSWAY,Std,0 85,0,E016H,Std,1,Stop,Flip,n-a,HLess,RTH 87,0,IKEA diff --git a/Multiprotocol/E129_cyrf6936.ino b/Multiprotocol/E129_cyrf6936.ino index 160611d..8366c27 100644 --- a/Multiprotocol/E129_cyrf6936.ino +++ b/Multiprotocol/E129_cyrf6936.ino @@ -54,8 +54,9 @@ static void __attribute__((unused)) E129_build_data_packet() packet[16] = bit_reverse(rx_tx_addr[1]); } //packet[ 3] = 0x00; // E129 Mode: short press=0x20->0x00->0x20->..., long press=0x10->0x30->0x10->... => C186 throttle trim is doing the same:up=short press and down=long press - packet[ 4] = GET_FLAG(CH5_SW, 0x20) // Take off/Land 0x20 - | GET_FLAG(CH6_SW, 0x04); // Emergency stop 0x04 + packet[ 3] = GET_FLAG(CH10_SW, 0x40); // C159 loop flight 0x40, flag 0x04 is also set on this heli + packet[ 4] = GET_FLAG(CH5_SW, 0x20) // Take off/Land 0x20 + | GET_FLAG(CH6_SW, 0x04); // Emergency stop 0x04 //Channels and trims uint16_t val = convert_channel_10b(AILERON,false); uint8_t trim = convert_channel_8b(CH7) & 0xFC; @@ -80,13 +81,11 @@ static void __attribute__((unused)) E129_build_data_packet() packet[12] = val; // channel (0x000...0x200...0x3FF) } //Check - if(sub_protocol == E129_E129) - packet[packet_length-2] = packet[0] + packet[1]; - else - packet[packet_length-2] = 0x24 + packet[0] + (packet[1]&0x03); // ?? - for(uint8_t i=2;i