From: sallai Date: Wed, 18 Jun 2008 18:28:01 +0000 (+0000) Subject: added iris support X-Git-Tag: release_tinyos_2_1_0_0~241 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=3eee56895dcdb9ccb211fc9c78f1eb7ca208e946 added iris support --- diff --git a/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseAppC.nc b/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseAppC.nc index 4dfd9581..7b8aa066 100644 --- a/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseAppC.nc +++ b/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseAppC.nc @@ -74,5 +74,10 @@ implementation { components CC1000CsmaRadioC as LPLProvider; App.LPL -> LPLProvider; #endif + +#if defined(PLATFORM_IRIS) + components RF230ActiveMessageC as LPLProvider; + App.LPL -> LPLProvider; +#endif } diff --git a/apps/tutorials/LowPowerSensing/Base/Makefile b/apps/tutorials/LowPowerSensing/Base/Makefile index 5818a738..8aaf58d9 100644 --- a/apps/tutorials/LowPowerSensing/Base/Makefile +++ b/apps/tutorials/LowPowerSensing/Base/Makefile @@ -1,5 +1,6 @@ COMPONENT=LowPowerSensingBaseAppC CFLAGS += -I.. -I../universal_sensors +CFLAGS += -DLOW_POWER_LISTENING #CFLAGS += -I.. -I../tmote_onboard_sensors #CFLAGS += -DCC1K_DEFAULT_FREQ=CC1K_914_077_MHZ diff --git a/apps/tutorials/LowPowerSensing/LowPowerSensingConstants.h b/apps/tutorials/LowPowerSensing/LowPowerSensingConstants.h index a0687f47..d883c111 100644 --- a/apps/tutorials/LowPowerSensing/LowPowerSensingConstants.h +++ b/apps/tutorials/LowPowerSensing/LowPowerSensingConstants.h @@ -42,7 +42,6 @@ #endif #include "LowPowerSensingMsgs.h" -#define LOW_POWER_LISTENING enum { LPL_INTERVAL = 2000, SAMPLING_INTERVAL = 3000, diff --git a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerAppC.nc b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerAppC.nc index 4a486842..9a07855a 100644 --- a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerAppC.nc +++ b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerAppC.nc @@ -69,5 +69,11 @@ implementation { components CC1000CsmaRadioC as LPLProvider; App.LPL -> LPLProvider; #endif + +#if defined(PLATFORM_IRIS) + components RF230ActiveMessageC as LPLProvider; + App.LPL -> LPLProvider; +#endif + } diff --git a/apps/tutorials/LowPowerSensing/Sampler/Makefile b/apps/tutorials/LowPowerSensing/Sampler/Makefile index 0b1792d3..01c47c11 100644 --- a/apps/tutorials/LowPowerSensing/Sampler/Makefile +++ b/apps/tutorials/LowPowerSensing/Sampler/Makefile @@ -1,6 +1,7 @@ COMPONENT=LowPowerSensingPeriodicSamplerAppC CFLAGS += -I.. -I../sampleLog CFLAGS += -I.. -I../universal_sensors +CFLAGS += -DLOW_POWER_LISTENING #CFLAGS += -I.. -I../tmote_onboard_sensors #CFLAGS += -DCC1K_DEFAULT_FREQ=CC1K_914_077_MHZ