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

Contributions from Michael Baar:

Browse source 
# msb430\dev\cc1020.c
Data type problem in the calibration function, therefore looping 10 seconds on boot. Fixed.

# msb430\contiki-msb430-main.c
Directly accessed power management while other modules used the Contiki layer resulting in the node sleeping most of the time. Fixed.
Added uIP support.

# msb430\buildscripts\makefile.win
Changed to erase only main-memory but keep infomemory so the node configuration is not erashed during flashing.
This commit is contained in:
nvt-se 2007-07-31 07:54:44 +00:00
parent 70ddc0f27e
commit 709adf51ad
3 changed files with 53 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
platform/msb430/dev/cc1020.c
View file

@ -552,7 +552,6 @@ cc1020_reset(void)
static int
cc1020_calibrate(void)
{
unsigned char tmp;
unsigned int timeout_cnt;
// Turn off PA to avoid spurs during calibration in TX mode
@ -561,22 +560,20 @@ cc1020_calibrate(void)
// Start calibration
cc1020_write_reg(CC1020_CALIBRATE, 0xB5);
clock_delay(1200);
while ((tmp = cc1020_read_reg(CC1020_STATUS) & CAL_COMPLETE) == 0);
while ((cc1020_read_reg(CC1020_STATUS) & CAL_COMPLETE) == 0);
clock_delay(800);
// Monitor lock
timeout_cnt = LOCK_TIMEOUT;
do {
tmp = cc1020_read_reg(CC1020_STATUS);
} while (tmp & LOCK_CONTINUOUS && --timeout_cnt > 0);
for (timeout_cnt = LOCK_TIMEOUT; timeout_cnt > 0; timeout_cnt--) {
if (cc1020_read_reg(CC1020_STATUS) & LOCK_CONTINUOUS)
break;
}
// Restore PA_POWER
cc1020_write_reg(CC1020_PA_POWER, cc1020_pa_power);
// Return state of LOCK_CONTINUOUS bit
return (cc1020_read_reg(CC1020_STATUS) & LOCK_CONTINUOUS) ==
LOCK_CONTINUOUS;
return (cc1020_read_reg(CC1020_STATUS) & LOCK_CONTINUOUS) == LOCK_CONTINUOUS;
}
static int