From: vlahan Date: Tue, 12 Dec 2006 18:22:48 +0000 (+0000) Subject: Swapping HEAD and DEVEL branches X-Git-Tag: tinyos/2.0.1~260 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd Swapping HEAD and DEVEL branches --- diff --git a/apps/RadioSenseToLeds/RadioSenseToLedsC.nc b/apps/RadioSenseToLeds/RadioSenseToLedsC.nc index 0d1fc0ca..fab38b13 100644 --- a/apps/RadioSenseToLeds/RadioSenseToLedsC.nc +++ b/apps/RadioSenseToLeds/RadioSenseToLedsC.nc @@ -101,19 +101,18 @@ implementation { else { radio_sense_msg_t* rsm = (radio_sense_msg_t*)payload; uint16_t val = rsm->data; - call Leds.led0Toggle(); - if (val & 0x8000) { - call Leds.led1On(); - } - else { - call Leds.led1Off(); - } - if (val & 0x4000) { - call Leds.led2On(); - } - else { - call Leds.led2Off(); - } + if (val & 0x0004) + call Leds.led2On(); + else + call Leds.led2Off(); + if (val & 0x0002) + call Leds.led1On(); + else + call Leds.led1Off(); + if (val & 0x0001) + call Leds.led0On(); + else + call Leds.led0Off(); return bufPtr; } } diff --git a/doc/html/install-tinyos.html b/doc/html/install-tinyos.html index f75cded6..8ff7c152 100644 --- a/doc/html/install-tinyos.html +++ b/doc/html/install-tinyos.html @@ -72,6 +72,8 @@ work.

    +
  1. Download and install Cygwin from www.cygwin.com.
    2. +

  2. Download the confirmed-compatible cygwin packages from the tinyos web site here.

  3. In a cygwin shell, unzip the above package into some directory. In these instructions the directory is /cygdrive/c/newcygpkgs. @@ -290,8 +292,8 @@ bypass the erroneous error by using 'rpm -ivh --ignoreos TinyOS - tinyos-2.0.0-1.cygwin.noarch.rpm - tinyos-2.0.0-1.noarch.rpm + tinyos-2.0.0-3.cygwin.noarch.rpm + tinyos-2.0.0-3.noarch.rpm diff --git a/doc/html/tep106.html b/doc/html/tep106.html index d65a035a..a444e4af 100644 --- a/doc/html/tep106.html +++ b/doc/html/tep106.html @@ -303,9 +303,9 @@ ul.auto-toc { Philip Levis and Cory Sharp Draft-Created:10-Dec-2004 -Draft-Version:1.1.2.10 +Draft-Version:1.1.2.11 -Draft-Modified:2006-08-17 +Draft-Modified:2006-11-07 Draft-Discuss:TinyOS Developer List <tinyos-devel at mail.millennium.berkeley.edu> @@ -627,7 +627,12 @@ implementation { TaskEdf interface. Its configuration SHOULD wire it to TinySchedulerC. The key used for task unique identifiers MUST be "TinySchedulerC.TaskInterface", where TaskInterface is the name of the new task interface as presented -by the scheduler. For example, the module SomethingP requires two EDF +by the scheduler. A common way to make sure a consistent string is used +is to #define it. For example, TaskEdf.nc might include:

    +
    +#define UQ_TASK_EDF "TinySchedulerC.TaskEdf"
+
    +

    In this example, the module SomethingP requires two EDF tasks:

     configuration SomethingC {
@@ -635,8 +640,8 @@ configuration SomethingC {
 }
 implementation {
   components SomethingP, TinySchedulerC;
-  SomethingP.SendTask -> TinySchedulerC.TaskEdf["TinySchedulerC.TaskEdf"];
-  SomethingP.SenseTask -> TinySchedulerC.TaskEdf["TinySchedulerC.TaskEdf"];
+  SomethingP.SendTask -> TinySchedulerC.TaskEdf[unique(UQ_TASK_EDF)];
+  SomethingP.SenseTask -> TinySchedulerC.TaskEdf[unique(UQ_TASK_EDF)];
 }

    The module SomethingP also has a basic task. The nesC compiler diff --git a/doc/html/tep109.html b/doc/html/tep109.html index dec7d902..0de30da7 100644 --- a/doc/html/tep109.html +++ b/doc/html/tep109.html @@ -3,7 +3,7 @@ - + Sensors and Sensor Boards