From: sallai Date: Mon, 19 Nov 2007 17:21:19 +0000 (+0000) Subject: updated with support for the iris mote, fixed a compile bug X-Git-Tag: release_tinyos_2_1_0_0~657 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=19d25dd903dad27691ceb63c5e29b132d1346c96 updated with support for the iris mote, fixed a compile bug --- diff --git a/apps/AntiTheft/Nodes/AntiTheftAppC.nc b/apps/AntiTheft/Nodes/AntiTheftAppC.nc index 44f9ba81..6f68aa99 100644 --- a/apps/AntiTheft/Nodes/AntiTheftAppC.nc +++ b/apps/AntiTheft/Nodes/AntiTheftAppC.nc @@ -29,8 +29,10 @@ implementation components CC1000CsmaRadioC as Radio; #elif defined(PLATFORM_MICAZ) components CC2420ActiveMessageC as Radio; +#elif defined(PLATFORM_IRIS) + components DummyLPLMacC as Radio; #else -#error "The AntiTheft application is only supported for mica2 and micaz nodes" +#error "The AntiTheft application is only supported for mica2, micaz and iris nodes" #endif AntiTheftC.Boot -> MainC.Boot; diff --git a/apps/AntiTheft/Nodes/Makefile b/apps/AntiTheft/Nodes/Makefile index ba61cec3..6d49bff8 100644 --- a/apps/AntiTheft/Nodes/Makefile +++ b/apps/AntiTheft/Nodes/Makefile @@ -1,5 +1,5 @@ SENSORBOARD=mts300 -PFLAGS += -I%T/lib/net/ctp -I%T/lib/net -I%T/lib/net/le -I%T/lib/net/drip +PFLAGS += -I%T/lib/net/ctp -I%T/lib/net -I%T/lib/net/4bitle -I%T/lib/net/drip COMPONENT=AntiTheftAppC include $(MAKERULES) diff --git a/apps/AntiTheft/README.txt b/apps/AntiTheft/README.txt index e2da9adf..0579942e 100644 --- a/apps/AntiTheft/README.txt +++ b/apps/AntiTheft/README.txt @@ -27,8 +27,8 @@ using the java GUI found in the java subdirectory. Nodes blink their yellow LED when turned on or when an internal error occurs, and blink their green LED when new settings are received. -This demo is written for mica2 or micaz motes using the mts300 sensor -board. +This demo is written for mica2, micaz or iris motes using the mts300 +sensor board. The code in the Nodes directory should be installed on the motes detecting theft. Each mote should have a separate id, and a mts31n0 or @@ -45,11 +45,11 @@ The java directory contains a control GUI for the antitheft demo app. Usage: The following instructions will get you started with the AntiTheft demo -(the instructions are for mica2 motes, replace mica2 with micaz if using -micaz motes) +(the instructions are for mica2 motes, replace mica2 with micaz or iris +if using either of those motes) 1. Compile the root and node code for the antitheft application for your - platform (mica2 or micaz): + platform (mica2, micaz or iris): $ (cd Nodes; make mica2) $ (cd Root; make mica2) diff --git a/apps/AntiTheft/Root/AntiTheftRootAppC.nc b/apps/AntiTheft/Root/AntiTheftRootAppC.nc index f3f3c4a8..2119dda9 100644 --- a/apps/AntiTheft/Root/AntiTheftRootAppC.nc +++ b/apps/AntiTheft/Root/AntiTheftRootAppC.nc @@ -28,8 +28,10 @@ implementation components CC1000CsmaRadioC as Radio; #elif defined(PLATFORM_MICAZ) components CC2420ActiveMessageC as Radio; +#elif defined(PLATFORM_IRIS) + components DummyLPLMacC as Radio; #else -#error "The AntiTheft application is only supported for mica2 and micaz nodes" +#error "The AntiTheft application is only supported for mica2, micaz and iris nodes" #endif AntiTheftRootC.Boot -> MainC; diff --git a/apps/AntiTheft/Root/Makefile b/apps/AntiTheft/Root/Makefile index 8f1c4b5d..247c8a0d 100644 --- a/apps/AntiTheft/Root/Makefile +++ b/apps/AntiTheft/Root/Makefile @@ -1,4 +1,4 @@ -PFLAGS += -I%T/lib/net/ctp -I%T/lib/net -I%T/lib/net/le -I%T/lib/net/drip +PFLAGS += -I%T/lib/net/ctp -I%T/lib/net -I%T/lib/net/4bitle -I%T/lib/net/drip COMPONENT=AntiTheftRootAppC include $(MAKERULES)