@@ -24,29+25,33 @@ need to be reconfigured if you switch from TinyOS 2.x to TinyOS
1.x. The 1.2 toolset is backwards compatible with the 1.x TinyOS tree,
so switching back and forth requires only a few variable changes. You
can find those directions <a href="#tinyos1">at the bottom of the page</a>.
1.x. The 1.2 toolset is backwards compatible with the 1.x TinyOS tree,
so switching back and forth requires only a few variable changes. You
can find those directions <a href="#tinyos1">at the bottom of the page</a>.
-</p><p>
+</p>
+<p>
There are 3 steps to upgrading from 1.x to 2.x:
There are 3 steps to upgrading from 1.x to 2.x:
-</p><ol>
- <li> <a href="#external-tools">Upgrade your external tools (compilers). </a>
- </li><li> <a href="#tinyos-tools">Upgrade your Tinyos-specific tools. </a>
- </li><li> <a href="#tinyos2">Install the Tinyos 2.x source tree. </a>
-</li></ol>
+</p>
+<ol>
+ <li> <a href="#external-tools">Upgrade your external tools (compilers). </a></li>
+ <li> <a href="#tinyos-tools">Upgrade your Tinyos-specific tools. </a></li>
+ <li> <a href="#tinyos2">Install the Tinyos 2.x source tree. </a></li>
+</ol>
+
-<a name="external-tools"><h1> Step 1: Upgrade your external tools. </h1></a>
+<h1><a name="external-tools">Step 1: Upgrade your external tools.</a></h1>
The 1.2 toolset uses the same Java JDK and ATT Graphviz versions, so
those do not need to be upgraded. What does need to be upgraded are
your compiler tools. Install the appropriate version of the following
The 1.2 toolset uses the same Java JDK and ATT Graphviz versions, so
those do not need to be upgraded. What does need to be upgraded are
your compiler tools. Install the appropriate version of the following
-(Windows or Linux) with the rpm command 'rpm -Uvh <rpm>'.
-</rpm><p>
+(Windows or Linux) with the rpm command 'rpm -Uvh <i>rpm</i>'.
+<p>
At this time, we have available compiler toolsets for Atmel AVR and
TI MSP430 platforms.
At this time, we have available compiler toolsets for Atmel AVR and
TI MSP430 platforms.
-</p><p>
+</p>
+<p>
All of the tools are in the <code>http://www.tinyos.net/dist-1.2.0/</code>
and the <code>http://www.tinyos.net/dist-2.0.0</code>
distribution trees, but are linked below for convenience.
All of the tools are in the <code>http://www.tinyos.net/dist-1.2.0/</code>
and the <code>http://www.tinyos.net/dist-2.0.0</code>
distribution trees, but are linked below for convenience.
+</p>
-<!----- AVR external tools -------->
-</p><p><b><em>Atmel AVR Tools</em></b>
+<b><em>Atmel AVR Tools</em></b>
<table border="0">
<tbody><tr>
<td bgcolor="#dddddd"><b>Tool</b></td>
<table border="0">
<tbody><tr>
<td bgcolor="#dddddd"><b>Tool</b></td>
@@ -87,8+92,8 @@ distribution trees, but are linked below for convenience.
</tbody></table>
<i><font color="red">†</font>If you receive an rpm error that indicates that you have a newer version already installed, try <code>rpm -Uvh --force</code></i>
</tbody></table>
<i><font color="red">†</font>If you receive an rpm error that indicates that you have a newer version already installed, try <code>rpm -Uvh --force</code></i>
-<!----- MSP external tools -------->
-</p><p><b><em>TI MSP430 Tools</em></b>
+<p></p>
+<b><em>TI MSP430 Tools</em></b>
<table border="0">
<tbody><tr>
<td bgcolor="#dddddd"><b>Tool</b></td>
<table border="0">
<tbody><tr>
<td bgcolor="#dddddd"><b>Tool</b></td>
@@ -135,16+140,15 @@ distribution trees, but are linked below for convenience.