interface BusyWait<TMicro, uint16_t>;
- interface RF230Config;
interface PacketField<uint8_t> as PacketLinkQuality;
interface PacketField<uint8_t> as PacketTransmitPower;
+ interface PacketField<uint8_t> as PacketRSSI;
interface PacketTimeStamp<TRF230, uint16_t>;
+
+ interface RF230Config;
interface Tasklet;
interface RadioAlarm;
+ async event void lastTouch(message_t* msg);
+
#ifdef RF230_DEBUG
interface DiagMsg;
#endif
tasklet_async event void RadioAlarm.fired()
{
if( state == STATE_SLEEP_2_TRX_OFF )
- {
state = STATE_TRX_OFF;
- }
else if( cmd == CMD_CCA )
{
uint8_t cca;
event void SpiResource.granted()
{
- // TODO: this should not be here, see my comment in HplRF230C.nc
+ call SELN.makeOutput();
call SELN.set();
if( state == STATE_P_ON )
if( call SpiResource.immediateRequest() == SUCCESS )
{
- // TODO: this should not be here, see my comment in HplRF230C.nc
+ call SELN.makeOutput();
call SELN.set();
return TRUE;
}
else if( cmd == CMD_TURNON && state == STATE_TRX_OFF && isSpiAcquired() )
{
+ ASSERT( ! radioIrq );
+
+ readRegister(RF230_IRQ_STATUS); // clear the interrupt register
call IRQ.captureRisingEdge();
+
writeRegister(RF230_TRX_STATE, RF230_RX_ON);
state = STATE_TRX_OFF_2_RX_ON;
}
else if( (cmd == CMD_TURNOFF || cmd == CMD_STANDBY)
&& state == STATE_RX_ON && isSpiAcquired() )
{
- call IRQ.disable();
writeRegister(RF230_TRX_STATE, RF230_FORCE_TRX_OFF);
+
+ call IRQ.disable();
+ radioIrq = FALSE;
+
state = STATE_TRX_OFF;
}
uint16_t time;
uint8_t length;
uint8_t* data;
+ uint8_t header;
if( cmd != CMD_NONE || state != STATE_RX_ON || ! isSpiAcquired() || radioIrq )
return EBUSY;
if( call RF230Config.requiresRssiCca(msg)
- && readRegister(RF230_PHY_RSSI) > ((rssiClear + rssiBusy) >> 3) )
+ && (readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK) > ((rssiClear + rssiBusy) >> 3) )
return EBUSY;
writeRegister(RF230_TRX_STATE, RF230_PLL_ON);
// length | data[0] ... data[length-3] | automatically generated FCS
call HplRF230.spiSplitReadWrite(length);
- // the FCS is atomatically generated
+ // the FCS is atomatically generated (2 bytes)
length -= 2;
+ header = call RF230Config.getHeaderLength();
+ if( header > length )
+ header = length;
+
+ length -= header;
+
+ // first upload the header
+ do {
+ call HplRF230.spiSplitReadWrite(*(data++));
+ }
+ while( --header != 0 );
+
+ call PacketTimeStamp.set(msg, time);
+ signal lastTouch(msg);
+
do {
call HplRF230.spiSplitReadWrite(*(data++));
}
call HplRF230.spiSplitRead();
call SELN.set();
- length = readRegister(RF230_TRX_STATUS);
-
- // go back to RX_ON state when finished
- writeRegister(RF230_TRX_STATE, RF230_RX_ON);
-
/*
* There is a very small window (~1 microsecond) when the RF230 went
* into PLL_ON state but was somehow not properly initialized because
* radio can even receive a message, and generate a TRX_UR interrupt
* because of concurrent access, but that message probably cannot be
* recovered.
+ *
+ * TODO: this needs to be verified, and make sure that the chip is
+ * not locked up in this case.
*/
- if( (length & RF230_TRX_STATUS_MASK) != RF230_BUSY_TX )
+
+ // go back to RX_ON state when finished
+ writeRegister(RF230_TRX_STATE, RF230_RX_ON);
+
+#ifdef RF230_DEBUG_MESSAGES
+ if( call DiagMsg.record() )
{
-#ifdef RF230_DEBUG
- if( call DiagMsg.record() )
- {
- call DiagMsg.str("assert tx");
- call DiagMsg.uint16(call RadioAlarm.getNow());
- call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
- call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
- call DiagMsg.hex8(radioIrq);
- call DiagMsg.uint8(state);
- call DiagMsg.uint8(cmd);
- call DiagMsg.send();
- }
-#endif
- ASSERT( (length & RF230_TRX_STATUS_MASK) == RF230_PLL_ON );
- return FAIL;
- }
+ length = call RF230Config.getLength(msg);
- call PacketTimeStamp.set(msg, time);
+ call DiagMsg.str("tx");
+ call DiagMsg.uint16(time);
+ call DiagMsg.uint8(length);
+ call DiagMsg.hex8s(data, length - 2);
+ call DiagMsg.send();
+ }
+#endif
// wait for the TRX_END interrupt
state = STATE_BUSY_TX_2_RX_ON;
}
default tasklet_async event void RadioSend.sendDone(error_t error) { }
+ default tasklet_async event void RadioSend.ready() { }
/*----------------- CCA -----------------*/
length -= read;
- while( read-- != 0 )
+ do {
crc = call HplRF230.crcByte(crc, *(data++) = call HplRF230.spiSplitReadWrite(0));
+ }
+ while( --read != 0 );
if( signal RadioReceive.header(rxMsg) )
{
call SELN.set();
state = STATE_RX_ON;
+
+#ifdef RF230_DEBUG_MESSAGES
+ if( call DiagMsg.record() )
+ {
+ length = call RF230Config.getLength(rxMsg);
+
+ call DiagMsg.str("rx");
+ call DiagMsg.uint16(call PacketTimeStamp.isSet(rxMsg) ? call PacketTimeStamp.get(rxMsg) : 0);
+ call DiagMsg.uint16(call RadioAlarm.getNow());
+ call DiagMsg.uint8(crc != 0);
+ call DiagMsg.uint8(length);
+ call DiagMsg.hex8s(call RF230Config.getPayload(rxMsg), length - 2);
+ call DiagMsg.send();
+ }
+#endif
+
cmd = CMD_NONE;
// signal only if it has passed the CRC check
{
uint16_t time;
uint8_t irq;
+ uint8_t temp;
atomic time = capturedTime;
radioIrq = FALSE;
#ifdef RF230_DEBUG
// TODO: handle this interrupt
-// ASSERT( ! (irq & RF230_IRQ_TRX_UR) );
if( irq & RF230_IRQ_TRX_UR )
{
if( call DiagMsg.record() )
{
ASSERT( state == STATE_RX_ON || state == STATE_PLL_ON_2_RX_ON );
- // the most likely place for busy channel
- rssiBusy += readRegister(RF230_PHY_RSSI) - (rssiBusy >> 2);
+ // the most likely place for busy channel, with no TRX_END interrupt
+ if( irq == RF230_IRQ_RX_START )
+ {
+ temp = readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK;
+
+ rssiBusy += temp - (rssiBusy >> 2);
+
+#ifdef RF230_RSSI_ENERGY
+ temp = readRegister(RF230_PHY_ED_LEVEL);
+#endif
+
+ call PacketRSSI.set(rxMsg, temp);
+ }
+ else
+ call PacketRSSI.clear(rxMsg);
/*
* The timestamp corresponds to the first event which could not
cmd = CMD_RECEIVE;
}
else
- {
-#ifdef RF230_DEBUG
- if( call DiagMsg.record() )
- {
- call DiagMsg.str("assert irq");
- call DiagMsg.uint16(call RadioAlarm.getNow());
- call DiagMsg.hex8(readRegister(RF230_TRX_STATUS));
- call DiagMsg.hex8(readRegister(RF230_TRX_STATE));
- call DiagMsg.hex8(irq);
- call DiagMsg.uint8(state);
- call DiagMsg.uint8(cmd);
- call DiagMsg.send();
- }
-#endif
- }
+ ASSERT( cmd == CMD_TURNOFF );
}
if( irq & RF230_IRQ_TRX_END )
else
{
// the most likely place for clear channel (hope to avoid acks)
- rssiClear += readRegister(RF230_PHY_RSSI) - (rssiClear >> 2);
+ rssiClear += (readRegister(RF230_PHY_RSSI) & RF230_RSSI_MASK) - (rssiClear >> 2);
}
cmd = CMD_DOWNLOAD;
{
if( cmd == CMD_DOWNLOAD )
downloadMessage();
- else if( cmd <= CMD_TURNON && CMD_TURNOFF <= cmd )
+ else if( CMD_TURNOFF <= cmd && cmd <= CMD_TURNON )
changeState();
else if( cmd == CMD_CHANNEL )
changeChannel();
projects / tinyos-2.x.git / blobdiff