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:58:14 +00:00
Code Issues Projects Releases Wiki Activity

Added MJXQ / E010

Browse Source
This commit is contained in:
pascallanger 2016-08-28 14:03:22 +02:00
parent f6c5252376
commit 14e3419e4c
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Multiprotocol/MJXQ_nrf24l01.ino
View File

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>. along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/ */
// compatible with MJX WLH08, X600, X800, H26D // compatible with MJX WLH08, X600, X800, H26D, Eachine E010
// Last sync with hexfet new_protocols/mjxq_nrf24l01.c dated 2016-01-17 // Last sync with hexfet new_protocols/mjxq_nrf24l01.c dated 2016-01-17
#if defined(MJXQ_NRF24L01_INO) #if defined(MJXQ_NRF24L01_INO)
@ -92,6 +92,12 @@ static void __attribute__((unused)) MJXQ_send_packet(uint8_t bind)
// Servo_AUX7 AUTOFLIP // X800, X600 // Servo_AUX7 AUTOFLIP // X800, X600
switch(sub_protocol) switch(sub_protocol)
{ {
case E010:
packet[10] = GET_FLAG(Servo_AUX5, 0x01) //HEADLESS
| GET_FLAG(Servo_AUX6, 0x02); //RTH
if (!bind)
packet[14] = GET_FLAG(Servo_AUX1, 0x04); //FLIP
break;
case H26D: case H26D:
packet[10]=MJXQ_pan_tilt_value(); packet[10]=MJXQ_pan_tilt_value();
// fall through on purpose - no break // fall through on purpose - no break
@ -169,7 +175,7 @@ static void __attribute__((unused)) MJXQ_init()
if (sub_protocol == WLH08) if (sub_protocol == WLH08)
memcpy(hopping_frequency, "\x12\x22\x32\x42", MJXQ_RF_NUM_CHANNELS); memcpy(hopping_frequency, "\x12\x22\x32\x42", MJXQ_RF_NUM_CHANNELS);
else else
if (sub_protocol == H26D) if (sub_protocol == H26D || sub_protocol == E010)
memcpy(hopping_frequency, "\x36\x3e\x46\x2e", MJXQ_RF_NUM_CHANNELS); memcpy(hopping_frequency, "\x36\x3e\x46\x2e", MJXQ_RF_NUM_CHANNELS);
else else
{ {
@ -193,7 +199,10 @@ static void __attribute__((unused)) MJXQ_init()
NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01); // Enable data pipe 0 only NRF24L01_WriteReg(NRF24L01_02_EN_RXADDR, 0x01); // Enable data pipe 0 only
NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits NRF24L01_WriteReg(NRF24L01_04_SETUP_RETR, 0x00); // no retransmits
NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, MJXQ_PACKET_SIZE); // rx pipe 0 (used only for blue board) NRF24L01_WriteReg(NRF24L01_11_RX_PW_P0, MJXQ_PACKET_SIZE); // rx pipe 0 (used only for blue board)
NRF24L01_SetBitrate(NRF24L01_BR_1M); // 1Mbps if (sub_protocol == E010)
NRF24L01_SetBitrate(NRF24L01_BR_250K); // 250K
else
NRF24L01_SetBitrate(NRF24L01_BR_1M); // 1Mbps
NRF24L01_SetPower(); NRF24L01_SetPower();
} }
@ -202,18 +211,25 @@ static void __attribute__((unused)) MJXQ_init2()
if (sub_protocol == H26D) if (sub_protocol == H26D)
memcpy(hopping_frequency, "\x32\x3e\x42\x4e", MJXQ_RF_NUM_CHANNELS); memcpy(hopping_frequency, "\x32\x3e\x42\x4e", MJXQ_RF_NUM_CHANNELS);
else else
if (sub_protocol == WLH08) if (sub_protocol != WLH08 && sub_protocol != E010)
for(uint8_t i=0;i<MJXQ_RF_NUM_CHANNELS;i++) for(uint8_t i=0;i<MJXQ_RF_NUM_CHANNELS;i++)
hopping_frequency[i]=pgm_read_byte_near( &MJXQ_map_rfchan[rx_tx_addr[4]%3][i] ); hopping_frequency[i]=pgm_read_byte_near( &MJXQ_map_rfchan[rx_tx_addr[4]%3][i] );
} }
static void __attribute__((unused)) MJXQ_initialize_txid() static void __attribute__((unused)) MJXQ_initialize_txid()
{ {
if (sub_protocol == WLH08) if (sub_protocol == E010)
rx_tx_addr[0]&=0xF8; // txid must be multiple of 8 {
rx_tx_addr[0]=0x90;
rx_tx_addr[1]=0x1C;
rx_tx_addr[2]=0x00;
}
else else
for(uint8_t i=0;i<3;i++) if (sub_protocol == WLH08)
rx_tx_addr[i]=pgm_read_byte_near( &MJXQ_map_txid[rx_tx_addr[4]%3][i] ); rx_tx_addr[0]&=0xF8; // txid must be multiple of 8
else
for(uint8_t i=0;i<3;i++)
rx_tx_addr[i]=pgm_read_byte_near( &MJXQ_map_txid[rx_tx_addr[4]%3][i] );
} }
uint16_t MJXQ_callback() uint16_t MJXQ_callback()

4
Multiprotocol/Multiprotocol.h
View File

@ -119,7 +119,8 @@ enum MJXQ
WLH08 = 0, WLH08 = 0,
X600 = 1, X600 = 1,
X800 = 2, X800 = 2,
H26D = 3 H26D = 3,
E010 = 4
}; };
enum FRSKYX enum FRSKYX
@ -544,6 +545,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
X600 1 X600 1
X800 2 X800 2
H26D 3 H26D 3
E010 4
sub_protocol==FRSKYX sub_protocol==FRSKYX
CH_16 0 CH_16 0
CH_8 1 CH_8 1

1
Multiprotocol/_Config.h
View File

@ -225,6 +225,7 @@ const PPM_Parameters PPM_prot[15]= {
X600 X600
X800 X800
H26D H26D
E010
MODE_SHENQI MODE_SHENQI
NONE NONE
MODE_FY326 MODE_FY326