Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pascallanger/DIY-Multipro…
Browse files Browse the repository at this point in the history 
…tocol-TX-Module
  • Loading branch information
@pascallanger
pascallanger committed Sep 26, 2024
2 parents 68a4285 + f58f780 commit af12b21
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Multiprotocol/Multi.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@
94,Scorpio
95,BlueFly
96,BumbleB
97,SGF22,F22,F22S
97,SGF22,F22,F22S,J20
98,Kyosho3
99,XK2
99,XK2
6 changes: 3 additions & 3 deletions Multiprotocol/Multi_Protos.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const char STR_SUBTYPE_MOULDKG[] = "\x06""Analog""Digit\0";
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";
const char STR_SUBTYPE_SGF22[] = "\x04""F22\0""F22S""J20\0";
#define NO_SUBTYPE nullptr

#ifdef SEND_CPPM
Expand Down Expand Up @@ -455,7 +455,7 @@ const mm_protocol_definition multi_protocols[] = {
{PROTO_SCORPIO, STR_SCORPIO, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_CYRF, SCORPIO_init, SCORPIO_callback },
#endif
#if defined(SGF22_NRF24L01_INO)
{PROTO_SGF22, STR_SGF22, STR_SUBTYPE_SGF22, 2, OPTION_NONE, 0, 0, SW_NRF, SGF22_init, SGF22_callback },
{PROTO_SGF22, STR_SGF22, STR_SUBTYPE_SGF22, 3, OPTION_NONE, 0, 0, SW_NRF, SGF22_init, SGF22_callback },
#endif
#if defined(SHENQI_NRF24L01_INO)
{PROTO_SHENQI, STR_SHENQI, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, SHENQI_init, SHENQI_callback },
Expand Down Expand Up @@ -590,4 +590,4 @@ uint16_t PROTOLIST_callback()
}
return 1000;
}
#endif
#endif
1 change: 1 addition & 0 deletions Multiprotocol/Multiprotocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ enum SGF22
{
SGF22_F22 = 0,
SGF22_F22S = 1,
SGF22_J20 = 2,
};

#define NONE 0
Expand Down
35 changes: 21 additions & 14 deletions Multiprotocol/SGF22_nrf24l01.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Multiprotocol is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/
// Compatible with SGF22, ParkTen F22S
// Compatible with SGF22, ParkTen F22S, KF700 J20

#if defined(SGF22_NRF24L01_INO)

Expand All @@ -26,6 +26,7 @@ Multiprotocol is distributed in the hope that it will be useful,
#define SGF22_BIND_COUNT 50
#define SGF22_RF_NUM_CHANNELS 4
#define SGF22_F22S_BIND_RF_CHANNEL 10
#define SGF22_J20_BIND_RF_CHANNEL 28

//packet[8]
#define SGF22_FLAG_3D 0x00
Expand All @@ -34,9 +35,12 @@ Multiprotocol is distributed in the hope that it will be useful,
#define SGF22_FLAG_VIDEO 0x10
#define SGF22_FLAG_6G 0x40
#define SGF22_FLAG_VERTICAL 0xC0

#define SGF22_J20_FLAG_HORIZONTAL 0x80

//packet[9]
#define SGF22_FLAG_PHOTO 0x40
#define SGF22_FLAG_TRIMRESET 0x04
#define SGF22_FLAG_PHOTO 0x40 // #define SGF22_J20_FLAG_INVERT 0x40
#define SGF22_FLAG_TRIMRESET 0x04

static void __attribute__((unused)) SGF22_send_packet()
{
Expand All @@ -60,21 +64,23 @@ static void __attribute__((unused)) SGF22_send_packet()
packet_sent = 0;
//packet
packet[0] = 0x1B;
packet[8] = SGF22_FLAG_3D // default
| GET_FLAG(CH6_SW, SGF22_FLAG_ROLL) // roll
| GET_FLAG(CH7_SW, SGF22_FLAG_LIGHT) // push up throttle trim for light
| GET_FLAG(CH9_SW, SGF22_FLAG_VIDEO); // push down throttle trim for video
if(Channel_data[CH5] > CHANNEL_MIN_COMMAND)
packet[8] |= SGF22_FLAG_6G; // mode 1 - 6g
if(Channel_data[CH5] > CHANNEL_MAX_COMMAND)
packet[8] |= SGF22_FLAG_VERTICAL; // mode 0 - vertical
packet[9] = GET_FLAG(CH8_SW, SGF22_FLAG_PHOTO) // press in throttle trim for photo
| GET_FLAG(CH10_SW, SGF22_FLAG_TRIMRESET); // Both sticks down inwards
packet[8] = SGF22_FLAG_3D // CH5 -100%, F22 & F22S - 3D mode, J20 - Gyro off
| GET_FLAG(CH6_SW, SGF22_FLAG_ROLL) // roll
| GET_FLAG(CH7_SW, SGF22_FLAG_LIGHT) // push up throttle trim for light in the stock TX
| GET_FLAG(CH9_SW, SGF22_FLAG_VIDEO); // push down throttle trim for video in the stock TX
if(Channel_data[CH5] > CHANNEL_MAX_COMMAND)
packet[8] |= SGF22_FLAG_VERTICAL; // CH5 100%, vertical mode (torque)
else if(Channel_data[CH5] > CHANNEL_MIN_COMMAND )
packet[8] |= ( sub_protocol == SGF22_J20 ? SGF22_J20_FLAG_HORIZONTAL : SGF22_FLAG_6G ); // CH5 0%, F22 & F22S - 6G mode, J20 - Horizontal mode
packet[9] = GET_FLAG(CH8_SW, SGF22_FLAG_PHOTO) // F22: photo, press in throttle trim in the stock TX, J20: invert flight
| GET_FLAG(CH10_SW, SGF22_FLAG_TRIMRESET); // Both sticks down inwards in the stock TX
packet[10] = 0x42; // no fine tune
packet[11] = 0x10; // no fine tune
}
if(sub_protocol == SGF22_F22S)
packet[0] += 6;
else if (sub_protocol == SGF22_J20)
packet[0] += 3;
packet[1] = packet_count; // sequence
packet[2] = rx_tx_addr[2];
packet[3] = rx_tx_addr[3];
Expand Down Expand Up @@ -134,7 +140,8 @@ static void __attribute__((unused)) SGF22_RF_init()
{
XN297_Configure(XN297_CRCEN, XN297_SCRAMBLED, XN297_1M);
XN297_SetTXAddr((uint8_t*)"\xC7\x95\x3C\xBB\xA5", 5);
XN297_RFChannel(sub_protocol == SGF22_F22S ? SGF22_F22S_BIND_RF_CHANNEL : SGF22_BIND_RF_CHANNEL); // Set bind channel
const uint8_t bind_chan[SGF22_J20 + 1] = {SGF22_BIND_RF_CHANNEL, SGF22_F22S_BIND_RF_CHANNEL, SGF22_J20_BIND_RF_CHANNEL};
XN297_RFChannel(bind_chan[sub_protocol]); // Set bind channel
}

uint16_t SGF22_callback()
Expand Down
1 change: 1 addition & 0 deletions Multiprotocol/_Config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
PROTO_SGF22
SGF22
F22S
J20
PROTO_SHENQI
NONE
PROTO_SKYARTEC
Expand Down

0 comments on commit af12b21

Please sign in to comment.