From: beutel Date: Wed, 15 Aug 2007 18:31:54 +0000 (+0000) Subject: corrected html X-Git-Tag: release_tinyos_2_1_0_0~809 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=12ad6174f1db897242cff138c3f139d9e4406156 corrected html --- diff --git a/doc/html/upgrade-tinyos.html b/doc/html/upgrade-tinyos.html index 116c85a8..7cdc5260 100644 --- a/doc/html/upgrade-tinyos.html +++ b/doc/html/upgrade-tinyos.html @@ -1,9 +1,10 @@ - - + + + Installing TinyOS 2.0.2 - + @@ -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 at the bottom of the page. -

There are 3 steps to upgrading from 1.x to 2.x: -

Upgrade your external tools (compilers). -
Upgrade your Tinyos-specific tools. -
Install the Tinyos 2.x source tree. -

Upgrade your external tools (compilers).
Upgrade your Tinyos-specific tools.
Install the Tinyos 2.x source tree.

+ -

Step 1: Upgrade your external tools.

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 '. -

+(Windows or Linux) with the rpm command 'rpm -Uvh rpm'. +

At this time, we have available compiler toolsets for Atmel AVR and TI MSP430 platforms. -

All of the tools are in the http://www.tinyos.net/dist-1.2.0/ and the http://www.tinyos.net/dist-2.0.0 distribution trees, but are linked below for convenience. +

- -

Atmel AVR Tools +Atmel AVR Tools @@ -87,8 +92,8 @@ distribution trees, but are linked below for convenience.

Tool
†If you receive an rpm error that indicates that you have a newer version already installed, try rpm -Uvh --force - -

TI MSP430 Tools +

+TI MSP430 Tools @@ -135,16 +140,15 @@ distribution trees, but are linked below for convenience. -

Tool
gdb	Not yet available	msp430tools-gdb-6.0-20050609.i386.rpm

Step 2: Upgrade your TinyOS-specific tools.

The TinyOS-specific tools are the NesC compiler and a set of tools developed in the tinyos-2.x/tools source code repository. They are also installed using rpms. Due to file conflicts between the new version @@ -166,13 +170,9 @@ to a Cygwin version incompatibility: try the "Other" Windows/Cygwin RPM. If you are using Cygwin and installing the nesC RPM causes an error that the RPM was built for Cygwin, add the --ignoreos option. +

- - -

TinyOS-specific Tools +TinyOS-specific Tools @@ -187,9 +187,9 @@ option. - + - + @@ -197,26 +197,24 @@ option. + - +

Tool nesc-1.2.8a-1.cygwin.i386.rpm nesc-1.2.8b-1.cygwin.i386.rpm nesc-1.2.8a-1.i386.rpm rpm -Uvh
rpm -Uvh --ignoreos (if Cygwin complains) rpm -Uvh
rpm -Uvh --ignoreos (if Cygwin complains)
Tool Windows/Cygwin 64-bit Linux Command
tinyos-tools tinyos-tools-1.2.4-2.cygwin.i386.rpm tinyos-tools-1.2.4-2.i386.rpm tinyos-tools-1.2.4-2.i686.rpm rpm -ivh --force (1.x tree)
rpm -Uvh (no 1.x tree)
rpm -ivh --force (1.x tree)
rpm -Uvh (no 1.x tree)

-

Step 3: Install the TinyOS 2.x source tree.

Now that the tools are installed, you need only install the tinyos 2.x source tree and then set your environment variables.

Install tinyos-2.x -

If you have an existing 1.x tree, we strongly recommend that you use the install (-i) rpm argument when installing the tinyos-2.x rpm rather @@ -233,7 +231,7 @@ performing a forced installation of the 2.0 tree.

If you have an existing 2.x tree which you do not care about, then we recommend removing it before installing the new one with a forced install.

TinyOS 2.x +TinyOS 2.x @@ -246,14 +244,15 @@ recommend removing it before installing the new one with a forced install.
- -

TinyOS tinyos-2.0.2-2.cygwin.noarch.rpm tinyos-2.0.2-2.noarch.rpm rpm -Uvh (to upgrade)
- rpm -ivh (to install)
- rpm -ivh --force (to force install)
+ rpm -Uvh (to upgrade)
+ rpm -ivh (to install)
+ rpm -ivh --force (to force install)

-

Configure your environment +

Configure your environment

In TinyOS 1.x, much of your environment was set by the rpm installation process by copying a tinyos.sh file into /etc/profile.d which was subsequently run anytime @@ -261,20 +260,23 @@ a shell was started. Because this was deemed unnecessarily invasive, the 2.x rpm does not do this. Rather, you need to set these variables yourself. Ideally, you'll put them in a shell script that will run when your shell starts, but you needn't put such a script under /etc/profile.d. -

Please take note of the current settings since you'll need those if you want to work in your current 1.x tree sometime in the future. -

The example settings below assume that the tinyos-2.x installation is in /opt/tinyos-2.x. Change the settings to be correct for where you've put your tinyos-2.x tree. Note that the windows CLASSPATH must be a windows-style path, not a cygwin path. You can generate a windows style path from a cygwin-style path using 'cygpath -w'. For example: -

export CLASSPATH=`cygpath -w $TOSROOT/support/sdk/java/tinyos.jar`
+
+export CLASSPATH=`cygpath -w $TOSROOT/support/sdk/java/tinyos.jar`
 export CLASSPATH="$CLASSPATH;."
 
 
-TinyOS 2.x
+
TinyOS 2.x
 
@@ -316,42 +318,47 @@ export CLASSPATH="$CLASSPATH;."
 
 †Only necessary if you're using the MSP430 platform/tools.
 
-

+

 In addition to the above environment variables, do the following on Linux machines:
-

+
+
+
  Change the ownership on your /opt/tinyos-2.x files: chown -R <your uid> /opt/tinyos-2.x
-
 Change the permissions on any serial (/dev/ttyS<N>), usb
+
+ Change the permissions on any serial (/dev/ttyS<N>), usb
 (/dev/tts/usb<N>, /dev/ttyUSB<N>), or parallel (/dev/parport) devices you
-are going to use: chmod 666 /dev/<devicename>
-
-
+are going to use: chmod 666 /dev/<devicename>
+
+
+
+
 Finally, if you have installed TinyOS 2.0.1, there is a bug in TOSSIM (which will be fixed in 2.0.2).
-The bug is in file tos/chips/atm128/sim/atm128_sim.h. Change these lines 22 and 23 from:
+The bug is in file tos/chips/atm128/sim/atm128_sim.h. Change these lines 22 and 23 from:
 
  #define _SFR_IO8(io_addr) _MMIO_BYTE((io_addr) + 0x20)
 #define _SFR_IO16(io_addr) _MMIO_WORD((io_addr) + 0x20)
 
 
-to
+to
 
  #define _SFR_IO8(io_addr) _MMIO_BYTE((io_addr))
 #define _SFR_IO16(io_addr) _MMIO_WORD((io_addr))
 
 
-If you do not do this, then timers will not work correctly.
+If you do not do this, then timers will not work correctly.
+
+
 
-
-Switching back to a TinyOS 1.x tree
-Since the tools are backwardly compatible, you need only change
+Switching back to a TinyOS 1.x tree
+Since the tools are backwardly compatible, you need only change
 your environment variables to point to the 1.x settings. Assuming 
 that your old tree was in /opt/tinyos-1.x, you would use the following 
 values:
-
TinyOS 1.x
+
+
+TinyOS 1.x
 
   Environment Variable
 
@@ -384,7 +391,6 @@ values:
 
 
   Environment Variable 
 
 
-
 
 Switching between the two should require switching only these environment
 variables.

Tool	nesc-1.2.8a-1.cygwin.i386.rpm	nesc-1.2.8b-1.cygwin.i386.rpm	nesc-1.2.8a-1.i386.rpm	`rpm -Uvh` `rpm -Uvh --ignoreos` (if Cygwin complains)	`rpm -Uvh` `rpm -Uvh --ignoreos` (if Cygwin complains)
Tool	Windows/Cygwin	64-bit Linux	Command
tinyos-tools	tinyos-tools-1.2.4-2.cygwin.i386.rpm	tinyos-tools-1.2.4-2.i386.rpm	tinyos-tools-1.2.4-2.i686.rpm	`rpm -ivh --force` (1.x tree) `rpm -Uvh` (no 1.x tree)	`rpm -ivh --force` (1.x tree) `rpm -Uvh` (no 1.x tree)