From a9ecb58717494a8e6d5c72f9372a41510880a460 Mon Sep 17 00:00:00 2001 From: rarseverino Date: Fri, 18 Sep 2009 16:55:49 +0000 Subject: [PATCH] *** empty log message *** --- .../AssociationExample/AssociationExample.nc | 61 ------------------- .../AssociationExample/AssociationExampleC.nc | 61 +++++++++++++++++++ ...tionExampleM.nc => AssociationExampleP.nc} | 2 +- .../zigbee/apps/AssociationExample/Makefile | 2 +- .../apps/DataSendExample/DataSendExample.nc | 60 ------------------ .../apps/DataSendExample/DataSendExampleC.nc | 60 ++++++++++++++++++ ...ataSendExampleM.nc => DataSendExampleP.nc} | 2 +- .../net/zigbee/apps/DataSendExample/Makefile | 2 +- .../GTSManagementExample.nc | 61 ------------------- .../GTSManagementExampleC.nc | 61 +++++++++++++++++++ ...ntExampleM.nc => GTSManagementExampleP.nc} | 2 +- .../zigbee/apps/GTSManagementExample/Makefile | 2 +- .../zigbee/apps/SimpleRoutingExample/Makefile | 2 +- .../SimpleRoutingExample.nc | 61 ------------------- .../SimpleRoutingExampleC.nc | 61 +++++++++++++++++++ ...ngExampleM.nc => SimpleRoutingExampleP.nc} | 2 +- tos/lib/net/zigbee/apps/Test_APL/Test_APLC.nc | 1 + tos/lib/net/zigbee/apps/Test_APL/Test_APLP.nc | 1 + 18 files changed, 253 insertions(+), 251 deletions(-) delete mode 100644 tos/lib/net/zigbee/apps/AssociationExample/AssociationExample.nc create mode 100644 tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleC.nc rename tos/lib/net/zigbee/apps/AssociationExample/{AssociationExampleM.nc => AssociationExampleP.nc} (99%) delete mode 100644 tos/lib/net/zigbee/apps/DataSendExample/DataSendExample.nc create mode 100644 tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleC.nc rename tos/lib/net/zigbee/apps/DataSendExample/{DataSendExampleM.nc => DataSendExampleP.nc} (99%) delete mode 100644 tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExample.nc create mode 100644 tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleC.nc rename tos/lib/net/zigbee/apps/GTSManagementExample/{GTSManagementExampleM.nc => GTSManagementExampleP.nc} (99%) delete mode 100644 tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExample.nc create mode 100644 tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleC.nc rename tos/lib/net/zigbee/apps/SimpleRoutingExample/{SimpleRoutingExampleM.nc => SimpleRoutingExampleP.nc} (99%) diff --git a/tos/lib/net/zigbee/apps/AssociationExample/AssociationExample.nc b/tos/lib/net/zigbee/apps/AssociationExample/AssociationExample.nc deleted file mode 100644 index 75aa75fc..00000000 --- a/tos/lib/net/zigbee/apps/AssociationExample/AssociationExample.nc +++ /dev/null @@ -1,61 +0,0 @@ -/* - * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise - * @author Andre Cunha - * - */ -#include - -#include "associationexample.h" -#include "phy_const.h" -#include "phy_enumerations.h" -#include "mac_const.h" -#include "mac_enumerations.h" -#include "mac_func.h" - - -configuration AssociationExample { -} -implementation { - - components MainC; - components LedsC; - components AssociationExampleM; - - AssociationExampleM.Boot -> MainC; - - components Mac; - - AssociationExampleM.Leds -> LedsC; - - components new TimerMilliC() as Timer0; - AssociationExampleM.Timer0 -> Timer0; - - components new TimerMilliC() as Timer_Send; - AssociationExampleM.Timer_Send ->Timer_Send; - - - //MAC interfaces - - AssociationExampleM.MLME_START -> Mac.MLME_START; - - AssociationExampleM.MLME_GET ->Mac.MLME_GET; - AssociationExampleM.MLME_SET ->Mac.MLME_SET; - - AssociationExampleM.MLME_BEACON_NOTIFY ->Mac.MLME_BEACON_NOTIFY; - AssociationExampleM.MLME_GTS -> Mac.MLME_GTS; - - AssociationExampleM.MLME_ASSOCIATE->Mac.MLME_ASSOCIATE; - AssociationExampleM.MLME_DISASSOCIATE->Mac.MLME_DISASSOCIATE; - - AssociationExampleM.MLME_ORPHAN->Mac.MLME_ORPHAN; - AssociationExampleM.MLME_SYNC->Mac.MLME_SYNC; - AssociationExampleM.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS; - AssociationExampleM.MLME_RESET->Mac.MLME_RESET; - - AssociationExampleM.MLME_SCAN->Mac.MLME_SCAN; - - - AssociationExampleM.MCPS_DATA->Mac.MCPS_DATA; - - -} diff --git a/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleC.nc b/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleC.nc new file mode 100644 index 00000000..bebb5067 --- /dev/null +++ b/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleC.nc @@ -0,0 +1,61 @@ +/* + * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise + * @author Andre Cunha + * + */ +#include + +#include "associationexample.h" +#include "phy_const.h" +#include "phy_enumerations.h" +#include "mac_const.h" +#include "mac_enumerations.h" +#include "mac_func.h" + + +configuration AssociationExampleC { +} +implementation { + + components MainC; + components LedsC; + components AssociationExampleP; + + AssociationExampleP.Boot -> MainC; + + components MacC; + + AssociationExampleP.Leds -> LedsC; + + components new TimerMilliC() as Timer0; + AssociationExampleP.Timer0 -> Timer0; + + components new TimerMilliC() as Timer_Send; + AssociationExampleP.Timer_Send ->Timer_Send; + + + //MAC interfaces + + AssociationExampleP.MLME_START -> MacC.MLME_START; + + AssociationExampleP.MLME_GET ->MacC.MLME_GET; + AssociationExampleP.MLME_SET ->MacC.MLME_SET; + + AssociationExampleP.MLME_BEACON_NOTIFY ->MacC.MLME_BEACON_NOTIFY; + AssociationExampleP.MLME_GTS -> MacC.MLME_GTS; + + AssociationExampleP.MLME_ASSOCIATE->MacC.MLME_ASSOCIATE; + AssociationExampleP.MLME_DISASSOCIATE->MacC.MLME_DISASSOCIATE; + + AssociationExampleP.MLME_ORPHAN->MacC.MLME_ORPHAN; + AssociationExampleP.MLME_SYNC->MacC.MLME_SYNC; + AssociationExampleP.MLME_SYNC_LOSS->MacC.MLME_SYNC_LOSS; + AssociationExampleP.MLME_RESET->MacC.MLME_RESET; + + AssociationExampleP.MLME_SCAN->MacC.MLME_SCAN; + + + AssociationExampleP.MCPS_DATA->MacC.MCPS_DATA; + + +} diff --git a/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleM.nc b/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleP.nc similarity index 99% rename from tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleM.nc rename to tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleP.nc index 99e4c799..6ba8d550 100644 --- a/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleM.nc +++ b/tos/lib/net/zigbee/apps/AssociationExample/AssociationExampleP.nc @@ -6,7 +6,7 @@ #include #include "printfUART.h" -module AssociationExampleM { +module AssociationExampleP { uses interface Boot; uses interface Leds; diff --git a/tos/lib/net/zigbee/apps/AssociationExample/Makefile b/tos/lib/net/zigbee/apps/AssociationExample/Makefile index 61dcca8f..3d1ca3b4 100644 --- a/tos/lib/net/zigbee/apps/AssociationExample/Makefile +++ b/tos/lib/net/zigbee/apps/AssociationExample/Makefile @@ -1,4 +1,4 @@ -COMPONENT=AssociationExample +COMPONENT=AssociationExampleC PFLAGS += -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \ -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/mac \ diff --git a/tos/lib/net/zigbee/apps/DataSendExample/DataSendExample.nc b/tos/lib/net/zigbee/apps/DataSendExample/DataSendExample.nc deleted file mode 100644 index 1463b31c..00000000 --- a/tos/lib/net/zigbee/apps/DataSendExample/DataSendExample.nc +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise - * @author Andre Cunha - */ -#include - -#include "datasendexample.h" -#include "phy_const.h" -#include "phy_enumerations.h" -#include "mac_const.h" -#include "mac_enumerations.h" -#include "mac_func.h" - -configuration DataSendExample { -} - -implementation -{ - components MainC; - components LedsC; - components DataSendExampleM; - - DataSendExampleM.Boot -> MainC; - - components Mac; - - DataSendExampleM.Leds -> LedsC; - - components new TimerMilliC() as Timer0; - DataSendExampleM.Timer0 -> Timer0; - - components new TimerMilliC() as Timer_Send; - DataSendExampleM.Timer_Send ->Timer_Send; - - - //MAC interfaces - - DataSendExampleM.MLME_START -> Mac.MLME_START; - - DataSendExampleM.MLME_GET ->Mac.MLME_GET; - DataSendExampleM.MLME_SET ->Mac.MLME_SET; - - DataSendExampleM.MLME_BEACON_NOTIFY ->Mac.MLME_BEACON_NOTIFY; - DataSendExampleM.MLME_GTS -> Mac.MLME_GTS; - - DataSendExampleM.MLME_ASSOCIATE->Mac.MLME_ASSOCIATE; - DataSendExampleM.MLME_DISASSOCIATE->Mac.MLME_DISASSOCIATE; - - DataSendExampleM.MLME_ORPHAN->Mac.MLME_ORPHAN; - DataSendExampleM.MLME_SYNC->Mac.MLME_SYNC; - DataSendExampleM.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS; - DataSendExampleM.MLME_RESET->Mac.MLME_RESET; - - DataSendExampleM.MLME_SCAN->Mac.MLME_SCAN; - - DataSendExampleM.MCPS_DATA->Mac.MCPS_DATA; - - -} - diff --git a/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleC.nc b/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleC.nc new file mode 100644 index 00000000..d4ee637f --- /dev/null +++ b/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleC.nc @@ -0,0 +1,60 @@ +/** + * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise + * @author Andre Cunha + */ +#include + +#include "datasendexample.h" +#include "phy_const.h" +#include "phy_enumerations.h" +#include "mac_const.h" +#include "mac_enumerations.h" +#include "mac_func.h" + +configuration DataSendExampleC { +} + +implementation +{ + components MainC; + components LedsC; + components DataSendExampleP; + + DataSendExampleP.Boot -> MainC; + + components MacC; + + DataSendExampleP.Leds -> LedsC; + + components new TimerMilliC() as Timer0; + DataSendExampleP.Timer0 -> Timer0; + + components new TimerMilliC() as Timer_Send; + DataSendExampleP.Timer_Send ->Timer_Send; + + + //MAC interfaces + + DataSendExampleP.MLME_START -> MacC.MLME_START; + + DataSendExampleP.MLME_GET ->MacC.MLME_GET; + DataSendExampleP.MLME_SET ->MacC.MLME_SET; + + DataSendExampleP.MLME_BEACON_NOTIFY ->MacC.MLME_BEACON_NOTIFY; + DataSendExampleP.MLME_GTS -> MacC.MLME_GTS; + + DataSendExampleP.MLME_ASSOCIATE->MacC.MLME_ASSOCIATE; + DataSendExampleP.MLME_DISASSOCIATE->MacC.MLME_DISASSOCIATE; + + DataSendExampleP.MLME_ORPHAN->MacC.MLME_ORPHAN; + DataSendExampleP.MLME_SYNC->MacC.MLME_SYNC; + DataSendExampleP.MLME_SYNC_LOSS->MacC.MLME_SYNC_LOSS; + DataSendExampleP.MLME_RESET->MacC.MLME_RESET; + + DataSendExampleP.MLME_SCAN->MacC.MLME_SCAN; + + DataSendExampleP.MCPS_DATA->MacC.MCPS_DATA; + + +} + diff --git a/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleM.nc b/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleP.nc similarity index 99% rename from tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleM.nc rename to tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleP.nc index fd8760b8..f9c38353 100644 --- a/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleM.nc +++ b/tos/lib/net/zigbee/apps/DataSendExample/DataSendExampleP.nc @@ -8,7 +8,7 @@ #include #include "printfUART.h" -module DataSendExampleM { +module DataSendExampleP { uses interface Boot; uses interface Leds; diff --git a/tos/lib/net/zigbee/apps/DataSendExample/Makefile b/tos/lib/net/zigbee/apps/DataSendExample/Makefile index f9e6b4b5..24d32aba 100644 --- a/tos/lib/net/zigbee/apps/DataSendExample/Makefile +++ b/tos/lib/net/zigbee/apps/DataSendExample/Makefile @@ -1,4 +1,4 @@ -COMPONENT=DataSendExample +COMPONENT=DataSendExampleC PFLAGS += -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \ -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/mac \ diff --git a/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExample.nc b/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExample.nc deleted file mode 100644 index fda840ee..00000000 --- a/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExample.nc +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise - * @author Andre Cunha - */ -#include - -#include "gtsmanagementexample.h" -#include "phy_const.h" -#include "phy_enumerations.h" -#include "mac_const.h" -#include "mac_enumerations.h" -#include "mac_func.h" - - -configuration GTSManagementExample { -} -implementation { - - components MainC; - components LedsC; - components GTSManagementExampleM; - - GTSManagementExampleM.Boot -> MainC; - - components Mac; - - GTSManagementExampleM.Leds -> LedsC; - - components new TimerMilliC() as Timer0; - GTSManagementExampleM.Timer0 -> Timer0; - - components new TimerMilliC() as Timer_Send; - GTSManagementExampleM.Timer_Send ->Timer_Send; - - - //MAC interfaces - - GTSManagementExampleM.MLME_START -> Mac.MLME_START; - - GTSManagementExampleM.MLME_GET ->Mac.MLME_GET; - GTSManagementExampleM.MLME_SET ->Mac.MLME_SET; - - GTSManagementExampleM.MLME_BEACON_NOTIFY ->Mac.MLME_BEACON_NOTIFY; - GTSManagementExampleM.MLME_GTS -> Mac.MLME_GTS; - - GTSManagementExampleM.MLME_ASSOCIATE->Mac.MLME_ASSOCIATE; - GTSManagementExampleM.MLME_DISASSOCIATE->Mac.MLME_DISASSOCIATE; - - GTSManagementExampleM.MLME_ORPHAN->Mac.MLME_ORPHAN; - GTSManagementExampleM.MLME_SYNC->Mac.MLME_SYNC; - GTSManagementExampleM.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS; - GTSManagementExampleM.MLME_RESET->Mac.MLME_RESET; - - GTSManagementExampleM.MLME_SCAN->Mac.MLME_SCAN; - - - GTSManagementExampleM.MCPS_DATA->Mac.MCPS_DATA; - - -} - diff --git a/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleC.nc b/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleC.nc new file mode 100644 index 00000000..dd5a929f --- /dev/null +++ b/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleC.nc @@ -0,0 +1,61 @@ +/** + * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise + * @author Andre Cunha + */ +#include + +#include "gtsmanagementexample.h" +#include "phy_const.h" +#include "phy_enumerations.h" +#include "mac_const.h" +#include "mac_enumerations.h" +#include "mac_func.h" + + +configuration GTSManagementExampleC { +} +implementation { + + components MainC; + components LedsC; + components GTSManagementExampleP; + + GTSManagementExampleP.Boot -> MainC; + + components MacC; + + GTSManagementExampleP.Leds -> LedsC; + + components new TimerMilliC() as Timer0; + GTSManagementExampleP.Timer0 -> Timer0; + + components new TimerMilliC() as Timer_Send; + GTSManagementExampleP.Timer_Send ->Timer_Send; + + + //MAC interfaces + + GTSManagementExampleP.MLME_START -> MacC.MLME_START; + + GTSManagementExampleP.MLME_GET ->MacC.MLME_GET; + GTSManagementExampleP.MLME_SET ->MacC.MLME_SET; + + GTSManagementExampleP.MLME_BEACON_NOTIFY ->MacC.MLME_BEACON_NOTIFY; + GTSManagementExampleP.MLME_GTS -> MacC.MLME_GTS; + + GTSManagementExampleP.MLME_ASSOCIATE->MacC.MLME_ASSOCIATE; + GTSManagementExampleP.MLME_DISASSOCIATE->MacC.MLME_DISASSOCIATE; + + GTSManagementExampleP.MLME_ORPHAN->MacC.MLME_ORPHAN; + GTSManagementExampleP.MLME_SYNC->MacC.MLME_SYNC; + GTSManagementExampleP.MLME_SYNC_LOSS->MacC.MLME_SYNC_LOSS; + GTSManagementExampleP.MLME_RESET->MacC.MLME_RESET; + + GTSManagementExampleP.MLME_SCAN->MacC.MLME_SCAN; + + + GTSManagementExampleP.MCPS_DATA->MacC.MCPS_DATA; + + +} + diff --git a/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleM.nc b/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleP.nc similarity index 99% rename from tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleM.nc rename to tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleP.nc index 5ba55566..ff859d01 100644 --- a/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleM.nc +++ b/tos/lib/net/zigbee/apps/GTSManagementExample/GTSManagementExampleP.nc @@ -12,7 +12,7 @@ #include #include "printfUART.h" -module GTSManagementExampleM { +module GTSManagementExampleP { uses interface Boot; uses interface Leds; diff --git a/tos/lib/net/zigbee/apps/GTSManagementExample/Makefile b/tos/lib/net/zigbee/apps/GTSManagementExample/Makefile index 13e57082..9eab3ac6 100644 --- a/tos/lib/net/zigbee/apps/GTSManagementExample/Makefile +++ b/tos/lib/net/zigbee/apps/GTSManagementExample/Makefile @@ -1,4 +1,4 @@ -COMPONENT=GTSManagementExample +COMPONENT=GTSManagementExampleC PFLAGS += -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \ -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/mac \ diff --git a/tos/lib/net/zigbee/apps/SimpleRoutingExample/Makefile b/tos/lib/net/zigbee/apps/SimpleRoutingExample/Makefile index 4c3b2fcf..f44b8b3c 100644 --- a/tos/lib/net/zigbee/apps/SimpleRoutingExample/Makefile +++ b/tos/lib/net/zigbee/apps/SimpleRoutingExample/Makefile @@ -1,4 +1,4 @@ -COMPONENT=SimpleRoutingExample +COMPONENT=SimpleRoutingExampleC PFLAGS += -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/includes \ -I$(TOSROOT)/tos/lib/net/zigbee/ieee802154/mac \ diff --git a/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExample.nc b/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExample.nc deleted file mode 100644 index 115572bf..00000000 --- a/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExample.nc +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise - * @author Andre Cunha - */ -#include - -#include "simpleroutingexample.h" -#include "phy_const.h" -#include "phy_enumerations.h" -#include "mac_const.h" -#include "mac_enumerations.h" -#include "mac_func.h" - - configuration SimpleRoutingExample { -} - -implementation -{ - components MainC; - components LedsC; - components SimpleRoutingExampleM; - - SimpleRoutingExampleM.Boot -> MainC; - - components Mac; - - SimpleRoutingExampleM.Leds -> LedsC; - - components new TimerMilliC() as Timer0; - SimpleRoutingExampleM.Timer0 -> Timer0; - - components new TimerMilliC() as Timer_Send; - SimpleRoutingExampleM.Timer_Send ->Timer_Send; - - - //MAC interfaces - - SimpleRoutingExampleM.MLME_START -> Mac.MLME_START; - - SimpleRoutingExampleM.MLME_GET ->Mac.MLME_GET; - SimpleRoutingExampleM.MLME_SET ->Mac.MLME_SET; - - SimpleRoutingExampleM.MLME_BEACON_NOTIFY ->Mac.MLME_BEACON_NOTIFY; - SimpleRoutingExampleM.MLME_GTS -> Mac.MLME_GTS; - - SimpleRoutingExampleM.MLME_ASSOCIATE->Mac.MLME_ASSOCIATE; - SimpleRoutingExampleM.MLME_DISASSOCIATE->Mac.MLME_DISASSOCIATE; - - SimpleRoutingExampleM.MLME_ORPHAN->Mac.MLME_ORPHAN; - SimpleRoutingExampleM.MLME_SYNC->Mac.MLME_SYNC; - SimpleRoutingExampleM.MLME_SYNC_LOSS->Mac.MLME_SYNC_LOSS; - SimpleRoutingExampleM.MLME_RESET->Mac.MLME_RESET; - - SimpleRoutingExampleM.MLME_SCAN->Mac.MLME_SCAN; - - - SimpleRoutingExampleM.MCPS_DATA->Mac.MCPS_DATA; - - -} - diff --git a/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleC.nc b/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleC.nc new file mode 100644 index 00000000..f43915c0 --- /dev/null +++ b/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleC.nc @@ -0,0 +1,61 @@ +/** + * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise + * @author Andre Cunha + */ +#include + +#include "simpleroutingexample.h" +#include "phy_const.h" +#include "phy_enumerations.h" +#include "mac_const.h" +#include "mac_enumerations.h" +#include "mac_func.h" + + configuration SimpleRoutingExampleC { +} + +implementation +{ + components MainC; + components LedsC; + components SimpleRoutingExampleP; + + SimpleRoutingExampleP.Boot -> MainC; + + components MacC; + + SimpleRoutingExampleP.Leds -> LedsC; + + components new TimerMilliC() as Timer0; + SimpleRoutingExampleP.Timer0 -> Timer0; + + components new TimerMilliC() as Timer_Send; + SimpleRoutingExampleP.Timer_Send ->Timer_Send; + + + //MAC interfaces + + SimpleRoutingExampleP.MLME_START -> MacC.MLME_START; + + SimpleRoutingExampleP.MLME_GET ->MacC.MLME_GET; + SimpleRoutingExampleP.MLME_SET ->MacC.MLME_SET; + + SimpleRoutingExampleP.MLME_BEACON_NOTIFY ->MacC.MLME_BEACON_NOTIFY; + SimpleRoutingExampleP.MLME_GTS -> MacC.MLME_GTS; + + SimpleRoutingExampleP.MLME_ASSOCIATE->MacC.MLME_ASSOCIATE; + SimpleRoutingExampleP.MLME_DISASSOCIATE->MacC.MLME_DISASSOCIATE; + + SimpleRoutingExampleP.MLME_ORPHAN->MacC.MLME_ORPHAN; + SimpleRoutingExampleP.MLME_SYNC->MacC.MLME_SYNC; + SimpleRoutingExampleP.MLME_SYNC_LOSS->MacC.MLME_SYNC_LOSS; + SimpleRoutingExampleP.MLME_RESET->MacC.MLME_RESET; + + SimpleRoutingExampleP.MLME_SCAN->MacC.MLME_SCAN; + + + SimpleRoutingExampleP.MCPS_DATA->MacC.MCPS_DATA; + + +} + diff --git a/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleM.nc b/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleP.nc similarity index 99% rename from tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleM.nc rename to tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleP.nc index 8f25b938..33149070 100644 --- a/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleM.nc +++ b/tos/lib/net/zigbee/apps/SimpleRoutingExample/SimpleRoutingExampleP.nc @@ -8,7 +8,7 @@ #include #include "printfUART.h" -module SimpleRoutingExampleM { +module SimpleRoutingExampleP { uses interface Boot; uses interface Leds; diff --git a/tos/lib/net/zigbee/apps/Test_APL/Test_APLC.nc b/tos/lib/net/zigbee/apps/Test_APL/Test_APLC.nc index cf230138..efd41b86 100644 --- a/tos/lib/net/zigbee/apps/Test_APL/Test_APLC.nc +++ b/tos/lib/net/zigbee/apps/Test_APL/Test_APLC.nc @@ -1,6 +1,7 @@ /* * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise * @author Andre Cunha + * @author Ricardo Severino * */ #include diff --git a/tos/lib/net/zigbee/apps/Test_APL/Test_APLP.nc b/tos/lib/net/zigbee/apps/Test_APL/Test_APLP.nc index 801f7a35..2755af5a 100644 --- a/tos/lib/net/zigbee/apps/Test_APL/Test_APLP.nc +++ b/tos/lib/net/zigbee/apps/Test_APL/Test_APLP.nc @@ -3,6 +3,7 @@ /* * @author IPP HURRAY http://www.hurray.isep.ipp.pt/art-wise * @author Andre Cunha + * @author Ricardo Severino * */ #include -- 2.39.2