From 3d98abb6d4361c593e1e466394ebcd638be1ed02 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Sat, 1 Aug 2020 19:19:11 +0200 Subject: [PATCH] Rename the Flyzone protocol by Height which is the original manufacturer --- Lua_scripts/MultiChan.txt | 4 +-- Multiprotocol/A7105_SPI.ino | 22 ++++++++-------- .../{Flyzone_a7105.ino => Height_a7105.ino} | 26 +++++++++---------- Multiprotocol/Multi.txt | 2 +- Multiprotocol/Multi_Names.ino | 8 +++--- Multiprotocol/Multiprotocol.h | 20 +++++++------- Multiprotocol/Multiprotocol.ino | 8 +++--- Multiprotocol/Validate.h | 12 ++++----- Multiprotocol/_Config.h | 10 +++---- Protocols_Details.md | 8 +++--- 10 files changed, 60 insertions(+), 60 deletions(-) rename Multiprotocol/{Flyzone_a7105.ino => Height_a7105.ino} (86%) diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index 5aeccabd9..c7a66e6e8 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -54,8 +54,8 @@ 28,4,Flysky_AFHDS2A,PWM_IB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16 28,5,Flysky_AFHDS2A,PPM_IB16,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14,CH15,CH16 56,0,Flysky2A_RX,RX,0,CH5,CH6,CH7,CH8,CH9,CH10,CH11,CH12,CH13,CH14 -53,0,Flyzone,5ch,0,Gear -53,1,Flyzone,8ch,0,Gear,Gyro,Flap,Light +53,0,Height,5ch,0,Gear +53,1,Height,8ch,0,Gear,Gyro,Flap,Light 25,0,FrSkyV,V8,0,CH5,CH6,CH7,CH8 3,0,FrSkyD,D8,0,CH5,CH6,CH7,CH8 3,0,FrSkyD,D8Cloned,0,CH5,CH6,CH7,CH8 diff --git a/Multiprotocol/A7105_SPI.ino b/Multiprotocol/A7105_SPI.ino index 3399513e1..9703d50d9 100644 --- a/Multiprotocol/A7105_SPI.ino +++ b/Multiprotocol/A7105_SPI.ino @@ -192,9 +192,9 @@ void A7105_AdjustLOBaseFreq(uint8_t cmd) offset=(int16_t)FORCE_FLYSKY_TUNING; #endif break; - case PROTO_FLYZONE: - #ifdef FORCE_FLYZONE_TUNING - offset=(int16_t)FORCE_FLYZONE_TUNING; + case PROTO_HEIGHT: + #ifdef FORCE_HEIGHT_TUNING + offset=(int16_t)FORCE_HEIGHT_TUNING; #endif break; case PROTO_PELIKAN: @@ -287,8 +287,8 @@ const uint8_t PROGMEM FLYSKY_A7105_regs[] = { 0x01, 0x0f // 30 - 31 }; #endif -#ifdef FLYZONE_A7105_INO -const uint8_t PROGMEM FLYZONE_A7105_regs[] = { +#ifdef HEIGHT_A7105_INO +const uint8_t PROGMEM HEIGHT_A7105_regs[] = { 0xff, 0x42, 0x00, 0x07, 0x00, 0xff, 0xff ,0x00, 0x00, 0x00, 0x00, 0x01, 0x21, 0x05, 0x01, 0x50, // 00 - 0f 0x9e, 0x4b, 0x00, 0x02, 0x16, 0x2b, 0x12, 0x00, 0x62, 0x80, 0x80, 0x00, 0x0a, 0x32, 0xc3, 0x1f, // 10 - 1f 0x12, 0x00, 0x00, 0xff, 0x00, 0x00, 0x3a, 0x00, 0x3f, 0x47, 0x80, 0x03, 0x01, 0x45, 0x18, 0x00, // 20 - 2f @@ -327,10 +327,10 @@ void A7105_Init(void) uint8_t *A7105_Regs=0; uint8_t vco_calibration0, vco_calibration1; - #ifdef FLYZONE_A7105_INO - if(protocol==PROTO_FLYZONE) + #ifdef HEIGHT_A7105_INO + if(protocol==PROTO_HEIGHT) { - A7105_Regs=(uint8_t*)FLYZONE_A7105_regs; + A7105_Regs=(uint8_t*)HEIGHT_A7105_regs; A7105_WriteID(0x25A53C45); } else @@ -383,8 +383,8 @@ void A7105_Init(void) if(i==0x20) val=0x1E; } #endif - #ifdef FLYZONE_A7105_INO - if(protocol==PROTO_FLYZONE && sub_protocol==FLYZONE_8CH) + #ifdef HEIGHT_A7105_INO + if(protocol==PROTO_HEIGHT && sub_protocol==HEIGHT_8CH) if(i==0x03) val=0x0A; #endif if( val != 0xFF) @@ -441,7 +441,7 @@ void A7105_Init(void) case PROTO_FLYSKY: vco_calibration1=0x08; break; - case PROTO_FLYZONE: + case PROTO_HEIGHT: vco_calibration1=0x02; break; case PROTO_PELIKAN: diff --git a/Multiprotocol/Flyzone_a7105.ino b/Multiprotocol/Height_a7105.ino similarity index 86% rename from Multiprotocol/Flyzone_a7105.ino rename to Multiprotocol/Height_a7105.ino index 4a9714ee3..63774595b 100644 --- a/Multiprotocol/Flyzone_a7105.ino +++ b/Multiprotocol/Height_a7105.ino @@ -14,16 +14,16 @@ */ // Compatible with FZ-410 TX -#if defined(FLYZONE_A7105_INO) +#if defined(HEIGHT_A7105_INO) #include "iface_a7105.h" -//#define FLYZONE_FORCEID +//#define HEIGHT_FORCEID -#define FLYZONE_BIND_COUNT 220 // 5 sec -#define FLYZONE_BIND_CH 0x18 // TX, RX for bind end is 0x17 +#define HEIGHT_BIND_COUNT 220 // 5 sec +#define HEIGHT_BIND_CH 0x18 // TX, RX for bind end is 0x17 -static void __attribute__((unused)) flyzone_build_packet() +static void __attribute__((unused)) HEIGHT_build_packet() { packet[0] = 0xA5; packet[1] = rx_tx_addr[2]; @@ -33,7 +33,7 @@ static void __attribute__((unused)) flyzone_build_packet() packet[5] = convert_channel_8b(THROTTLE); //00..FF packet[6] = convert_channel_8b(RUDDER); //00..80..FF packet[7] = convert_channel_8b(CH5); //00..80..FF - if(sub_protocol == FLYZONE_8CH) + if(sub_protocol == HEIGHT_8CH) { packet[8] = convert_channel_8b(CH6); //00..80..FF packet[9] = convert_channel_8b(CH7); //00..80..FF @@ -41,9 +41,9 @@ static void __attribute__((unused)) flyzone_build_packet() } } -uint16_t ReadFlyzone() +uint16_t ReadHeight() { - #ifndef FORCE_FLYZONE_TUNING + #ifndef FORCE_HEIGHT_TUNING A7105_AdjustLOBaseFreq(1); #endif if(IS_BIND_IN_PROGRESS) @@ -51,7 +51,7 @@ uint16_t ReadFlyzone() packet[0] = 0x1B; packet[1] = rx_tx_addr[2]; packet[2] = rx_tx_addr[3]; - A7105_WriteData(3, FLYZONE_BIND_CH); + A7105_WriteData(3, HEIGHT_BIND_CH); if (bind_counter--==0) BIND_DONE; return 22700; @@ -64,7 +64,7 @@ uint16_t ReadFlyzone() #ifdef MULTI_SYNC telemetry_set_input_sync(20*1500); #endif - flyzone_build_packet(); + HEIGHT_build_packet(); A7105_WriteData(sub_protocol?11:8, hopping_frequency[0]); A7105_SetPower(); } @@ -78,14 +78,14 @@ uint16_t ReadFlyzone() return 1500; } -uint16_t initFlyzone() +uint16_t initHeight() { A7105_Init(); hopping_frequency[0]=((random(0xfefefefe) & 0x0F)+2)<<2; hopping_frequency[1]=hopping_frequency[0]+0x50; - #ifdef FLYZONE_FORCEID + #ifdef HEIGHT_FORCEID rx_tx_addr[2]=0x35; rx_tx_addr[3]=0xD0; hopping_frequency[0]=0x18; @@ -93,7 +93,7 @@ uint16_t initFlyzone() #endif phase=255; - bind_counter = FLYZONE_BIND_COUNT; + bind_counter = HEIGHT_BIND_COUNT; return 2400; } #endif diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index ab5ffb9e6..9c5cd5f4a 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -50,7 +50,7 @@ 50,Redpine,Fast,Slow 51,Potensic,A20 52,ZSX,280 -53,Flyzone,5ch,8ch +53,Height,5ch,8ch 54,Scanner 55,Frsky_RX,RX,CloneTX 56,AFHDS2A_RX diff --git a/Multiprotocol/Multi_Names.ino b/Multiprotocol/Multi_Names.ino index 9cce375f7..8179bb2ac 100644 --- a/Multiprotocol/Multi_Names.ino +++ b/Multiprotocol/Multi_Names.ino @@ -72,7 +72,7 @@ const char STR_KF606[] ="KF606"; const char STR_REDPINE[] ="Redpine"; const char STR_POTENSIC[] ="Potensi"; const char STR_ZSX[] ="ZSX"; -const char STR_FLYZONE[] ="FlyZone"; +const char STR_HEIGHT[] ="Height"; const char STR_SCANNER[] ="Scanner"; const char STR_FRSKY_RX[] ="FrSkyRX"; const char STR_AFHDS2A_RX[] ="FS2A_RX"; @@ -125,7 +125,7 @@ const char STR_SUBTYPE_GD00X[] = "\x05""GD_V1""GD_V2"; const char STR_SUBTYPE_REDPINE[] = "\x04""Fast""Slow"; const char STR_SUBTYPE_POTENSIC[] = "\x03""A20"; const char STR_SUBTYPE_ZSX[] = "\x07""280JJRC"; -const char STR_SUBTYPE_FLYZONE[] = "\x03""5ch""8ch"; +const char STR_SUBTYPE_HEIGHT[] = "\x03""5ch""8ch"; const char STR_SUBTYPE_FX816[] = "\x03""P38"; const char STR_SUBTYPE_XN297DUMP[] = "\x07""250Kbps""1Mbps\0 ""2Mbps\0 ""Auto\0 ""NRF\0 "; const char STR_SUBTYPE_ESKY150[] = "\x03""4ch""7ch"; @@ -224,8 +224,8 @@ const mm_protocol_definition multi_protocols[] = { #if defined(AFHDS2A_RX_A7105_INO) {PROTO_AFHDS2A_RX, STR_AFHDS2A_RX,0, NO_SUBTYPE, OPTION_NONE }, #endif - #if defined(FLYZONE_A7105_INO) - {PROTO_FLYZONE, STR_FLYZONE, 2, STR_SUBTYPE_FLYZONE, OPTION_NONE }, + #if defined(HEIGHT_A7105_INO) + {PROTO_HEIGHT, STR_HEIGHT, 2, STR_SUBTYPE_HEIGHT, OPTION_NONE }, #endif #if defined(FQ777_NRF24L01_INO) {PROTO_FQ777, STR_FQ777, 0, NO_SUBTYPE, OPTION_NONE }, diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 0512e19e8..1baa3511e 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 50 +#define VERSION_PATCH_LEVEL 49 //****************** // Protocols @@ -79,7 +79,7 @@ enum PROTOCOLS PROTO_REDPINE = 50, // =>CC2500 PROTO_POTENSIC = 51, // =>NRF24L01 PROTO_ZSX = 52, // =>NRF24L01 - PROTO_FLYZONE = 53, // =>A7105 + PROTO_HEIGHT = 53, // =>A7105 PROTO_SCANNER = 54, // =>CC2500 PROTO_FRSKY_RX = 55, // =>CC2500 PROTO_AFHDS2A_RX= 56, // =>A7105 @@ -114,7 +114,7 @@ enum Flysky V912 = 3, CX20 = 4, }; -enum Flyzone +enum Height { FZ410 = 0, }; @@ -390,10 +390,10 @@ enum V761 V761_4CH = 1, }; -enum FLYZONE +enum HEIGHT { - FLYZONE_5CH = 0, - FLYZONE_8CH = 1, + HEIGHT_5CH = 0, + HEIGHT_8CH = 1, }; #define NONE 0 @@ -787,7 +787,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- REDPINE 50 POTENSIC 51 ZSX 52 - FLYZONE 53 + HEIGHT 53 SCANNER 54 FRSKY_RX 55 AFHDS2A_RX 56 @@ -999,9 +999,9 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- sub_protocol==V761 V761_3CH 0 V761_4CH 1 - sub_protocol==FLYZONE - FLYZONE_5CH 0 - FLYZONE_8CH 1 + sub_protocol==HEIGHT + HEIGHT_5CH 0 + HEIGHT_8CH 1 Power value => 0x80 0=High/1=Low Stream[3] = option_protocol; diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 254ef6715..e413b4a01 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -1120,11 +1120,11 @@ static void protocol_init() remote_callback = ReadBUGS; break; #endif - #if defined(FLYZONE_A7105_INO) - case PROTO_FLYZONE: + #if defined(HEIGHT_A7105_INO) + case PROTO_HEIGHT: PE1_off; //antenna RF1 - next_callback = initFlyzone(); - remote_callback = ReadFlyzone; + next_callback = initHeight(); + remote_callback = ReadHeight; break; #endif #if defined(AFHDS2A_RX_A7105_INO) diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index d60188492..d6d99e476 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -140,9 +140,9 @@ #error "The Flysky forced frequency tuning value is outside of the range -300..300." #endif #endif -#ifdef FORCE_FLYZONE_TUNING - #if ( FORCE_FLYZONE_TUNING < -300 ) || ( FORCE_FLYZONE_TUNING > 300 ) - #error "The Flyzone forced frequency tuning value is outside of the range -300..300." +#ifdef FORCE_HEIGHT_TUNING + #if ( FORCE_HEIGHT_TUNING < -300 ) || ( FORCE_HEIGHT_TUNING > 300 ) + #error "The Height forced frequency tuning value is outside of the range -300..300." #endif #endif #ifdef FORCE_PELIKAN_TUNING @@ -168,8 +168,8 @@ #ifndef FORCE_FLYSKY_TUNING #define FORCE_FLYSKY_TUNING 0 #endif - #ifndef FORCE_FLYZONE_TUNING - #define FORCE_FLYZONE_TUNING 0 + #ifndef FORCE_HEIGHT_TUNING + #define FORCE_HEIGHT_TUNING 0 #endif #ifndef FORCE_PELIKAN_TUNING #define FORCE_PELIKAN_TUNING 0 @@ -223,7 +223,7 @@ #undef AFHDS2A_RX_A7105_INO #undef BUGS_A7105_INO #undef FLYSKY_A7105_INO - #undef FLYZONE_A7105_INO + #undef HEIGHT_A7105_INO #undef HUBSAN_A7105_INO #undef KYOSHO_A7105_INO #undef PELIKAN_A7105_INO diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 713c4f2d7..8575f0b48 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -118,7 +118,7 @@ //#define FORCE_AFHDS2A_TUNING 0 //#define FORCE_BUGS_TUNING 0 //#define FORCE_FLYSKY_TUNING 0 -//#define FORCE_FLYZONE_TUNING 0 +//#define FORCE_HEIGHT_TUNING 0 //#define FORCE_HUBSAN_TUNING 0 //#define FORCE_KYOSHO_TUNING 0 //#define FORCE_PELIKAN_TUNING 0 @@ -170,7 +170,7 @@ #define AFHDS2A_RX_A7105_INO #define BUGS_A7105_INO #define FLYSKY_A7105_INO -#define FLYZONE_A7105_INO +#define HEIGHT_A7105_INO #define HUBSAN_A7105_INO #define KYOSHO_A7105_INO #define PELIKAN_A7105_INO @@ -580,9 +580,6 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { V6X6 V912 CX20 - PROTO_FLYZONE - FLYZONE_5CH - FLYZONE_8CH PROTO_FQ777 NONE PROTO_FRSKY_RX @@ -636,6 +633,9 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { H20H H20MINI H30MINI + PROTO_HEIGHT + HEIGHT_5CH + HEIGHT_8CH PROTO_HISKY Hisky HK310 diff --git a/Protocols_Details.md b/Protocols_Details.md index 72813429b..11d3912de 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -83,7 +83,6 @@ CFlie|38|CFlie||||||||NRF24L01| [Flysky](Protocols_Details.md#FLYSKY---1)|1|Flysky|V9x9|V6x6|V912|CX20||||A7105| [Flysky AFHDS2A](Protocols_Details.md#FLYSKY-AFHDS2A---28)|28|PWM_IBUS|PPM_IBUS|PWM_SBUS|PPM_SBUS|PWM_IBUS16|PPM_IBUS16|||A7105| [Flysky AFHDS2A RX](Protocols_Details.md#FLYSKY-AFHDS2A-RX---56)|56|RX||||||||A7105| -[Flyzone](Protocols_Details.md#FLYZONE---53)|53|FZ410||||||||A7105| [FQ777](Protocols_Details.md#FQ777---23)|23|FQ777||||||||NRF24L01|SSV7241 [FrskyD](Protocols_Details.md#FRSKYD---3)|3|D8|Cloned|||||||CC2500| [FrskyL](Protocols_Details.md#FRSKYL---67)|67|LR12|LR12 6CH|||||||CC2500| @@ -97,6 +96,7 @@ CFlie|38|CFlie||||||||NRF24L01| [GD00X](Protocols_Details.md#GD00X---47)|47|GD_V1*|GD_V2*|||||||NRF24L01| [GW008](Protocols_Details.md#GW008---32)|32|GW008||||||||NRF24L01|XN297 [H8_3D](Protocols_Details.md#H8_3D---36)|36|H8_3D|H20H|H20Mini|H30Mini|||||NRF24L01|XN297 +[Height](Protocols_Details.md#HEIGHT---53)|53|5ch|8ch|||||||A7105| [Hisky](Protocols_Details.md#HISKY---4)|4|Hisky|HK310|||||||NRF24L01| [Hitec](Protocols_Details.md#HITEC---39)|39|OPT_FW|OPT_HUB|MINIMA||||||CC2500| [Hontai](Protocols_Details.md#HONTAI---26)|26|HONTAI|JJRCX1|X5C1|FQ777_951|||||NRF24L01|XN297 @@ -239,17 +239,17 @@ Extended limits supported Low power: enable/disable the LNA stage on the RF component to use depending on the distance with the TX. -## FLYZONE - *53* +## HEIGHT - *53* ### Sub_protocol 5CH - *0* -Models using the Flyzone FZ-410 TX: Fokker D.VII Micro EP RTF. Models using the old ARES TX (prior to Hitec RED) Tiger Moth, eRC Micro Stick and Rage R/C. +Models from Height, Flyzone, Rage R/C, eRC and the old ARES (prior to Hitec RED). CH1|CH2|CH3|CH4|CH5 ---|---|---|---|--- A|E|T|R|Gear ### Sub_protocol 8CH - *1* -Models using the new 8 channels radio Flyzone, eRC and Rage R/C. +Models from Height and Rage R/C. CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8 ---|---|---|---|---|---|---|---