gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-09 22:48:12 +00:00
Code Issues Projects Releases Wiki Activity

FrSkyR9: FCC initial support

Browse Source
This commit is contained in:
Pascal Langer 2020-07-06 09:52:43 +02:00
parent 4c7a51be46
commit 5c59cddc7a
5 changed files with 91 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Multiprotocol/FrSkyR9_sx1276.ino
View File

@ -1,9 +1,11 @@
#if defined(FRSKYR9_SX1276_INO) #if defined(FRSKYR9_SX1276_INO)
#include "iface_sx1276.h" #include "iface_sx1276.h"
#define FREQ_MAP_SIZE 29 #define DISP_FREQ_TABLE
uint32_t FrSkyR9_freq_map[FREQ_MAP_SIZE]; #define FLEX_FREQ 29
#define FCC_FREQ 43
#define EU_FREQ 19
enum { enum {
FRSKYR9_FREQ=0, FRSKYR9_FREQ=0,
@ -12,23 +14,54 @@ enum {
FRSKYR9_RX2, FRSKYR9_RX2,
}; };
static void __attribute__((unused)) FrSkyR9_build_freq() void FrSkyR9_set_frequency()
{ {
uint32_t start_freq=914472960; // 915 uint8_t data[3];
if(sub_protocol & 0x01 && IS_BIND_DONE) uint16_t num=0;
start_freq=859504640; // 868 and bind completed hopping_frequency_no += FrSkyX_chanskip;
for(uint8_t i=0;i<FREQ_MAP_SIZE-2;i++) switch(sub_protocol & 0xFD)
{ {
FrSkyR9_freq_map[i]=start_freq; case R9_868:
debugln("F%d=%lu", i, FrSkyR9_freq_map[i]); if(IS_BIND_DONE) // if bind is in progress use R9_915 instead
start_freq+=0x7A000; {
hopping_frequency_no %= FLEX_FREQ;
num=hopping_frequency_no;
if(hopping_frequency_no>=FLEX_FREQ-2)
num+=FrSkyX_chanskip-FLEX_FREQ+2; // the last 2 values are FrSkyX_chanskip and FrSkyX_chanskip+1
num <<= 5;
num += 0xD700;
break;
}//else use R9_915
case R9_915:
hopping_frequency_no %= FLEX_FREQ;
num=hopping_frequency_no;
if(hopping_frequency_no>=FLEX_FREQ-2)
num+=FrSkyX_chanskip-FLEX_FREQ+2; // the last 2 values are FrSkyX_chanskip and FrSkyX_chanskip+1
num <<= 5;
num += 0xE4C0;
break;
case R9_FCC:
hopping_frequency_no %= FCC_FREQ;
num=hopping_frequency_no;
num <<= 5;
num += 0xE200;
break;
case R9_EU:
hopping_frequency_no %= EU_FREQ;
num=hopping_frequency_no;
num <<= 4;
num += 0xD7D0;
break;
} }
// Last two frequencies determined by FrSkyX_chanskip data[0] = num>>8;
FrSkyR9_freq_map[FREQ_MAP_SIZE-2] = FrSkyR9_freq_map[FrSkyX_chanskip]; data[1] = num&0xFF;
debugln("F%d=%lu", FREQ_MAP_SIZE-2, FrSkyR9_freq_map[FREQ_MAP_SIZE-2]); data[2] = 0x00;
FrSkyR9_freq_map[FREQ_MAP_SIZE-1] = FrSkyR9_freq_map[FrSkyX_chanskip+1];
debugln("F%d=%lu", FREQ_MAP_SIZE-1, FrSkyR9_freq_map[FREQ_MAP_SIZE-1]); #ifdef DISP_FREQ_TABLE
hopping_frequency_no = 0; if(phase==0xFF)
debugln("F%d=%02X%02X%02X=%lu", hopping_frequency_no, data[0], data[1], data[2], (uint32_t)((data[0]<<16)+(data[1]<<8)+data[2])*61);
#endif
SX1276_WriteRegisterMulti(SX1276_06_FRFMSB, data, 3);
} }
static void __attribute__((unused)) FrSkyR9_build_packet() static void __attribute__((unused)) FrSkyR9_build_packet()
@ -71,20 +104,27 @@ static void __attribute__((unused)) FrSkyR9_build_packet()
uint16_t initFrSkyR9() uint16_t initFrSkyR9()
{ {
//Check frequencies
#ifdef DISP_FREQ_TABLE
phase=0xFF;
FrSkyX_chanskip=1;
hopping_frequency_no=0xFF;
for(uint8_t i=0;i<FCC_FREQ;i++)
FrSkyR9_set_frequency();
#endif
//Reset ID
set_rx_tx_addr(MProtocol_id_master); set_rx_tx_addr(MProtocol_id_master);
//FrSkyX_chanskip //FrSkyX_chanskip
FrSkyX_chanskip = 1 + (random(0xfefefefe) % 24); FrSkyX_chanskip = 1 + (random(0xfefefefe) % 24);
debugln("Step=%d", FrSkyX_chanskip); debugln("chanskip=%d", FrSkyX_chanskip);
//Frequency table
FrSkyR9_build_freq();
//Set FrSkyFormat //Set FrSkyFormat
if((sub_protocol & 0x02) == 0) if((sub_protocol & 0x02) == 0)
FrSkyFormat=0; // 16 channels FrSkyFormat=0; // 16 channels
else else
FrSkyFormat=1; // 8 channels FrSkyFormat=1; // 8 channels
debugln("%dCH", FrSkyFormat&1 ? 8:16); debugln("%dCH", FrSkyFormat&1 ? 8:16);
//SX1276 Init //SX1276 Init
@ -103,39 +143,34 @@ uint16_t initFrSkyR9()
SX1276_SetPreambleLength(9); SX1276_SetPreambleLength(9);
SX1276_SetDetectionThreshold(SX1276_MODEM_DETECTION_THRESHOLD_SF6); SX1276_SetDetectionThreshold(SX1276_MODEM_DETECTION_THRESHOLD_SF6);
SX1276_SetLna(1, true); SX1276_SetLna(1, true);
SX1276_SetHopPeriod(0); // 0 = disabled, we hop frequencies manually SX1276_SetHopPeriod(0); // 0 = disabled, we hop frequencies manually
SX1276_SetPaDac(true); SX1276_SetPaDac(true);
SX1276_SetTxRxMode(TX_EN); // Set RF switch to TX SX1276_SetTxRxMode(TX_EN); // Set RF switch to TX
FrSkyX_telem_init(); FrSkyX_telem_init();
hopping_frequency_no=0;
phase=FRSKYR9_FREQ; phase=FRSKYR9_FREQ;
return 20000; // start calling FrSkyR9_callback in 20 milliseconds return 20000; // Start calling FrSkyR9_callback in 20 milliseconds
} }
uint16_t FrSkyR9_callback() uint16_t FrSkyR9_callback()
{ {
static boolean bind=false;
switch (phase) switch (phase)
{ {
case FRSKYR9_FREQ: case FRSKYR9_FREQ:
//Force standby //Force standby
SX1276_SetMode(true, false, SX1276_OPMODE_STDBY); SX1276_SetMode(true, false, SX1276_OPMODE_STDBY);
//Set frequency //Set frequency
//868 is binding at 915, need to switch back to 868 once bind is completed FrSkyR9_set_frequency(); // Set current center frequency
if(bind && IS_BIND_DONE)
FrSkyR9_build_freq();
bind=IS_BIND_IN_PROGRESS;
hopping_frequency_no = (hopping_frequency_no + FrSkyX_chanskip) % FREQ_MAP_SIZE;
SX1276_SetFrequency(FrSkyR9_freq_map[hopping_frequency_no]); // set current center frequency
//Set power //Set power
// max power: 15dBm (10.8 + 0.6 * MaxPower [dBm]) // max power: 15dBm (10.8 + 0.6 * MaxPower [dBm])
// output_power: 2 dBm (17-(15-OutputPower) (if pa_boost_pin == true)) // output_power: 2 dBm (17-(15-OutputPower) (if pa_boost_pin == true))
SX1276_SetPaConfig(true, 7, 0); SX1276_SetPaConfig(true, 7, 0); // Lowest power for the T18
//Build packet //Build packet
FrSkyR9_build_packet(); FrSkyR9_build_packet();
phase++; phase++;
return 460; // Frequency settle time return 460; // Frequency settle time
case FRSKYR9_DATA: case FRSKYR9_DATA:
//Set RF switch to TX //Set RF switch to TX
SX1276_SetTxRxMode(TX_EN); SX1276_SetTxRxMode(TX_EN);
@ -147,7 +182,7 @@ uint16_t FrSkyR9_callback()
return 20000-460; return 20000-460;
#else #else
phase++; phase++;
return 11140; // Packet send time return 11140; // Packet send time
case FRSKYR9_RX1: case FRSKYR9_RX1:
//Force standby //Force standby
SX1276_SetMode(true, false, SX1276_OPMODE_STDBY); SX1276_SetMode(true, false, SX1276_OPMODE_STDBY);
@ -176,11 +211,11 @@ uint16_t FrSkyR9_callback()
//TX_LQI=~(SX1276_ReadReg(SX1276_19_PACKETSNR)>>2)+1; //TX_LQI=~(SX1276_ReadReg(SX1276_19_PACKETSNR)>>2)+1;
TX_RSSI=SX1276_ReadReg(SX1276_1A_PACKETRSSI)-157; TX_RSSI=SX1276_ReadReg(SX1276_1A_PACKETRSSI)-157;
for(uint8_t i=0;i<9;i++) for(uint8_t i=0;i<9;i++)
packet[4+i]=packet_in[i]; // Adjust buffer to match FrSkyX packet[4+i]=packet_in[i]; // Adjust buffer to match FrSkyX
frsky_process_telemetry(packet,len); // Process telemetry packet frsky_process_telemetry(packet,len); // Process telemetry packet
pps_counter++; pps_counter++;
if(TX_LQI==0) if(TX_LQI==0)
TX_LQI++; // Recover telemetry right away TX_LQI++; // Recover telemetry right away
} }
} }
} }
@ -188,13 +223,13 @@ uint16_t FrSkyR9_callback()
{//1 packet every 20ms {//1 packet every 20ms
pps_timer = millis(); pps_timer = millis();
debugln("%d pps", pps_counter); debugln("%d pps", pps_counter);
TX_LQI = pps_counter<<1; // Max=100% TX_LQI = pps_counter<<1; // Max=100%
pps_counter = 0; pps_counter = 0;
} }
if(TX_LQI==0) if(TX_LQI==0)
FrSkyX_telem_init(); // Reset telemetry FrSkyX_telem_init(); // Reset telemetry
else else
telemetry_link=1; // Send telemetry out anyway telemetry_link=1; // Send telemetry out anyway
//Clear all flags //Clear all flags
SX1276_WriteReg(SX1276_12_REGIRQFLAGS,0xFF); SX1276_WriteReg(SX1276_12_REGIRQFLAGS,0xFF);
phase=FRSKYR9_FREQ; phase=FRSKYR9_FREQ;

2
Multiprotocol/Multi.txt
View File

@ -62,7 +62,7 @@
62,XK,X450,X420 62,XK,X450,X420
63,XN_DUMP,250K,1M,2M,AUTO 63,XN_DUMP,250K,1M,2M,AUTO
64,FrskyX2,CH_16,CH_8,EU_16,EU_8,Cloned 64,FrskyX2,CH_16,CH_8,EU_16,EU_8,Cloned
65,FrSkyR9,915MHz,868MHz,915_8ch,868_8ch 65,FrSkyR9,915MHz,868MHz,915_8ch,868_8ch,FCC,--,FCC_8ch,--_8ch
66,PROPEL,74-Z 66,PROPEL,74-Z
67,LR12,LR12,LR12_6ch 67,LR12,LR12,LR12_6ch
68,Skyartec 68,Skyartec

4
Multiprotocol/Multi_Names.ino
View File

@ -130,7 +130,7 @@ const char STR_SUBTYPE_ESKY150[] = "\x03""4ch""7ch";
const char STR_SUBTYPE_ESKY150V2[] = "\x05""150V2"; const char STR_SUBTYPE_ESKY150V2[] = "\x05""150V2";
const char STR_SUBTYPE_V911S[] = "\x05""V911S""E119\0"; const char STR_SUBTYPE_V911S[] = "\x05""V911S""E119\0";
const char STR_SUBTYPE_XK[] = "\x04""X450""X420"; const char STR_SUBTYPE_XK[] = "\x04""X450""X420";
const char STR_SUBTYPE_FRSKYR9[] = "\x07""915MHz\0""868MHz\0""915 8ch""868 8ch"; const char STR_SUBTYPE_FRSKYR9[] = "\x07""915MHz\0""868MHz\0""915 8ch""868 8ch""FCC\0 ""--\0 ""FCC 8ch""-- 8ch\0";
const char STR_SUBTYPE_ESKY[] = "\x03""Std""ET4"; const char STR_SUBTYPE_ESKY[] = "\x03""Std""ET4";
const char STR_SUBTYPE_PROPEL[] = "\x04""74-Z"; const char STR_SUBTYPE_PROPEL[] = "\x04""74-Z";
const char STR_SUBTYPE_FRSKY_RX[] = "\x07""RX\0 ""CloneTX"; const char STR_SUBTYPE_FRSKY_RX[] = "\x07""RX\0 ""CloneTX";
@ -246,7 +246,7 @@ const mm_protocol_definition multi_protocols[] = {
{PROTO_FRSKYL, STR_FRSKYL, 2, STR_SUBTYPE_FRSKYL, OPTION_RFTUNE }, {PROTO_FRSKYL, STR_FRSKYL, 2, STR_SUBTYPE_FRSKYL, OPTION_RFTUNE },
#endif #endif
#if defined(FRSKYR9_SX1276_INO) #if defined(FRSKYR9_SX1276_INO)
{PROTO_FRSKY_R9, STR_FRSKYR9, 4, STR_SUBTYPE_FRSKYR9, OPTION_NONE }, {PROTO_FRSKY_R9, STR_FRSKYR9, 8, STR_SUBTYPE_FRSKYR9, OPTION_NONE },
#endif #endif
#if defined(FX816_NRF24L01_INO) #if defined(FX816_NRF24L01_INO)
{PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE }, {PROTO_FX816, STR_FX816, 1, STR_SUBTYPE_FX816, OPTION_NONE },

10
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 36 #define VERSION_PATCH_LEVEL 37
//****************** //******************
// Protocols // Protocols
@ -344,6 +344,10 @@ enum FRSKY_R9
R9_868 = 1, R9_868 = 1,
R9_915_8CH = 2, R9_915_8CH = 2,
R9_868_8CH = 3, R9_868_8CH = 3,
R9_FCC = 4,
R9_EU = 5,
R9_FCC_8CH = 6,
R9_EU_8CH = 7,
}; };
enum ESKY enum ESKY
{ {
@ -958,6 +962,10 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
R9_868 1 R9_868 1
R9_915_8CH 2 R9_915_8CH 2
R9_868_8CH 3 R9_868_8CH 3
R9_FCC 4
R9_EU 5
R9_FCC_8CH 6
R9_EU_8CH 7
sub_protocol==ESKY sub_protocol==ESKY
ESKY_STD 0 ESKY_STD 0
ESKY_ET4 1 ESKY_ET4 1

4
Multiprotocol/_Config.h
View File

@ -592,6 +592,10 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
R9_868 R9_868
R9_915_8CH R9_915_8CH
R9_868_8CH R9_868_8CH
R9_FCC
R9_EU
R9_FCC_8CH
R9_EU_8CH
PROTO_FRSKYV PROTO_FRSKYV
NONE NONE
PROTO_FRSKYX PROTO_FRSKYX