diff --git a/Lua_scripts/MultiChan.txt b/Lua_scripts/MultiChan.txt index fdf805f..7f5e966 100644 --- a/Lua_scripts/MultiChan.txt +++ b/Lua_scripts/MultiChan.txt @@ -227,5 +227,6 @@ 61,0,EazyRC 98,0,Kyosho3,ASF,0 100,0,YuXiang,Std,0,Lock,Rate,Land,Manual,Flip,Mode,Pitch -102,0,JIABAILE,Std,1,Speed,Light,Flash +102,0,JIABAILE,Std,0,Speed,Light,Flash +102,1,JIABAILE,Gyro,0,Speed,Light,Flash,Tr_ST 103,0,H36,Std,1,Flip,HLess,RTH diff --git a/Multiprotocol/JIABAILE_nrf24l01.ino b/Multiprotocol/JIABAILE_nrf24l01.ino index 54ba76d..4f3ca74 100644 --- a/Multiprotocol/JIABAILE_nrf24l01.ino +++ b/Multiprotocol/JIABAILE_nrf24l01.ino @@ -17,12 +17,14 @@ Multiprotocol is distributed in the hope that it will be useful, #include "iface_xn297.h" //#define FORCE_JIABAILE_ORIGINAL_ID +//#define FORCE_JIABAILE_GYRO_ORIGINAL_ID #define JIABAILE_PAYLOAD_SIZE 8 #define JIABAILE_RX_PAYLOAD_SIZE 7 #define JIABAILE_RF_NUM_CHANNELS 3 #define JIABAILE_BIND_PACKET_PERIOD 12700 #define JIABAILE_PACKET_PERIOD 2408 +#define JIABAILE_GYRO_PACKET_PERIOD 8205 #define JIABAILE_BIND_COUNT 160 //2 sec #define JIABAILE_WRITE_TIME 1000 @@ -51,43 +53,98 @@ static uint8_t __attribute__((unused)) JIABAILE_channel(uint8_t num) static void __attribute__((unused)) JIABAILE_send_packet() { - hopping_frequency_no++; - if(hopping_frequency_no > 2) - hopping_frequency_no = 0; - XN297_Hopping(hopping_frequency_no); + if(!(sub_protocol == JIABAILE_GYRO && IS_BIND_IN_PROGRESS)) + { + hopping_frequency_no++; + if(hopping_frequency_no > 2) + hopping_frequency_no = 0; + XN297_Hopping(hopping_frequency_no); + } - memcpy(packet,rx_tx_addr,3); - memset(&packet[3], 0x00, 4); - if(IS_BIND_DONE) - {//Normal - packet[4] = convert_channel_16b_limit(RUDDER,0,50)-25; //ST Trim - packet[6] = JIABAILE_channel(AILERON); //ST - packet[3] ^= 0x03; //Reverse ST channel - packet[3] <<= 2; //Move ST channel where it should be - packet[5] = JIABAILE_channel(ELEVATOR); //TH - packet[3] |= GET_FLAG(CH5_SW, 0x20) //Low speed - |GET_FLAG(CH7_SW, 0x40) //Flash light - |GET_FLAG(!CH6_SW, 0x80); //Light - if(!CH5_SW && Channel_data[CH5] > CHANNEL_MIN_COMMAND) - packet[3] |= 0x10; //Mid speed + if(sub_protocol == JIABAILE_STD) + {//Std + memcpy(packet,rx_tx_addr,3); + memset(&packet[3], 0x00, 4); + if(IS_BIND_DONE) + {//Normal + packet[4] = convert_channel_16b_limit(RUDDER,0,50)-25; //ST Trim + packet[6] = JIABAILE_channel(AILERON); //ST + packet[3] ^= 0x03; //Reverse ST channel + packet[3] <<= 2; //Move ST channel where it should be + packet[5] = JIABAILE_channel(ELEVATOR); //TH + packet[3] |= GET_FLAG(CH5_SW, 0x20) //Low speed + |GET_FLAG(CH7_SW, 0x40) //Flash light + |GET_FLAG(!CH6_SW, 0x80); //Light + if(!CH5_SW && Channel_data[CH5] > CHANNEL_MIN_COMMAND) + packet[3] |= 0x10; //Mid speed + } + else + { + bind_counter--; + if(!bind_counter) + { + BIND_DONE; + phase = JIABAILE_PREP_DATA; + } + } + packet[7] = 0x55 + hopping_frequency[hopping_frequency_no]; + for(uint8_t i=0;i CHANNEL_MAX_COMMAND) + val |= 0x01; //Trim right + else if(Channel_data[CH4] < CHANNEL_MIN_COMMAND) + val |= 0x02; //Trim left + packet[4] = val; + packet[5] = packet[6] = 0x00; //? + crc_pos = 7; + } + uint8_t sum=0; + for(uint8_t i=0; i>2:1; + packet_period = JIABAILE_GYRO_PACKET_PERIOD; + } hopping_frequency_no = 0; } diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index 1ab71b7..71645f0 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -97,5 +97,5 @@ 98,Kyosho3 99,XK2 100,YuXiang -102,JIABAILE +102,JIABAILE,STD,GYRO 103,H36 \ No newline at end of file diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index 2f4dba3..c67c6af 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -185,6 +185,7 @@ const char STR_SUBTYPE_KF606[] = "\x06""KF606\0""MIG320""ZCZ50\0"; const char STR_SUBTYPE_E129[] = "\x04""E129""C186"; const char STR_SUBTYPE_FX[] = "\x04""816\0""620\0""9630""Q560"; const char STR_SUBTYPE_SGF22[] = "\x04""F22\0""F22S""J20\0"; +const char STR_SUBTYPE_JIABAILE[] = "\x04""Std\0""Gyro"; #define NO_SUBTYPE nullptr #ifdef SEND_CPPM @@ -381,7 +382,7 @@ const mm_protocol_definition multi_protocols[] = { {PROTO_J6PRO, STR_J6PRO, NO_SUBTYPE, 0, OPTION_NONE, 0, 1, SW_CYRF, J6PRO_init, J6PRO_callback }, #endif #if defined(JIABAILE_NRF24L01_INO) - {PROTO_JIABAILE, STR_JIABAILE, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, JIABAILE_init, JIABAILE_callback }, + {PROTO_JIABAILE, STR_JIABAILE, STR_SUBTYPE_JIABAILE, 2, OPTION_NONE, 0, 0, SW_NRF, JIABAILE_init, JIABAILE_callback }, #endif #if defined(JJRC345_NRF24L01_INO) {PROTO_JJRC345, STR_JJRC345, STR_SUBTYPE_JJRC345, 2, OPTION_NONE, 0, 0, SW_NRF, JJRC345_init, JJRC345_callback }, diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index ba11141..50cad00 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 4 -#define VERSION_PATCH_LEVEL 28 +#define VERSION_PATCH_LEVEL 29 #define MODE_SERIAL 0 @@ -495,6 +495,11 @@ enum SGF22 SGF22_F22S = 1, SGF22_J20 = 2, }; +enum JIABAILE +{ + JIABAILE_STD = 0, + JIABAILE_GYRO = 1, +}; #define NONE 0 #define P_HIGH 1 diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 762404d..24c3246 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -737,7 +737,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { PROTO_J6PRO NONE PROTO_JIABAILE - NONE + JIABAILE_STD + JIABAILE_GYRO PROTO_JJRC345 JJRC345 SKYTMBLR diff --git a/Protocols_Details.md b/Protocols_Details.md index 3adca95..c9d1522 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -112,7 +112,7 @@ CFlie|38|CFlie||||||||NRF24L01| [HoTT](Protocols_Details.md#HoTT---57)|57|Sync|No_Sync|||||||CC2500| [Hubsan](Protocols_Details.md#HUBSAN---2)|2|H107|H301|H501||||||A7105| [J6Pro](Protocols_Details.md#J6Pro---22)|22|||||||||CYRF6936| -[JIABAILE](Protocols_Details.md#JIABAILE---102)|102|||||||||NRF24L01|XN297 +[JIABAILE](Protocols_Details.md#JIABAILE---102)|102|Std|Gyro|||||||NRF24L01|XN297 [JJRC345](Protocols_Details.md#JJRC345---71)|71|JJRC345|SkyTmblr|||||||NRF24L01|XN297 [JOYSWAY](Protocols_Details.md#JOYSWAY---84)|84|||||||||NRF24L01|XN297 [KF606](Protocols_Details.md#KF606---49)|49|KF606|MIG320|ZCZ50||||||NRF24L01|XN297 @@ -1939,6 +1939,7 @@ RATE: -100% Low, 0% Mid, +100% High ## JIABAILE - *102* +### Sub_protocol Std - *0* Models: JBL-430x 1:43 car without gyro You must assign a different RX number for each car. Otherwise the new car ID will overwrite the previous one. @@ -1947,7 +1948,19 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7 ---|---|---|---|---|---|--- ST|TH|-|ST_TRIM|SPEED|LIGHT|FLASH -SPEED: -100% High, 0% Mid, +100% Low + - SPEED: -100% High, 0% Mid, +100% Low + - ST_TRIM: value between -100% and +100% but using the steering radio trim looks better + +### Sub_protocol Gyro - *1* +Models: JBL-430x 1:43 car with gyro + +CH1|CH2|CH3|CH4|CH5|CH6|CH7 +---|---|---|---|---|---|--- +ST|TH|GYRO|ST_TRIM|SPEED|LIGHT|FLASH + + - SPEED: -100% High, 0% Mid, +100% Low + - GYRO: -100% Off..+100% Max + - ST_TRIM: momentary switch, -100% Trim left, 0% Idle, +100% Trim right. Configure the radio steering trim has buttons (ST- and ST+) and assign them to that channel. Don't forget to disable the steering trim. ## JJRC345 - *71* @@ -2256,9 +2269,8 @@ Same channels assignement as above. ## YuXiang - *100* -Models: E190, F07 UH-1D +Models: E190 F07 UH-1D, E186 F08 Bell-206 -**Only 2 TX ID, use the RX number to switch**. Telemetry A1=Batt voltage with a Ratio 3.5 and Offset 7, A2=Low batt with 0=OK, everything else=BAD CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11