Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-11-03 22:06:22 +00:00
Code Issues Projects Releases Wiki Activity

debug output fix

Browse Source
This commit is contained in:
fros4943 2008-03-18 15:48:24 +00:00
parent 32b5f206b1
commit 618f2907ec
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/TR1001Radio.java
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: TR1001Radio.java,v 1.3 2008/03/18 13:15:41 fros4943 Exp $ * $Id: TR1001Radio.java,v 1.4 2008/03/18 15:48:24 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote.interfaces; package se.sics.cooja.mspmote.interfaces;
@ -229,16 +229,16 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
public void dataReceived(USART source, int data) { public void dataReceived(USART source, int data) {
if (outgoingDataLength == 0 && !isTransmitting()) { if (outgoingDataLength == 0 && !isTransmitting()) {
/* New transmission discovered */ /* New transmission discovered */
//logger.debug("----- NEW MSP TRANSMISSION DETECTED -----"); /*logger.debug("----- NEW TR1001 TRANSMISSION DETECTED -----");*/
tr1001PacketConverter = new TR1001RadioPacketConverter(); tr1001PacketConverter = new TR1001RadioPacketConverter();
transmitting = true; transmitting = true;
lastEventTime = mspMote.getSimulation().getSimulationTime();
lastEvent = RadioEvent.TRANSMISSION_STARTED;
transmissionStartCycles = mspMote.getCPU().cycles; transmissionStartCycles = mspMote.getCPU().cycles;
lastDeliveredByteTimestamp = transmissionStartCycles; lastDeliveredByteTimestamp = transmissionStartCycles;
lastEvent = RadioEvent.TRANSMISSION_STARTED;
lastEventTime = mspMote.getSimulation().getSimulationTime();
this.setChanged(); this.setChanged();
this.notifyObservers(); this.notifyObservers();
} }
@ -252,13 +252,15 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
} }
// Deliver byte to radio medium as custom data // Deliver byte to radio medium as custom data
/*logger.debug("----- TR1001 DELIVERED BYTE -----");*/
lastEvent = RadioEvent.CUSTOM_DATA_TRANSMITTED; lastEvent = RadioEvent.CUSTOM_DATA_TRANSMITTED;
tr1001ByteFromMote = new TR1001RadioByte((byte) data, mspMote.getCPU().cycles - lastDeliveredByteTimestamp); tr1001ByteFromMote = new TR1001RadioByte((byte) data, mspMote.getCPU().cycles - lastDeliveredByteTimestamp);
outgoingData[outgoingDataLength++] = tr1001ByteFromMote;
lastDeliveredByteTimestamp = mspMote.getCPU().cycles;
this.setChanged(); this.setChanged();
this.notifyObservers(); this.notifyObservers();
lastDeliveredByteTimestamp = mspMote.getCPU().cycles;
outgoingData[outgoingDataLength++] = tr1001ByteFromMote;
// Feed to application level immediately // Feed to application level immediately
boolean finished = tr1001PacketConverter.fromTR1001ToCoojaAccumulated(tr1001ByteFromMote); boolean finished = tr1001PacketConverter.fromTR1001ToCoojaAccumulated(tr1001ByteFromMote);
if (finished) { if (finished) {
@ -267,7 +269,7 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
packetFromMote = tr1001PacketConverter.getAccumulatedConvertedCoojaPacket(); packetFromMote = tr1001PacketConverter.getAccumulatedConvertedCoojaPacket();
/* Notify observers of new prepared packet */ /* Notify observers of new prepared packet */
/*logger.debug("----- MSP DELIVERED PACKET -----");*/ /*logger.debug("----- TR1001 DELIVERED PACKET -----");*/
lastEvent = RadioEvent.PACKET_TRANSMITTED; lastEvent = RadioEvent.PACKET_TRANSMITTED;
this.setChanged(); this.setChanged();
this.notifyObservers(); this.notifyObservers();
@ -283,7 +285,7 @@ public class TR1001Radio extends Radio implements USARTListener, CustomDataRadio
this.setChanged(); this.setChanged();
this.notifyObservers(); this.notifyObservers();
/*logger.debug("----- MSP TRANSMISSION ENDED -----");*/ /*logger.debug("----- TR1001 TRANSMISSION ENDED -----");*/
} }
} }