Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / doc / html / tutorial / lesson11.html

diff --git a/doc/html/tutorial/lesson11.html b/doc/html/tutorial/lesson11.html
index 48ac8a93224c8023a69620211e5f35e09e57f45f..95b640e82ca6cf4b7033d8d76bce7f3a06daae64 100644 (file)
--- a/doc/html/tutorial/lesson11.html
+++ b/doc/html/tutorial/lesson11.html
@@ -760,13 +760,8 @@ while (time + 50000000000 > t.time()):
         topology. There are two approaches you can take. The first is
         to take data from a real world network and input this into
         TOSSIM. The second is to generate it from applying a
-        theoretical propagation model to a physical layout. TOSSIM has
-        an example of the first from the <A
-        HREF="https://mirage.berkeley.intel-research.net/">Mirage
-        testbed</A> at Intel Research Berkeley. The network topology
-        is from data gathered from one hundred micaZ nodes over an
-        eight hour period in February 2006. It can be found in <code><A
-        HREF="../../../tos/lib/tossim/topologies/mirage-1.txt">tos/lib/tossim/topologies/mirage-1.txt</A></code>, and has the following format:
+        theoretical propagation model to a physical layout.  The standard
+        file format is
 
           <pre>
 noise n avg std
@@ -807,7 +802,7 @@ java net.tinyos.sim.PropagationModel config.txt
 
         <p>The format of a configuration file is beyond the scope of
         this document: the tool has its own <A
-        HREF="">documentation</A>. TOSSIM has two sample configuration
+        HREF="usc-topologies.html">documentation</A>. TOSSIM has two sample configuration
         files generated from the tool in
         <code>tos/lib/tossim/topologies</code>. The first is <code><A
         HREF="">grid.txt</A></code>, which is a 10x10 grid of nodes
@@ -1232,7 +1227,7 @@ int main() {
 all:
         make micaz sim
         g++ -g -c -o Driver.o Driver.c -I../../tos/lib/tossim/
-        g++ -o Driver Driver.o build/micaz/tossim.o build/micaz/sim.o
+        g++ -o Driver Driver.o build/micaz/tossim.o build/micaz/sim.o build/micaz/c-support.o
       </pre>
         
 
@@ -1356,9 +1351,12 @@ This lesson introduced the basics of the TOSSIM simulator. It showed
 you how to configure a network, how to run a simulation, how to
 inspect variables, how to inject packets, and how to compile with C++.
 
-
-<p><b><a href="lesson5.html">&lt; Previous Lesson</a></b> &nbsp;|&nbsp; <b><a
- href="index.html">Top</a></b>
+<center>
+<p>&lt;&nbsp;<b><a href="lesson10.html">Previous Lesson</a></b> |&nbsp; <b><a
+ href="index.html">Top</a></b> &nbsp;|&nbsp; <b><a href="lesson12.html">Next
+Lesson </a>&nbsp;&gt;</b>
+</p>
+</center>
 
 </body>
 </html>