[Tinyos-2-commits] CVS: tinyos-2.x/apps/MViz MViz.h, 1.1.2.4, 1.1.2.5 MVizAppC.nc, 1.1.2.3, 1.1.2.4 MVizC.nc, 1.1.2.4, 1.1.2.5 README.txt, 1.1.2.1, 1.1.2.2

Phil Levis scipio at users.sourceforge.net
Mon Oct 30 17:26:36 PST 2006


Update of /cvsroot/tinyos/tinyos-2.x/apps/MViz
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26679

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	MViz.h MVizAppC.nc MVizC.nc README.txt 
Log Message:
Add readme. Remove debugging support.


Index: MViz.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MViz.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** MViz.h	30 Oct 2006 00:52:32 -0000	1.1.2.4
--- MViz.h	31 Oct 2006 01:26:34 -0000	1.1.2.5
***************
*** 22,26 ****
  enum {
    /* Default sampling period. */
!   DEFAULT_INTERVAL = 128,
    AM_MVIZ_MSG = 0x93
  };
--- 22,26 ----
  enum {
    /* Default sampling period. */
!   DEFAULT_INTERVAL = 1024,
    AM_MVIZ_MSG = 0x93
  };

Index: MVizAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MVizAppC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MVizAppC.nc	30 Oct 2006 00:52:32 -0000	1.1.2.3
--- MVizAppC.nc	31 Oct 2006 01:26:34 -0000	1.1.2.4
***************
*** 56,71 ****
    MVizC.LinkEstimator -> Ctp;
  
-   //
-   // Components for debugging collection.
-   //
-   components new PoolC(message_t, 10) as DebugMessagePool,
-     new QueueC(message_t*, 10) as DebugSendQueue,
-     new SerialAMSenderC(AM_CTP_DEBUG) as DebugSerialSender,
-     UARTDebugSenderP as DebugSender;
- 
-   DebugSender.Boot -> MainC;
-   DebugSender.UARTSend -> DebugSerialSender;
-   DebugSender.MessagePool -> DebugMessagePool;
-   DebugSender.SendQueue -> DebugSendQueue;
-   Collector.CollectionDebug -> DebugSender;
  }
--- 56,58 ----

Index: MVizC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MVizC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** MVizC.nc	30 Oct 2006 00:52:32 -0000	1.1.2.4
--- MVizC.nc	31 Oct 2006 01:26:34 -0000	1.1.2.5
***************
*** 192,196 ****
        local.count++;
      suppress_count_change = FALSE;
!     
      if (call Read.read() != SUCCESS)
        fatal_problem();
--- 192,197 ----
        local.count++;
      suppress_count_change = FALSE;
!     call Timer.stop();
!     call Timer.startPeriodic(local.interval);    
      if (call Read.read() != SUCCESS)
        fatal_problem();

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/README.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** README.txt	25 Oct 2006 01:54:44 -0000	1.1.2.1
--- README.txt	31 Oct 2006 01:26:34 -0000	1.1.2.2
***************
*** 1,46 ****
! README for MultihopOscilloscope
  Author/Contact: tinyos-help at millennium.berkeley.edu
  
  Description:
  
! MultihopOscilloscope is a simple data-collection demo. It periodically samples
! the default sensor and broadcasts a message every few readings. These readings
! can be displayed by the Java "Oscilloscope" application found in the
! TOSROOT/apps/Oscilloscope/java subdirectory. The sampling rate starts at 4Hz,
! but can be changed from the Java application.
  
! You can compile MultihopOscilloscope with a sensor board's default sensor by
! compiling as follows:
  
!   SENSORBOARD=<sensorboard name> make <mote>
  
! You can change the sensor used by editing MultihopOscilloscopeAppC.nc.
  
  Tools:
  
! The Java application displays readings it receives from motes running the
! MultihopOscilloscope demo via a serial forwarder. To run it, change to the
! TOSROOT/apps/Oscilloscope/java subdirectory and type:
! 
!   make
!   java net.tinyos.sf.SerialForwarder -comm serial@<serial port>:<mote>
!   # e.g., java net.tinyps.sf.SerialForwarder -comm serial@/dev/ttyUSB0:mica2
!   # or java net.tinyps.sf.SerialForwarder -comm serial at COM2:telosb
!   ./run
! 
! The controls at the bootom of the screen allow yoy to zoom in or out the X
! axis, change the range of the Y axis, and clear all received data. You can
! change the color used to display a mote by clicking on its color in the
! mote table.
  
  Known bugs/limitations:
  
! None.
  
! See also:
! TEP 113: Serial Communications, TEP 119: Collection.
  
  Notes:
  
! MultihopOscilloscope configures a mote whose TOS_NODE_ID modulo 500 is zero 
! to be a collection root.
--- 1,38 ----
! README for MViz
  Author/Contact: tinyos-help at millennium.berkeley.edu
  
  Description:
  
! MViz is a sample application for the MViz network visualization tool. The MViz
! application is a multihop collection network. Nodes whose (ID % 500) == 0 are
! collection roots. The application samples a platform's DemoSensorC and routes
! those values to the collection roots. The roots send the packets to the serial
! port, which the MViz java application then visualizes.
  
! To run this application, install the TinyOS application on several nodes, one
! of whom is a root. Then run the tos-mviz script with MVizMsg as a parameter:
  
! tos-mviz [-comm source] MVizMsg
  
! This will cause the MViz java tool to parse the fields of MVizMsg and make
! them displayable. As nodes send readings to the base station, they will be
! displayed in the GUI. Please refer to the MViz tutorial for further information.
  
  Tools:
  
! The Java application lives in support/sdk/java/net/tinyos/mviz. It is
! invoked by the tos-mviz script, which is part of a TinyOS tools  distribution.
! The top-level Java class is net.tinyos.mviz.DDocument. To display a mote image,
! the tool looks for a mote.gif in either the local directory (default) or a directory
! specified with the -dir parameter.
  
  Known bugs/limitations:
  
! Under Ubuntu Linux, the MViz Java visualization can be painfully slow.
  
! None.
  
  Notes:
  
! MViz configures a mote whose TOS_NODE_ID modulo 500 is zero to be a
! collection root. 



More information about the Tinyos-2-commits mailing list