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

Merge remote-tracking branch 'refs/remotes/pascallanger/master'

Browse Source
This commit is contained in:
Dennis 2017-11-25 17:35:33 -05:00
commit 1da1d8af19
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Multiprotocol/SFHSS_cc2500.ino
View File

@ -184,8 +184,8 @@ static void __attribute__((unused)) SFHSS_build_data_packet()
packet[0] = 0x81; // can be 80 or 81 for Orange, only 81 for XK
packet[1] = rx_tx_addr[0];
packet[2] = rx_tx_addr[1];
packet[3] = rx_tx_addr[2]; // ID?
packet[4] = rx_tx_addr[3]; // ID?
packet[3] = 0x00; // unknown but prevents some receivers to bind if not 0
packet[4] = 0x00; // unknown but prevents some receivers to bind if not 0
packet[5] = (rf_ch_num << 3) | ((ch1 >> 9) & 0x07);
packet[6] = (ch1 >> 1);
packet[7] = (ch1 << 7) | ((ch2 >> 5) & 0x7F );
@ -224,7 +224,7 @@ uint16_t ReadSFHSS()
/* Work cycle: 6.8ms */
#define SFHSS_PACKET_PERIOD 6800
#define SFHSS_DATA2_TIMING 1630 // Adjust this value between 1600 and 1650 if your RX(s) are not operating properly
#define SFHSS_DATA2_TIMING 1625 // Adjust this value between 1600 and 1650 if your RX(s) are not operating properly
case SFHSS_DATA1:
SFHSS_build_data_packet();
SFHSS_send_packet();
@ -255,7 +255,7 @@ static void __attribute__((unused)) SFHSS_get_tx_id()
uint8_t run_count = 0;
// add guard for bit count
fixed_id = 1 ^ (MProtocol_id & 1);
for (uint8_t i = 0; i < 32; ++i)
for (uint8_t i = 0; i < 16; ++i)
{
fixed_id = (fixed_id << 1) | (MProtocol_id & 1);
MProtocol_id >>= 1;
@ -272,10 +272,8 @@ static void __attribute__((unused)) SFHSS_get_tx_id()
run_count = 0;
}
// fixed_id = 0xBC11;
rx_tx_addr[0] = fixed_id >> 24;
rx_tx_addr[1] = fixed_id >> 16;
rx_tx_addr[2] = fixed_id >> 8;
rx_tx_addr[3] = fixed_id >> 0;
rx_tx_addr[0] = fixed_id >> 8;
rx_tx_addr[1] = fixed_id >> 0;
}
uint16_t initSFHSS()

6
docs/Compiling_STM32.md
View File

@ -30,7 +30,11 @@ Flashing precompiled **binaries** is done very simple with the cable setup prese
1. In order to compile successfully you need also to modify a maple library file. In ```....\hardware\Arduino_STM32\STM32F1\cores\maple\libmaple\usart_f1.c``` comment out the 2 functions as shown below. This is required to have low-level access to the USART interrupt. <br>
```
/* void __irq_usart2(void){
/* void __irq_usart1(void){
usart_irq(&usart1_rb, USART1_BASE);
}
void __irq_usart2(void){
usart_irq(&usart2_rb, USART2_BASE);
}