[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/doc motlle.txt, 1.6, 1.7 tinyscheme.txt, 1.6, 1.7

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28768/doc

Modified Files:
	motlle.txt tinyscheme.txt 
Log Message:
update vmsf examples and docs


Index: motlle.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/doc/motlle.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** motlle.txt	22 Nov 2005 23:57:02 -0000	1.6
--- motlle.txt	23 Nov 2005 23:38:33 -0000	1.7
***************
*** 58,71 ****
  your starting point).
  
!   # Declare the VM. You will want to specify a separate name (NAME=)
!   # and directory (DIR=) for each VM.
!   <VM NAME="MotlleVM" DESC="A basic motlle VM with single-hop communication." 
!       DIR="../../../../../../apps/MotlleVM">
!   # 1024 is the amount of RAM available for motlle programs. You can
!   # increase while there is RAM available...
    <OPTION CAPSULE_SIZE=1024>
!   # The following lines should always be present (the paths are
!   # relative to the .vmsf file, so you may need to adjust them
!   # depending on where your file is)
    <SEARCH PATH="../../../opcodes">
    <SEARCH PATH="../../../contexts">
--- 58,71 ----
  your starting point).
  
!   // Declare the VM. You will want to specify a separate name (NAME)
!   // and directory (DIR) for each VM.
!   <VM NAME="MotlleVM" DESC="A basic motlle VM with single-hop communication." DIR="../../../../../../apps/MotlleVM">
!   // 1024 is the amount of RAM available for motlle programs. You can
!   // increase while there is RAM available... On telosb motes, you should
!   // probably set this to something larger.
    <OPTION CAPSULE_SIZE=1024>
!   // The following lines should always be present (the paths are
!   // relative to the .vmsf file, so you may need to adjust them
!   // depending on where your file is)
    <SEARCH PATH="../../../opcodes">
    <SEARCH PATH="../../../contexts">
***************
*** 77,96 ****
    <SEARCH PATH="../matelib/gen">
    <SEARCH PATH="../../../../Util">
-   # Use the motlle language
-   <LANGUAGE NAME="motlle">
-   # Load the basic motlle functions
-   <LOAD FILE="../mate/runtime/gen/intfns.vmsf">
  
!   # Here is where you add VM-specific contexts and functions, either
!   # from Mate's library (led, id, the mica sensorboard) or from motlle's
!   # (the commfns.vmsf file, which contains single-hop communication
!   # primitives)
    <FUNCTION NAME="led">
    <FUNCTION name="id">
    <CONTEXT NAME="Timer0">
    <LOAD FILE="../matelib/gen/commfns.vmsf">
!   # This VM does not have any sensor board access. You would add a line like
!   #    <LOAD FILE="../../../sensorboards/micasb.vmsf">
!   # to get access to sensors.
  
  Once you have a .vmsf file, you build a motlle VM by executing the
--- 77,98 ----
    <SEARCH PATH="../matelib/gen">
    <SEARCH PATH="../../../../Util">
  
!   <LANGUAGE NAME="motlle"> // Use the motlle language
!   <LOAD FILE="../mate/runtime/gen/intfns.vmsf"> // Load basic motlle functions
! 
!   // Here is where you add VM-specific contexts and functions, either
!   // from Mate's library (led, id, the mica sensorboard) or from motlle's
!   // (the commfns.vmsf file, which contains single-hop communication
!   // primitives)
    <FUNCTION NAME="led">
    <FUNCTION name="id">
+   <FUNCTION name="sleep">
    <CONTEXT NAME="Timer0">
    <LOAD FILE="../matelib/gen/commfns.vmsf">
!   // This VM does not have any sensor board access. You should add a line like
!   //   <LOAD FILE="../../../sensorboards/micasb.vmsf"> // micasb sensor board
!   // or
!   //   <LOAD FILE="../../../sensorboards/telosb.vmsf"> // built-in telosb sensors
!   // to get access to sensors from your favourite sensorboard.
  
  Once you have a .vmsf file, you build a motlle VM by executing the
***************
*** 149,152 ****
--- 151,157 ----
    - cnttoleds.mt: seen above
    - oscilloscope.mt: a motlle version of the TinyOS OscilloscopeRF 
+     application. You should build a VM with functions to access some
+     sensorboard, and edit oscilloscope.ts to replace the call to light()
+     by some appropriate sensor function if you want to try this
      application.
  

Index: tinyscheme.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/doc/tinyscheme.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tinyscheme.txt	22 Nov 2005 23:54:55 -0000	1.6
--- tinyscheme.txt	23 Nov 2005 23:38:33 -0000	1.7
***************
*** 56,69 ****
  scheme.vmsf as your starting point).
  
!   # Declare the VM. You will want to specify a separate name (NAME=)
!   # and directory (DIR=) for each VM.
!   <VM NAME="TinySchemeVM" DESC="A basic TinyScheme VM with single-hop communication." 
!       DIR="../../../../../../apps/TinySchemeVM">
!   # 1024 is the amount of RAM available for TinyScheme programs. You can
!   # increase while there is RAM available...
    <OPTION CAPSULE_SIZE=1024>
!   # The following lines should always be present (the paths are
!   # relative to the .vmsf file, so you may need to adjust them
!   # depending on where your file is)
    <SEARCH PATH="../../../opcodes">
    <SEARCH PATH="../../../contexts">
--- 56,69 ----
  scheme.vmsf as your starting point).
  
!   // Declare the VM. You will want to specify a separate name (NAME)
!   // and directory (DIR) for each VM.
!   <VM NAME="TinySchemeVM" DESC="A basic tinyscheme VM with single-hop communication." DIR="../../../../../../apps/TinySchemeVM">
!   // 1024 is the amount of RAM available for motlle programs. You can
!   // increase while there is RAM available... On telosb motes, you should
!   // probably set this to something larger.
    <OPTION CAPSULE_SIZE=1024>
!   // The following lines should always be present (the paths are
!   // relative to the .vmsf file, so you may need to adjust them
!   // depending on where your file is)
    <SEARCH PATH="../../../opcodes">
    <SEARCH PATH="../../../contexts">
***************
*** 75,87 ****
    <SEARCH PATH="../matelib/sgen">
    <SEARCH PATH="../../../../Util">
-   # Use the TinyScheme language
-   <LANGUAGE NAME="TinyScheme">
-   # Load the basic TinyScheme procedures
-   <LOAD FILE="../mate/runtime/sgen/intfns.vmsf">
  
!   # Here is where you add VM-specific contexts and procedures, either
!   # from Mate's library (led, id, the mica sensorboard) or from TinyScheme's
!   # (the commfns.vmsf file, which contains single-hop communication
!   # primitives)
    <FUNCTION NAME="led">
    <FUNCTION name="id">
--- 75,86 ----
    <SEARCH PATH="../matelib/sgen">
    <SEARCH PATH="../../../../Util">
  
!   <LANGUAGE NAME="tinyscheme"> // Use the scheme language
!   <LOAD FILE="../mate/runtime/sgen/intfns.vmsf"> // Load basic scheme functions
! 
!   // Here is where you add VM-specific contexts and functions, either
!   // from Mate's library (led, id, the mica sensorboard) or from motlle's
!   // (the commfns.vmsf file, which contains single-hop communication
!   // primitives)
    <FUNCTION NAME="led">
    <FUNCTION name="id">
***************
*** 89,95 ****
    <CONTEXT NAME="Timer0">
    <LOAD FILE="../matelib/sgen/commfns.vmsf">
!   # This VM does not have any sensor board access. You would add a line like
!   #    <LOAD FILE="../../../sensorboards/micasb.vmsf">
!   # to get access to sensors.
  
  Once you have a .vmsf file, you build a TinyScheme VM by executing the
--- 88,96 ----
    <CONTEXT NAME="Timer0">
    <LOAD FILE="../matelib/sgen/commfns.vmsf">
!   // This VM does not have any sensor board access. You should add a line like
!   //   <LOAD FILE="../../../sensorboards/micasb.vmsf"> // micasb sensor board
!   // or
!   //   <LOAD FILE="../../../sensorboards/telosb.vmsf"> // built-in telosb sensors
!   // to get access to sensors from your favourite sensorboard.
  
  Once you have a .vmsf file, you build a TinyScheme VM by executing the
***************
*** 151,154 ****
--- 152,158 ----
    - cnttoleds.ts: seen above
    - oscilloscope.ts: a TinyScheme version of the TinyOS OscilloscopeRF 
+     application. You should build a VM with functions to access some
+     sensorboard, and edit oscilloscope.ts to replace the call to (light)
+     by some appropriate sensor function if you want to try this
      application.
  
***************
*** 157,161 ****
  
  The major differences between TinyScheme and Scheme are:
! - named let, quasiquote and macros are not available
  - there is no call-with-current-continuation and no support for delayed
    evaluation
--- 161,165 ----
  
  The major differences between TinyScheme and Scheme are:
! - quasiquote and macros are not available
  - there is no call-with-current-continuation and no support for delayed
    evaluation