diff --git a/Lua_scripts/DSM FwdPrg_05_BW.lua b/Lua_scripts/DSM FwdPrg_05_BW.lua index e2ea4a5..aa71f4a 100644 --- a/Lua_scripts/DSM FwdPrg_05_BW.lua +++ b/Lua_scripts/DSM FwdPrg_05_BW.lua @@ -445,7 +445,6 @@ local function GUI_Warning(event) lcd.drawFilledRectangle(0, 0, LCD_W, 17, TITLE_BGCOLOR) lcd.drawText(5, 0, header, MENU_TITLE_COLOR + TEXT_SIZE) - lcd.drawText(100,20,"INFO", BOLD) lcd.drawText(5,40,"DSM Forward programing shares TX Servo/Output settings", 0) lcd.drawText(5,60,"with the RX. Make sure you setup your plane first in ", 0) diff --git a/Lua_scripts/DSM FwdPrg_05_Color.lua b/Lua_scripts/DSM FwdPrg_05_Color.lua index 2950542..b708f81 100644 --- a/Lua_scripts/DSM FwdPrg_05_Color.lua +++ b/Lua_scripts/DSM FwdPrg_05_Color.lua @@ -632,7 +632,6 @@ local function GUI_Warning(event,touchState) lcd.drawFilledRectangle(0, 0, LCD_W, 17, LCD_TOOL_HDR_BGCOLOR) lcd.drawText(5, 0, header, LCD_TOOL_HDR_COLOR + SMLSIZE) - lcd.drawText(100,20,"INFO", BOLD) lcd.drawText(5,40,"DSM Forward programing shares TX Servo/Output settings", 0) lcd.drawText(5,60,"with the RX. Make sure you setup your plane first in ", 0) diff --git a/Lua_scripts/DSMLIB/DsmFwPrgLib.lua b/Lua_scripts/DSMLIB/DsmFwPrgLib.lua index 812de79..cecb7fe 100644 --- a/Lua_scripts/DSMLIB/DsmFwPrgLib.lua +++ b/Lua_scripts/DSMLIB/DsmFwPrgLib.lua @@ -42,7 +42,6 @@ local DEBUG_ON = ... -- Get Debug_ON from parameters. -- 0=NO DEBUG, 1=HIGH LEVEL 2=MORE DETAILS local LIB_VERSION = "0.51" local TRANSLATE_AETR_TO_TAER = true -- TRANSLATE TX channel info from AETR to TAER - local Lib = { Init_Text = function (rxId) end } --RX IDs-- diff --git a/Multiprotocol/FrSkyX_cc2500.ino b/Multiprotocol/FrSkyX_cc2500.ino index 5ce5997..cef0d63 100644 --- a/Multiprotocol/FrSkyX_cc2500.ino +++ b/Multiprotocol/FrSkyX_cc2500.ino @@ -116,6 +116,10 @@ static void __attribute__((unused)) FrSkyX_build_packet() uint16_t FRSKYX_callback() { + #if defined MULTI_EU + if(sub_protocol == CH_16 || sub_protocol == CH_8) + return 9000; + #endif switch(state) { default: diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index 6165dd9..9097782 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -109,7 +109,11 @@ const char STR_XERALL[] ="Xerall"; const char STR_SUBTYPE_FLYSKY[] = "\x04""Std\0""V9x9""V6x6""V912""CX20"; const char STR_SUBTYPE_HUBSAN[] = "\x04""H107""H301""H501"; const char STR_SUBTYPE_FRSKYD[] = "\x06""D8\0 ""Cloned"; -const char STR_SUBTYPE_FRSKYX[] = "\x07""D16\0 ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#ifndef MULTI_EU + const char STR_SUBTYPE_FRSKYX[] = "\x07""D16\0 ""D16 8ch""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#else + const char STR_SUBTYPE_FRSKYX[] = "\x07""--->\0 ""--->\0 ""LBT(EU)""LBT 8ch""Cloned\0""Clo 8ch"; +#endif const char STR_SUBTYPE_HISKY[] = "\x05""Std\0 ""HK310"; const char STR_SUBTYPE_V2X2[] = "\x06""Std\0 ""JXD506""MR101\0"; #ifndef MULTI_EU diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 0101c12..d866fd0 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 23 +#define VERSION_PATCH_LEVEL 24 #define MODE_SERIAL 0 diff --git a/Protocols_Details.md b/Protocols_Details.md index 2f2f848..fd74844 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -1130,13 +1130,18 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9 A|E|T|R|FLIP||||HEADLESS ### Sub_protocol A180 - *5* -Model: XK A180, F949S, F959 +Model: XK A180, A120, F949S, F959 A180: CH1|CH2|CH3|CH4|CH5|CH6 ---|---|---|---|---|--- A|E|T|R|3D6G|RATE +A120: +CH1|CH2|CH3|CH4|CH5|CH6 +---|---|---|---|---|--- +A|E|T|R|RATE|LED + F949S: CH1|CH2|CH3|CH4|CH5|CH6|CH7 ---|---|---|---|---|---|---