Changeset 207

Timestamp:

10/12/09 17:37:00 (4 years ago)

Author:

thomas

Message:

all line-by-line status transmission done

Location:

apps/TSCH

Files:

• debugwsn.py (modified) (3 diffs)
• reservation/ReservationP.nc (modified) (1 diff)
• tschqueue/TSCHQueue.h (modified) (1 diff)
• tschqueue/TSCHQueueP.nc (modified) (4 diffs)

apps/TSCH/debugwsn.py

@@ -335 +335 @@
 
 def displayOngoingRes(text_tag,input):
-   print "new packet"
-   print "0:"+input[0]
-   for i in range(1,27):
-      print str(i)+":"+str(ord(input[i]))
    #bytes 4 and 5 is the length
    length = ord(input[4])*256+ord(input[5])
@@ -366 +362 @@
       #bytes 19,20,21,22 is timestamp
       output = output + " timestamp="+str(ord(input[22])*256*256*256+ord(input[21])*256*256+ord(input[20])*256+ord(input[19])) #little endian
-   print output
    status_elements[text_tag]["STATUS_RESERVATIONP_ONGOINGRES"].delete(1.0,END)
    status_elements[text_tag]["STATUS_RESERVATIONP_ONGOINGRES"].insert(END,output)
@@ -384 +379 @@
 
 def displayQueue(text_tag,input):
-   #bytes 4 and 5 is the length
-   length = ord(input[4])*256+ord(input[5])
+   #print "new packet"
+   #print "0:"+input[0]
+   #for i in range(1,12):
+   #   print str(i)+":"+str(ord(input[i]))
+   #bytes 4 and 5 is the length
+   length = ord(input[4])*256+ord(input[5])
+   #byte 6 is row
+   output = "row "+str(ord(input[6]))+":"
+   #byte 8 is used
+   if (ord(input[8])==0):
+      output = output + " unused"
+   else:
+      #byte 9 is retries
+      output = output + " retries=" + str(ord(input[9]))
    status_elements[text_tag]["STATUS_TSCHQUEUEP_QUEUE"].delete(1.0,END)
-   status_elements[text_tag]["STATUS_TSCHQUEUEP_QUEUE"].insert(END,"Queue TBC")
+   status_elements[text_tag]["STATUS_TSCHQUEUEP_QUEUE"].insert(END,output)
 
 def parseInput(text_tag,input):

apps/TSCH/reservation/ReservationP.nc

@@ -33 +33 @@
       uint8_t i;
       //make sure neighbor exists and I have TXRES to that neighbor
-      if ((call NeighborGet.isNeighbor(neighbor))==FALSE
-            || (call CellUsageGet.getCell(CELLTYPE_TXRES, neighbor)).exists==FALSE) {
+      if ((call NeighborGet.isNeighbor(neighbor))==FALSE || (call CellUsageGet.getCell(CELLTYPE_TXRES, neighbor)).exists==FALSE) {
          call SerialIO.printError(COMPONENT_RESERVATION,ERR_NEIGHBOR_NOT_REACHABLE_YET,(uint16_t)neighbor,0);
          return FAIL;

apps/TSCH/tschqueue/TSCHQueue.h

@@ -9 +9 @@
 } TSCHQueueEntry_t;
 
+typedef struct debugTSCHQueueEntry_t {
+   uint8_t row;
+   TSCHQueueEntry_t queueEntry;
+} debugTSCHQueueEntry_t;
+
 #endif

apps/TSCH/tschqueue/TSCHQueueP.nc

@@ -19 +19 @@
 
    TSCHQueueEntry_t queue[QUEUELENGTH];
+
+   uint8_t debugRow;
    message_t* current_msg;
    error_t current_error;
@@ -32 +34 @@
    task void sendDoneTaskADV();
    void informRequester();
-   task void printTable();
+   task void taskPrintTable();
 
    /*-------------------------------- helper functions ----------------------------------*/
@@ -136 +138 @@
    }
 
-   task void printTable() {
-      //TBC
+   task void taskPrintTable() {
+      debugTSCHQueueEntry_t temp;
+      temp.row = debugRow;
+      temp.queueEntry  = queue[debugRow];
+      call SerialIO.printStatus(STATUS_TSCHQUEUEP_QUEUE,(uint8_t*)&temp,sizeof(debugTSCHQueueEntry_t));
+      debugRow = (debugRow+1)%QUEUELENGTH;
    }
 
@@ -309 +315 @@
    //DebugPrint
    command void DebugPrint.print() {
-      post printTable();
+      post taskPrintTable();
    }