deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1280 from alignan/cc1200-changes

Browse source 
Made CC1200 test mode and rx watchdog selectable
This commit is contained in:
Antonio Lignan 2015-10-28 15:42:14 +01:00
parent 9f42c53e7f 50ee33630e
commit 1759411e55
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dev/cc1200/cc1200-conf.h
View file

@ -73,6 +73,17 @@
#define CC1200_MAX_PAYLOAD_LEN 127
#endif
/*---------------------------------------------------------------------------*/
/*
* The RX watchdog is used to check whether the radio is in RX mode at regular
* intervals (once per second). Can be used to improve reliability especially
* if NullRDC is used. Turned of by default.
*/
#ifdef CC1200_CONF_USE_RX_WATCHDOG
#define CC1200_USE_RX_WATCHDOG CC1200_CONF_USE_RX_WATCHDOG
#else
#define CC1200_USE_RX_WATCHDOG 0
#endif
/*---------------------------------------------------------------------------*/
/*
* Use 802.15.4g frame format? Supports frame lenghts up to 2047 bytes!
*/

29
dev/cc1200/cc1200.c
View file

@ -57,8 +57,7 @@
* - 3: Print errors + warnings + information (what's going on...)
*/
#define DEBUG_LEVEL 2
/* If set to 1, we use a timer to poll RX mode inside the cc1200 process */
#define USE_RX_WATCHDOG 1
/*
* RF test mode. Blocks inside "configure()".
* - Set this parameter to 1 in order to produce an modulated carrier (PN9)
@ -66,14 +65,16 @@
* - Set this parameter to 3 in order to switch to rx synchronous mode
* The channel is set according to CC1200_DEFAULT_CHANNEL
*/
#define RF_TESTMODE 0
#if RF_TESTMODE
#ifndef CC1200_RF_TESTMODE
#define CC1200_RF_TESTMODE 0
#endif
#if CC1200_RF_TESTMODE
#undef CC1200_RF_CFG
#if RF_TESTMODE == 1
#if CC1200_RF_TESTMODE == 1
#define CC1200_RF_CFG cc1200_802154g_863_870_fsk_50kbps
#elif RF_TESTMODE == 2
#elif CC1200_RF_TESTMODE == 2
#define CC1200_RF_CFG cc1200_802154g_863_870_fsk_50kbps
#elif RF_TESTMODE == 3
#elif CC1200_RF_TESTMODE == 3
#define CC1200_RF_CFG cc1200_802154g_863_870_fsk_50kbps
#endif
#endif
@ -1442,7 +1443,7 @@ configure(void)
{
uint8_t reg;
#if RF_TESTMODE
#if CC1200_RF_TESTMODE
uint32_t freq;
#endif
@ -1471,7 +1472,7 @@ configure(void)
* RF test modes needed during hardware development
**************************************************************************/
#if (RF_TESTMODE == 1) || (RF_TESTMODE == 2)
#if (CC1200_RF_TESTMODE == 1) || (CC1200_RF_TESTMODE == 2)
strobe(CC1200_SFTX);
single_write(CC1200_TXFIRST, 0);
@ -1487,7 +1488,7 @@ configure(void)
printf("RF: Freq1 0x%02x\n", ((uint8_t *)&freq)[1]);
printf("RF: Freq2 0x%02x\n", ((uint8_t *)&freq)[2]);
#if (RF_TESTMODE == 1)
#if (CC1200_RF_TESTMODE == 1)
single_write(CC1200_SYNC_CFG1, 0xE8);
single_write(CC1200_PREAMBLE_CFG1, 0x00);
single_write(CC1200_MDMCFG1, 0x46);
@ -1498,7 +1499,7 @@ configure(void)
single_write(CC1200_FS_DVC0, 0x17);
#endif
#if (RF_TESTMODE == 2)
#if (CC1200_RF_TESTMODE == 2)
single_write(CC1200_SYNC_CFG1, 0xE8);
single_write(CC1200_PREAMBLE_CFG1, 0x00);
single_write(CC1200_MDMCFG1, 0x06);
@ -1513,7 +1514,7 @@ configure(void)
strobe(CC1200_STX);
while(1) {
#if (RF_TESTMODE == 1)
#if (CC1200_RF_TESTMODE == 1)
watchdog_periodic();
BUSYWAIT_UNTIL(0, RTIMER_SECOND / 10);
leds_off(LEDS_YELLOW);
@ -1534,7 +1535,7 @@ configure(void)
#endif
}
#elif (RF_TESTMODE == 3)
#elif (CC1200_RF_TESTMODE == 3)
/* CS on GPIO3 */
single_write(CC1200_IOCFG3, CC1200_IOCFG_CARRIER_SENSE);
@ -1568,7 +1569,7 @@ configure(void)
}
#endif /* #if RF_TESTMODE == ... */
#endif /* #if CC1200_RF_TESTMODE == ... */
/***************************************************************************
* Set the stuff we need for this driver to work. Don't touch!