From: klueska Date: Thu, 24 Jul 2008 23:53:46 +0000 (+0000) Subject: fix to apps to get them to compile on all supported platforms X-Git-Tag: release_tinyos_2_1_0_0~25 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=b4356df561e4d3e2b06bfc630aa853548fc0d49b fix to apps to get them to compile on all supported platforms --- diff --git a/apps/tosthreads/apps/Blink/BlinkAppC.nc b/apps/tosthreads/apps/Blink/BlinkAppC.nc index 7748e878..d95f7192 100644 --- a/apps/tosthreads/apps/Blink/BlinkAppC.nc +++ b/apps/tosthreads/apps/Blink/BlinkAppC.nc @@ -37,10 +37,10 @@ configuration BlinkAppC { } implementation { components MainC, BlinkC, LedsC; - components new ThreadC(800) as NullThread; - components new ThreadC(800) as TinyThread0; - components new ThreadC(800) as TinyThread1; - components new ThreadC(800) as TinyThread2; + components new ThreadC(100) as NullThread; + components new ThreadC(100) as TinyThread0; + components new ThreadC(100) as TinyThread1; + components new ThreadC(100) as TinyThread2; MainC.Boot <- BlinkC; BlinkC.NullThread -> NullThread; diff --git a/apps/tosthreads/apps/TestBasicsbSensors/TestBasicsbSensorsC.nc b/apps/tosthreads/apps/TestBasicsbSensors/TestBasicsbSensorsC.nc index 0288ad20..f43e8868 100644 --- a/apps/tosthreads/apps/TestBasicsbSensors/TestBasicsbSensorsC.nc +++ b/apps/tosthreads/apps/TestBasicsbSensors/TestBasicsbSensorsC.nc @@ -69,4 +69,5 @@ implementation { call Leds.led0Toggle(); } } -} \ No newline at end of file +} + diff --git a/apps/tosthreads/apps/TestSineSensor/TestSineSensorC.nc b/apps/tosthreads/apps/TestSineSensor/TestSineSensorC.nc index 9290a67b..f3a27773 100644 --- a/apps/tosthreads/apps/TestSineSensor/TestSineSensorC.nc +++ b/apps/tosthreads/apps/TestSineSensor/TestSineSensorC.nc @@ -62,4 +62,5 @@ implementation { call Leds.led0Toggle(); } } -} \ No newline at end of file +} + diff --git a/apps/tosthreads/capps/TestLogStorage/Makefile b/apps/tosthreads/capps/TestLogStorage/Makefile index 957c9568..5a4a3997 100644 --- a/apps/tosthreads/capps/TestLogStorage/Makefile +++ b/apps/tosthreads/capps/TestLogStorage/Makefile @@ -1,2 +1,19 @@ TOSTHREAD_MAIN=TestLogStorage.c -include $(MAKERULES) +THIS_SUPPORTED_PLATFORMS=tmote telos telosb eyesIFXv1 eyesIFXv2 mica2 mica2dot telosa eyesIFX micaz iris tinynode + +ifneq ($(filter $(THIS_SUPPORTED_PLATFORMS) clean,$(MAKECMDGOALS)),) + ifneq ($(filter tmote telos telosb eyesIFXv1,$(MAKECMDGOALS)),) + CFLAGS+=-DUSE_STM25P + endif + ifneq ($(filter mica2 telosa mica2dot eyesIFX eyesIFXv2 micaz iris tinynode,$(MAKECMDGOALS)),) + CFLAGS+=-DUSE_AT45DB + endif + + include $(MAKERULES) +else +%: + @echo " Sorry, this application is only written to work with the following platforms:" + @echo " $(THIS_SUPPORTED_PLATFORMS)" +cthreads: + @: +endif diff --git a/apps/tosthreads/capps/TestSineSensor/TestSineSensor.c b/apps/tosthreads/capps/TestSineSensor/TestSineSensor.c index 2f676b22..bf2f7d61 100644 --- a/apps/tosthreads/capps/TestSineSensor/TestSineSensor.c +++ b/apps/tosthreads/capps/TestSineSensor/TestSineSensor.c @@ -49,4 +49,5 @@ void tosthread_main(void* arg) { while( amSerialSend(AM_BROADCAST_ADDR, &msg, sizeof(uint16_t), 228) != SUCCESS ); led0Toggle(); } -} \ No newline at end of file +} +