Added some explanation about the serial debugging.

diff --git a/apps/tests/tkn154/TestStartSync/coordinator/Makefile b/apps/tests/tkn154/TestStartSync/coordinator/Makefile
index 13db21cdef816d203e7b7bb03ab28f8127d025f2..af48d993e9ed406516be018a5cdd77b35b554be1 100644 (file)
--- a/apps/tests/tkn154/TestStartSync/coordinator/Makefile
+++ b/apps/tests/tkn154/TestStartSync/coordinator/Makefile
@@ -1,3 +1,4 @@
 COMPONENT=TestStartSyncAppC
 CFLAGS += -I$(shell pwd)/..
+CFLAGS += -DIEEE154_SCAN_DISABLED -DIEEE154_BEACON_SYNC_DISABLED
 include ../../Makefile.include

diff --git a/tos/lib/mac/tkn154/TKN154_MAC.h b/tos/lib/mac/tkn154/TKN154_MAC.h
index 82a3f5c16cd4bddb255e596e1ce15cef99ed3616..20d4e982c4f4c8295ad62c20757697fada13245d 100644 (file)
--- a/tos/lib/mac/tkn154/TKN154_MAC.h
+++ b/tos/lib/mac/tkn154/TKN154_MAC.h
@@ -297,13 +297,17 @@ token_requested_t rcombine(token_requested_t r1, token_requested_t r2)
    *   two strings, the first one describing the component/file,
    *   the second is a format string (like in printf())
    * - following the second string, there may be zero up to 
-   *   two parameters -- these must be (cast to) uint32_t! 
+   *   two parameters -- these must be (cast to) uint32_t and
+   *   the format specifier must be "%lu", e.g.
+   *   dbg_serial("MyComponentP", "Value: %lu\n", (uint32_t) val);
    * - both strings must be constants (pointers always valid)
    * - no data is sent over serial, unless dbg_serial_flush() is
    *   called; try to call it when the system is idle or at least
-   *   when no time-critical operations are pending
+   *   when no time-critical operations are pending; on TelosB
+   *   you can also press the user button to trigger a flush
    * - on the PC use the printf java client to display the debug
-   *   output (see tinyos-2.x/apps/tests/TestPrintf/README.txt)
+   *   output (see tinyos-2.x/apps/tests/TestPrintf/README.txt);
+   *   the output format is component:line-in-source-code:text
    *
    * The ASSERT(X) macro is used to test for errors. If X evaluates 
    * to zero, then 3 leds start blinking simulataneously (about 2Hz)
@@ -312,10 +316,10 @@ token_requested_t rcombine(token_requested_t r1, token_requested_t r2)
    * TelosB was not attached to your PC while the ASSERT failed you
    * can typically still pull the information out later.
    *
-   * If TKN154_DEBUG is not defined (which is the default), then
+   * When TKN154_DEBUG is not defined (which is the default), then
    * dbg_serial() maps to dbg(), i.e. is completely removed unless 
    * the platform is TOSSIM, and in the ASSERT(X) statement X is 
-   * evaluated/executed, but the result is ignored. 
+   * evaluated/executed, but the result is ignored.
    **/
 
   /* -> functions are defined in DebugP.nc */