From 83c555c63d035fd7e3cd1c448de564bf7fa60864 Mon Sep 17 00:00:00 2001 From: idgay Date: Wed, 2 Jul 2008 17:42:42 +0000 Subject: [PATCH] renames --- apps/tests/TestFTSP/Makefile | 17 ---------------- .../FtspDataLogger.java} | 20 +++++++++---------- apps/tests/TestFtsp/Makefile | 17 ++++++++++++++++ apps/tests/{TestFTSP => TestFtsp}/README.txt | 12 +++++------ .../TestFTSP.h => TestFtsp/TestFtsp.h} | 0 .../TestFtspAppC.nc} | 4 ++-- .../TestFTSPC.nc => TestFtsp/TestFtspC.nc} | 6 +++--- apps/tests/{TestLPL => TestLpl}/Makefile | 0 apps/tests/{TestLPL => TestLpl}/README.txt | 0 .../tests/{TestLPL => TestLpl}/TestLplAppC.nc | 0 apps/tests/{TestLPL => TestLpl}/TestLplC.nc | 0 11 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 apps/tests/TestFTSP/Makefile rename apps/tests/{TestFTSP/FTSPDataLogger.java => TestFtsp/FtspDataLogger.java} (88%) create mode 100644 apps/tests/TestFtsp/Makefile rename apps/tests/{TestFTSP => TestFtsp}/README.txt (92%) rename apps/tests/{TestFTSP/TestFTSP.h => TestFtsp/TestFtsp.h} (100%) rename apps/tests/{TestFTSP/TestFTSPAppC.nc => TestFtsp/TestFtspAppC.nc} (98%) rename apps/tests/{TestFTSP/TestFTSPC.nc => TestFtsp/TestFtspC.nc} (95%) rename apps/tests/{TestLPL => TestLpl}/Makefile (100%) rename apps/tests/{TestLPL => TestLpl}/README.txt (100%) rename apps/tests/{TestLPL => TestLpl}/TestLplAppC.nc (100%) rename apps/tests/{TestLPL => TestLpl}/TestLplC.nc (100%) diff --git a/apps/tests/TestFTSP/Makefile b/apps/tests/TestFTSP/Makefile deleted file mode 100644 index 78a66671..00000000 --- a/apps/tests/TestFTSP/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -BUILD_EXTRA_DEPS = FTSPDataLogger.class -CLEAN_EXTRA = *.class TestFTSPMsg.java - -FTSPDataLogger.class: TestFTSPMsg.java - javac *.java - -TestFTSPMsg.java: TestFTSP.h - mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=TestFTSPMsg TestFTSP.h test_ftsp_msg -o $@ - -COMPONENT=TestFTSPC - -PFLAGS += -DTIMESYNC_RATE=3 -#PFLAGS += -DTIMESYNC_DEBUG - -PFLAGS += -I$(TOSDIR)/lib/ftsp -I$(TOSDIR)/../apps/RadioCountToLeds - -include $(MAKERULES) diff --git a/apps/tests/TestFTSP/FTSPDataLogger.java b/apps/tests/TestFtsp/FtspDataLogger.java similarity index 88% rename from apps/tests/TestFTSP/FTSPDataLogger.java rename to apps/tests/TestFtsp/FtspDataLogger.java index 3b96c8fc..168fa0fb 100644 --- a/apps/tests/TestFTSP/FTSPDataLogger.java +++ b/apps/tests/TestFtsp/FtspDataLogger.java @@ -37,7 +37,7 @@ import java.io.PrintStream; import net.tinyos.message.*; import net.tinyos.util.*; -public class FTSPDataLogger implements MessageListener { +public class FtspDataLogger implements MessageListener { public class RunWhenShuttingDown extends Thread { public void run() { @@ -53,7 +53,7 @@ public class FTSPDataLogger implements MessageListener { { try { mote = new MoteIF(PrintStreamMessenger.err); - mote.registerListener(new TestFTSPMsg(), this); + mote.registerListener(new TestFtspMsg(), this); System.out.println("Connection ok!"); } catch(Exception e) { @@ -63,7 +63,7 @@ public class FTSPDataLogger implements MessageListener { } PrintStream outReport = null; - public FTSPDataLogger() { + public FtspDataLogger() { connect(); Runtime.getRuntime().addShutdownHook(new RunWhenShuttingDown()); String name=""+System.currentTimeMillis(); @@ -74,11 +74,11 @@ public class FTSPDataLogger implements MessageListener { } catch (Exception e) { - System.out.println("FTSPDataLogger.FTSPDataLogger(): "+e.toString()); + System.out.println("FtspDataLogger.FtspDataLogger(): "+e.toString()); } } - public void writeReprot(TestFTSPMsg tspr) + public void writeReprot(TestFtspMsg tspr) { String foo = (System.currentTimeMillis() +" "+tspr.get_src_addr()+" "+tspr.get_counter() @@ -88,7 +88,7 @@ public class FTSPDataLogger implements MessageListener { outReport.flush(); } - public void writeFullReprot(TestFTSPMsg tspr) + public void writeFullReprot(TestFtspMsg tspr) { String foo = (System.currentTimeMillis() +" "+tspr.get_src_addr() @@ -107,14 +107,14 @@ public class FTSPDataLogger implements MessageListener { public void messageReceived(int dest_addr, Message msg) { - if (msg instanceof TestFTSPMsg) - //writeFullReprot((TestFTSPMsg)msg); - writeReprot((TestFTSPMsg)msg); + if (msg instanceof TestFtspMsg) + //writeFullReprot((TestFtspMsg)msg); + writeReprot((TestFtspMsg)msg); } /* Just start the app... */ public static void main(String[] args) { - new FTSPDataLogger(); + new FtspDataLogger(); } } \ No newline at end of file diff --git a/apps/tests/TestFtsp/Makefile b/apps/tests/TestFtsp/Makefile new file mode 100644 index 00000000..eb8f79a6 --- /dev/null +++ b/apps/tests/TestFtsp/Makefile @@ -0,0 +1,17 @@ +BUILD_EXTRA_DEPS = FtspDataLogger.class +CLEAN_EXTRA = *.class TestFtspMsg.java + +FtspDataLogger.class: TestFtspMsg.java + javac *.java + +TestFtspMsg.java: TestFtsp.h + mig java -target=$(PLATFORM) $(CFLAGS) -java-classname=TestFtspMsg TestFtsp.h test_ftsp_msg -o $@ + +COMPONENT=TestFtspC + +PFLAGS += -DTIMESYNC_RATE=3 +#PFLAGS += -DTIMESYNC_DEBUG + +PFLAGS += -I$(TOSDIR)/lib/ftsp -I$(TOSDIR)/../apps/RadioCountToLeds + +include $(MAKERULES) diff --git a/apps/tests/TestFTSP/README.txt b/apps/tests/TestFtsp/README.txt similarity index 92% rename from apps/tests/TestFTSP/README.txt rename to apps/tests/TestFtsp/README.txt index 7009039d..23ca3644 100644 --- a/apps/tests/TestFTSP/README.txt +++ b/apps/tests/TestFtsp/README.txt @@ -1,4 +1,4 @@ -TestFTSP +TestFtsp ------------------------------------------------------------------------------- Author/Contact: @@ -10,12 +10,12 @@ Author/Contact: ------------------------------------------------------------------------------- DESCRIPTION: ------------ - The TestFTSP application tests the Flooding Time Synchronization Protocol - (FTSP) implementation. A network of motes programmed with TestFTSP run the + The TestFtsp application tests the Flooding Time Synchronization Protocol + (FTSP) implementation. A network of motes programmed with TestFtsp run the FTSP protocol to time synchronize, and sends to the base station the global reception timestamps of messages broadcast by a dedicated beacon mote programmed with RadioCountToLeds. Ideally, the global reception timestamps of - the same RadioCountToLeds message should agree for all TestFTSP motes (with a + the same RadioCountToLeds message should agree for all TestFtsp motes (with a small synchronization error). ------------------------------------------------------------------------------- @@ -27,10 +27,10 @@ SUPPORTED PLATFORMS: STEP BY STEP GUIDE TO RUN OUR TEST SCENARIO: -------------------------------------------- - program one mote with apps/RadioCountToLeds - - program multiple motes with TestFTSP + - program multiple motes with TestFtsp - program a mote with apps/BaseStation, leave it on the programming board - turn on all the motes - - start the FTSPDataLogger java application (type "java FTSPDataLogger") + - start the FtspDataLogger java application (type "java FtspDataLogger") ------------------------------------------------------------------------------- REPORTED DATA: diff --git a/apps/tests/TestFTSP/TestFTSP.h b/apps/tests/TestFtsp/TestFtsp.h similarity index 100% rename from apps/tests/TestFTSP/TestFTSP.h rename to apps/tests/TestFtsp/TestFtsp.h diff --git a/apps/tests/TestFTSP/TestFTSPAppC.nc b/apps/tests/TestFtsp/TestFtspAppC.nc similarity index 98% rename from apps/tests/TestFTSP/TestFTSPAppC.nc rename to apps/tests/TestFtsp/TestFtspAppC.nc index f3634e20..11d8ea8d 100644 --- a/apps/tests/TestFTSP/TestFTSPAppC.nc +++ b/apps/tests/TestFtsp/TestFtspAppC.nc @@ -22,10 +22,10 @@ * Ported to T2: 3/17/08 by Brano Kusy (branislav.kusy@gmail.com) */ -#include "TestFTSP.h" +#include "TestFtsp.h" #include "RadioCountToLeds.h" -module TestFTSPAppC +module TestFtspAppC { uses { diff --git a/apps/tests/TestFTSP/TestFTSPC.nc b/apps/tests/TestFtsp/TestFtspC.nc similarity index 95% rename from apps/tests/TestFTSP/TestFTSPC.nc rename to apps/tests/TestFtsp/TestFtspC.nc index f32d3ae1..e0a0ea2c 100644 --- a/apps/tests/TestFTSP/TestFTSPC.nc +++ b/apps/tests/TestFtsp/TestFtspC.nc @@ -22,10 +22,10 @@ * Ported to T2: 3/17/08 by Brano Kusy (branislav.kusy@gmail.com) */ -#include "TestFTSP.h" +#include "TestFtsp.h" #include "RadioCountToLeds.h" -configuration TestFTSPC { +configuration TestFtspC { } implementation { @@ -34,7 +34,7 @@ implementation { MainC.SoftwareInit -> TimeSyncC; TimeSyncC.Boot -> MainC; - components TestFTSPAppC as App; + components TestFtspAppC as App; App.Boot -> MainC; components ActiveMessageC; diff --git a/apps/tests/TestLPL/Makefile b/apps/tests/TestLpl/Makefile similarity index 100% rename from apps/tests/TestLPL/Makefile rename to apps/tests/TestLpl/Makefile diff --git a/apps/tests/TestLPL/README.txt b/apps/tests/TestLpl/README.txt similarity index 100% rename from apps/tests/TestLPL/README.txt rename to apps/tests/TestLpl/README.txt diff --git a/apps/tests/TestLPL/TestLplAppC.nc b/apps/tests/TestLpl/TestLplAppC.nc similarity index 100% rename from apps/tests/TestLPL/TestLplAppC.nc rename to apps/tests/TestLpl/TestLplAppC.nc diff --git a/apps/tests/TestLPL/TestLplC.nc b/apps/tests/TestLpl/TestLplC.nc similarity index 100% rename from apps/tests/TestLPL/TestLplC.nc rename to apps/tests/TestLpl/TestLplC.nc -- 2.39.2