Changeset 182

Timestamp:

10/05/09 17:23:50 (4 years ago)

Author:

thomas

Message:

 

Location:

apps/TSCH

Files:

• TSCHAppC.nc (modified) (5 diffs)
• globaltime/GlobalTimeP.nc (modified) (2 diffs)
• interfaces/GlobalTime.nc (modified) (1 diff)
• interfaces/NeighborGet.nc (modified) (1 diff)
• interfaces/ReservationUpdate.nc (modified) (1 diff)
• serialio (moved) (moved from apps/TSCH/serialoutput)
• serialio/SerialOutputC.nc (copied) (copied from apps/TSCH/serialoutput/SerialOutputC.nc)
• serialio/SerialOutputP.nc (copied) (copied from apps/TSCH/serialoutput/SerialOutputP.nc)
• serialoutput/Makefile (deleted)
• serialoutput/TestUartAppC.nc (deleted)
• serialoutput/TestUartC.nc (deleted)
• serialoutput/durations.xlsx (deleted)
• wiring.pdf (modified) (previous)
• wiring.vsd (modified) (previous)

apps/TSCH/TSCHAppC.nc

@@ -14 +14 @@
    components KeepAliveC;
    components MultiplexC;
+   components ActiveMessageAddressC;
    components SlotEngineC;
    components GlobalTimeC;
-   components ActiveMessageAddressC;
-   components SerialOutputC;
-   //debug   
+   //debug
+   components SerialIOC;
    components PrintPacketC;
    components HplMsp430GeneralIOC;
@@ -24 +24 @@
    MainC.SoftwareInit->CellUsageC;
 
-   //general
    TSCHC.Boot->MainC;
    //stack
+   TSCHC.ActiveMessageAddress->ActiveMessageAddressC;
    TSCHC.Advertise->AdvertiseC;
    TSCHC.Send->ForwardingC.SentFromUpper;
@@ -32 +32 @@
    TSCHC.Receive->MultiplexC.ReceiveDATA;
    TSCHC.ReservationUpdate->ReservationC;
-   TSCHC.ActiveMessageAddress->ActiveMessageAddressC;
    //debug
    TSCHC.PrintReservation->ReservationC;
@@ -45 +44 @@
    TSCHC.Port34->HplMsp430GeneralIOC.Port34;
 
-   ForwardingC.ReservationUpdate->ReservationC;
    ForwardingC.SendToLower->TSCHQueueC.SendDATA;
    ForwardingC.NeighborGet->NeighborsC;
    ForwardingC.CellUsageGet->CellUsageC;
+   ForwardingC.ReservationUpdate->ReservationC;
+   //debug
    ForwardingC.PrintPacket->PrintPacketC;
 
+   ReservationC.NeighborGet->NeighborsC;
    ReservationC.Receive->MultiplexC.ReceiveRES;
    ReservationC.SimpleSend->TSCHQueueC.SendRES;
-   ReservationC.NeighborGet->NeighborsC;
    ReservationC.CellUsageSet->CellUsageC;
    ReservationC.CellUsageGet->CellUsageC;
+   ReservationC.GlobalTime->GlobalTimeC;
+   //debug
    ReservationC.PrintPacket->PrintPacketC;
-   ReservationC.GlobalTime->GlobalTimeC;
 
    NeighborsC.DeQueue->TSCHQueueC;
-   NeighborsC.CellUsageSet->CellUsageC;
-   NeighborsC.CellUsageGet->CellUsageC;
+   NeighborsC.SendADV->TSCHQueueC.SendADV;
    NeighborsC.SendDATA->TSCHQueueC.SendDATA;
-   NeighborsC.SendADV->TSCHQueueC.SendADV;
    NeighborsC.SendRES->TSCHQueueC.SendRES;
    NeighborsC.SendKA->TSCHQueueC.SendKA;
+   NeighborsC.IndicateRx->MultiplexC;
+   NeighborsC.CellUsageGet->CellUsageC;
    NeighborsC.ReceiveADV->MultiplexC.ReceiveADV;
-   NeighborsC.IndicateRx->MultiplexC;
+   NeighborsC.CellUsageSet->CellUsageC;
    NeighborsC.ReservationUpdate->ReservationC;
 
@@ -73 +74 @@
    CellUsageC.GlobalTime->GlobalTimeC;
 
-   AdvertiseC.SimpleSend->TSCHQueueC.SendADV;
    AdvertiseC.NeighborGet->NeighborsC;
    AdvertiseC.CellUsageGet->CellUsageC;
+   AdvertiseC.SimpleSend->TSCHQueueC.SendADV;
    AdvertiseC.ActiveMessageAddress->ActiveMessageAddressC;
 
+   TSCHQueueC.GlobalSync->GlobalTimeC;
+   TSCHQueueC.GlobalTime->GlobalTimeC;
+   TSCHQueueC.ActiveMessageAddress->ActiveMessageAddressC;
+   //debug
    TSCHQueueC.PrintPacket->PrintPacketC;
-   TSCHQueueC.GlobalTime->GlobalTimeC;
-   TSCHQueueC.GlobalSync->GlobalTimeC;
-   TSCHQueueC.ActiveMessageAddress->ActiveMessageAddressC;
 
+   KeepAliveC.CellUsageGet->CellUsageC;
    KeepAliveC.SimpleSend->TSCHQueueC.SendKA;
    KeepAliveC.NeighborGet->NeighborsC;
    KeepAliveC.GlobalSync->GlobalTimeC;
-   KeepAliveC.CellUsageGet->CellUsageC;
-
+   
    MultiplexC.ReceiveAll->GlobalTimeC;
+   //debug
    MultiplexC.PrintPacket->PrintPacketC;
 
    SlotEngineC.DeQueue->TSCHQueueC;
+   SlotEngineC.GlobalSync->GlobalTimeC;
    SlotEngineC.CellUsageGet->CellUsageC;
    SlotEngineC.GlobalTime->GlobalTimeC;
-   SlotEngineC.GlobalSync->GlobalTimeC;
    SlotEngineC.ActiveMessageAddress->ActiveMessageAddressC;
+   //debug
    SlotEngineC.CellStats->CellUsageC;
-   SlotEngineC.SerialOutput->SerialOutputC;
+   SlotEngineC.SerialIO->SerialIOC;
 
    GlobalTimeC.SubReceive->SlotEngineC;

apps/TSCH/globaltime/GlobalTimeP.nc

@@ -81 +81 @@
 
    //GlobalTime
-   command uint32_t GlobalTime.getGlobalSlotOffset() {
+   async command uint32_t GlobalTime.getGlobalSlotOffset() {
       //PeriodicTimer.getNow() is epoch of now
       //PeriodicTimer.gett0() is epoch of the start of the slot
@@ -87 +87 @@
       atomic return ((call PeriodicTimer.getNow())-(call PeriodicTimer.gett0()));
    }
-   command uint32_t GlobalTime.getLocalTime() {
+   async command uint32_t GlobalTime.getLocalTime() {
       atomic return (call PeriodicTimer.getNow());
    }

apps/TSCH/interfaces/GlobalTime.nc

@@ -1 +1 @@
 interface GlobalTime {
-  command uint32_t getGlobalSlotOffset();
-  command uint32_t getLocalTime();
+  async command uint32_t getGlobalSlotOffset();
+  async command uint32_t getLocalTime();
   async command uint32_t getASN();
   async event void newSlot(uint32_t ASN);

apps/TSCH/interfaces/NeighborGet.nc

@@ -2 +2 @@
 
 interface NeighborGet {
-   command bool isNeighbor(uint16_t id);
-   command uint8_t getHeight(uint16_t neighbor);
-   command uint8_t getLinkQuality(uint16_t neighbor);
-   command uint8_t getConfidence(uint16_t neighbor);
-   command uint32_t getNumSent(uint16_t neighbor);
-   command uint32_t getNumSentOK(uint16_t neighbor);
-   command uint32_t getLastHeard(uint16_t neighbor);
+   command bool             isNeighbor(uint16_t id);
+   command uint8_t          getHeight(uint16_t neighbor);
+   command uint8_t          getLinkQuality(uint16_t neighbor);
+   command uint8_t          getConfidence(uint16_t neighbor);
+   command uint32_t         getNumSent(uint16_t neighbor);
+   command uint32_t         getNumSentOK(uint16_t neighbor);
+   command uint32_t         getLastHeard(uint16_t neighbor);
    command heightNeighbor_t minHeight();
-   command uint8_t getNumNeighbors();
+   command uint8_t          getNumNeighbors();
 }

apps/TSCH/interfaces/ReservationUpdate.nc

@@ -5 +5 @@
    command error_t addSlot(uint16_t neighbor);
    command error_t removeSlot(uint16_t neighbor);
-   event void done(bool add, uint16_t neighbor, error_t error);
+   event void      done(bool add, uint16_t neighbor, error_t error);
 }