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

Another SFHSS trial...

Browse Source
This commit is contained in:
pascallanger 2016-08-17 13:44:20 +02:00
parent 0a4ce2350a
commit 7c127acf17
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Multiprotocol/CYRF6936_SPI.ino
View File

@ -128,9 +128,10 @@ void CYRF_SetPower(uint8_t val)
power=IS_POWER_FLAG_on?CYRF_HIGH_POWER:CYRF_LOW_POWER; power=IS_POWER_FLAG_on?CYRF_HIGH_POWER:CYRF_LOW_POWER;
if(IS_RANGE_FLAG_on) if(IS_RANGE_FLAG_on)
power=CYRF_RANGE_POWER; power=CYRF_RANGE_POWER;
power|=val;
if(prev_power != power) if(prev_power != power)
{ {
CYRF_WriteRegister(CYRF_03_TX_CFG, val | power); CYRF_WriteRegister(CYRF_03_TX_CFG,power);
prev_power=power; prev_power=power;
} }
} }

9
Multiprotocol/SFHSS_cc2500.ino
View File

@ -82,8 +82,8 @@ static void __attribute__((unused)) SFHSS_rf_init()
for (uint8_t i = 0; i < 39; ++i) for (uint8_t i = 0; i < 39; ++i)
CC2500_WriteReg(i, pgm_read_byte_near(&SFHSS_init_values[i])); CC2500_WriteReg(i, pgm_read_byte_near(&SFHSS_init_values[i]));
prev_option = 0; prev_option = option;
//CC2500_WriteReg(CC2500_0C_FSCTRL0, option); CC2500_WriteReg(CC2500_0C_FSCTRL0, option);
CC2500_SetTxRxMode(TX_EN); CC2500_SetTxRxMode(TX_EN);
CC2500_SetPower(); CC2500_SetPower();
@ -130,9 +130,10 @@ static void __attribute__((unused)) SFHSS_calc_next_chan()
} }
// Channel values are 10-bit values between 86 and 906, 496 is the middle. // Channel values are 10-bit values between 86 and 906, 496 is the middle.
// Values grow down and to the right, so we just revert every channel.
static uint16_t __attribute__((unused)) SFHSS_convert_channel(uint8_t num) static uint16_t __attribute__((unused)) SFHSS_convert_channel(uint8_t num)
{ {
return (uint16_t) (map(limit_channel_100(num),PPM_MIN_100,PPM_MAX_100,86,906)); return (uint16_t) (map(limit_channel_100(num),PPM_MIN_100,PPM_MAX_100,906,86));
} }
static void __attribute__((unused)) SFHSS_build_data_packet() static void __attribute__((unused)) SFHSS_build_data_packet()
@ -145,7 +146,7 @@ static void __attribute__((unused)) SFHSS_build_data_packet()
uint16_t ch3 = SFHSS_convert_channel(CH_AETR[ch_offset+2]); uint16_t ch3 = SFHSS_convert_channel(CH_AETR[ch_offset+2]);
uint16_t ch4 = SFHSS_convert_channel(CH_AETR[ch_offset+3]); uint16_t ch4 = SFHSS_convert_channel(CH_AETR[ch_offset+3]);
packet[0] = 0x81; // can be 80, 81, 81 for Orange, only 81 for XK packet[0] = 0x81; // can be 80 or 81 for Orange, only 81 for XK
packet[1] = rx_tx_addr[0]; packet[1] = rx_tx_addr[0];
packet[2] = rx_tx_addr[1]; packet[2] = rx_tx_addr[1];
packet[3] = 0; packet[3] = 0;