projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ccdbg and altos sources into one giant repository
[fw/altos]
/
target
/
radio
/
init.c
diff --git
a/target/radio/init.c
b/target/radio/init.c
index 6843ef9a9f37e60739493d910b270a385fcdac3f..ea7c984c1b17cf3d24e8fa706f34b4a198122784 100644
(file)
--- a/
target/radio/init.c
+++ b/
target/radio/init.c
@@
-106,7
+106,7
@@
static __code uint8_t radio_setup[] = {
RF_FREQ2_OFF, FREQ_CONTROL >> 16,
RF_FREQ1_OFF, FREQ_CONTROL >> 8,
RF_FREQ0_OFF, FREQ_CONTROL >> 0,
RF_FREQ2_OFF, FREQ_CONTROL >> 16,
RF_FREQ1_OFF, FREQ_CONTROL >> 8,
RF_FREQ0_OFF, FREQ_CONTROL >> 0,
-
+
RF_FSCTRL1_OFF, (IF_FREQ_CONTROL << RF_FSCTRL1_FREQ_IF_SHIFT),
RF_FSCTRL0_OFF, (0 << RF_FSCTRL0_FREQOFF_SHIFT),
RF_FSCTRL1_OFF, (IF_FREQ_CONTROL << RF_FSCTRL1_FREQ_IF_SHIFT),
RF_FSCTRL0_OFF, (0 << RF_FSCTRL0_FREQOFF_SHIFT),
@@
-117,7
+117,7
@@
static __code uint8_t radio_setup[] = {
RF_MDMCFG2_OFF, (RF_MDMCFG2_DEM_DCFILT_OFF |
RF_MDMCFG2_MOD_FORMAT_GFSK |
RF_MDMCFG2_SYNC_MODE_15_16_THRES),
RF_MDMCFG2_OFF, (RF_MDMCFG2_DEM_DCFILT_OFF |
RF_MDMCFG2_MOD_FORMAT_GFSK |
RF_MDMCFG2_SYNC_MODE_15_16_THRES),
- RF_MDMCFG1_OFF, (RF_MDMCFG1_FEC_
DIS
|
+ RF_MDMCFG1_OFF, (RF_MDMCFG1_FEC_
EN
|
RF_MDMCFG1_NUM_PREAMBLE_4 |
(2 << RF_MDMCFG1_CHANSPC_E_SHIFT)),
RF_MDMCFG0_OFF, (17 << RF_MDMCFG0_CHANSPC_M_SHIFT),
RF_MDMCFG1_NUM_PREAMBLE_4 |
(2 << RF_MDMCFG1_CHANSPC_E_SHIFT)),
RF_MDMCFG0_OFF, (17 << RF_MDMCFG0_CHANSPC_M_SHIFT),
@@
-150,7
+150,7
@@
static __code uint8_t radio_setup[] = {
/* default sync values */
RF_SYNC1_OFF, 0xD3,
RF_SYNC0_OFF, 0x91,
/* default sync values */
RF_SYNC1_OFF, 0xD3,
RF_SYNC0_OFF, 0x91,
-
+
/* max packet length */
RF_PKTLEN_OFF, PACKET_LEN,
/* max packet length */
RF_PKTLEN_OFF, PACKET_LEN,
@@
-159,6
+159,7
@@
static __code uint8_t radio_setup[] = {
PKTCTRL1_ADR_CHK_NONE),
RF_PKTCTRL0_OFF, (RF_PKTCTRL0_WHITE_DATA|
RF_PKTCTRL0_PKT_FORMAT_NORMAL|
PKTCTRL1_ADR_CHK_NONE),
RF_PKTCTRL0_OFF, (RF_PKTCTRL0_WHITE_DATA|
RF_PKTCTRL0_PKT_FORMAT_NORMAL|
+ RF_PKTCTRL0_CRC_EN|
RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
RF_ADDR_OFF, 0x00,
RF_MCSM2_OFF, (RF_MCSM2_RX_TIME_END_OF_PACKET),
RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
RF_ADDR_OFF, 0x00,
RF_MCSM2_OFF, (RF_MCSM2_RX_TIME_END_OF_PACKET),