From: klueska Date: Wed, 18 Jun 2008 04:43:51 +0000 (+0000) Subject: Update to tosthreads nesC based BaseStation application based on changes to wiring... X-Git-Tag: release_tinyos_2_1_0_0~252 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=6be6550061e6c0a66273aee61d1d3bb993935124 Update to tosthreads nesC based BaseStation application based on changes to wiring in underlying components --- diff --git a/apps/tosthreads/apps/BaseStation/BaseStationAppC.nc b/apps/tosthreads/apps/BaseStation/BaseStationAppC.nc index b3e6a868..a83de933 100644 --- a/apps/tosthreads/apps/BaseStation/BaseStationAppC.nc +++ b/apps/tosthreads/apps/BaseStation/BaseStationAppC.nc @@ -124,4 +124,12 @@ implementation SerialReceiveRadioSendP.SendAMPacket -> BlockingRadioActiveMessageC; SerialReceiveRadioSendP.BlockingReceiveAny -> BlockingSerialActiveMessageC.BlockingReceiveAny; SerialReceiveRadioSendP.BlockingAMSend -> BlockingRadioActiveMessageC; + + components ActiveMessageC, SerialActiveMessageC; + BlockingRadioActiveMessageC.Receive -> ActiveMessageC.Receive; + BlockingRadioActiveMessageC.Snoop -> ActiveMessageC.Snoop; + BlockingRadioActiveMessageC.AMSend -> ActiveMessageC.AMSend; + + BlockingSerialActiveMessageC.Receive -> SerialActiveMessageC.Receive; + BlockingSerialActiveMessageC.AMSend -> SerialActiveMessageC.AMSend; } diff --git a/apps/tosthreads/apps/BaseStation/Makefile b/apps/tosthreads/apps/BaseStation/Makefile index b408b9b7..8e664309 100644 --- a/apps/tosthreads/apps/BaseStation/Makefile +++ b/apps/tosthreads/apps/BaseStation/Makefile @@ -1,4 +1,6 @@ COMPONENT=BaseStationAppC + + CFLAGS+=-DCC2420_DEF_CHANNEL=26