[Tinyos-2-commits] CVS: tinyos-2.x/apps/MViz mote.gif, NONE, 1.1.2.1 MViz.h, 1.1.2.3, 1.1.2.4 MVizAppC.nc, 1.1.2.2, 1.1.2.3 MVizC.nc, 1.1.2.3, 1.1.2.4

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/MViz
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31820

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	MViz.h MVizAppC.nc MVizC.nc 
Added Files:
      Tag: tinyos-2_0_devel-BRANCH
	mote.gif 
Log Message:
Include routing info and image.


--- NEW FILE: mote.gif ---
GIF89a(

áäPK%J(‘*u†`k¸PT‡Ô(X ;T£C!$2R•˜ºÖÇ‹Jíb4í’#L¦DŒå”QíEdðÔ3pà`&¥baH¡“DÎBR©~qû
qÈLA–°bÍ8ßds‹0ÚHrŒUºáà
"ˆ€Ã/ÄÀE%H Eœ<€BÔÄ‹%¤@Ó-¦ ¢
OÐàƒx€—ˆ°ÐP!Æ!¨à…s”†)2Œ2UŽSˆØqˆÁ˜ðÂ"h@ €
4 ñ
È £
6~¬#	4h`¬$àA²"X°
	%,áƒ`œbÅ
(ô±Â@L at c‹7Õp¡G!KŒ“
1l€Á¨<ò8¦"Ô 	’|²ƒ#¤€‡-àJŠ-¿üòD³!‰X€ Á"Ìð¬&ôˆA	3à"	(º`‘G
°bÈ
Ût
 A”Á,~PQ±8ŒÚ£¡ðV<î”ÃŒ$( Ë(,„üXÔâ1tDòJmÔA‡9ª ~Y³
Œ 6É@ 
}\0‰ü!1×P³Ì#~"ÃÂðþ˜êܪJ!	$A4"þ.tqD‘‘Æ3¼T2ƏÐñÃ!œ 1ª¡oª"`°AR¬±ƒ<DÑ…C¨Aƒ<–Æ  óÈ#cÈ@Â?Þ£ªÉ!‰0yTÃI3Â’„èé0†,ϬÂ(Ì!°ã8€€$ €
©ÐEq†uä#ûÐG>îa{èƒåˆÂ
& :<C}`
r
=œ¡Ö¸D-vñ†GtB÷h‡<äQvÔPû¨G3@
…J¬aþ¿0
iü@=xÄÊ€”/4
àÐC3,AŽNÔágXÃ!Ìg
HŒ@op-‘ò7Tá\À†40ñ.H¡×ÀŒH!QÌÈX@.DaQhÄ ±Œ`c`BȈpdL&¸Ã.@
ÀÀ,èÂÑG{Äj˜B’°‡†*⍨D
Index: MViz.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MViz.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MViz.h	28 Oct 2006 07:27:03 -0000	1.1.2.3
--- MViz.h	30 Oct 2006 00:52:32 -0000	1.1.2.4
***************
*** 18,21 ****
--- 18,23 ----
  #define MVIZ_H
  
+ #include "AM.h"
+ 
  enum {
    /* Default sampling period. */
***************
*** 24,28 ****
  };
  
! typedef nx_struct mviz_msg{
    nx_uint16_t version; /* Version of the interval. */
    nx_uint16_t interval; /* Samping period. */
--- 26,30 ----
  };
  
! typedef nx_struct mviz_msg {
    nx_uint16_t version; /* Version of the interval. */
    nx_uint16_t interval; /* Samping period. */
***************
*** 30,33 ****
--- 32,38 ----
    nx_uint16_t count; /* The readings are samples count * NREADINGS onwards */
    nx_uint16_t reading;
+   nx_uint16_t etx;
+   nx_uint16_t link_route_value;
+   nx_am_addr_t link_route_addr;
  } mviz_msg_t;
  

Index: MVizAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MVizAppC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** MVizAppC.nc	26 Oct 2006 00:37:22 -0000	1.1.2.2
--- MVizAppC.nc	30 Oct 2006 00:52:32 -0000	1.1.2.3
***************
*** 23,27 ****
  implementation {
    components MainC, MVizC, LedsC, new TimerMilliC(), 
!     new DemoSensorC() as Sensor;
  
    //MainC.SoftwareInit -> Sensor;
--- 23,27 ----
  implementation {
    components MainC, MVizC, LedsC, new TimerMilliC(), 
!     new DemoSensorC() as Sensor, RandomC;
  
    //MainC.SoftwareInit -> Sensor;
***************
*** 31,35 ****
    MVizC.Read -> Sensor;
    MVizC.Leds -> LedsC;
! 
    //
    // Communication components.  These are documented in TEP 113:
--- 31,35 ----
    MVizC.Read -> Sensor;
    MVizC.Leds -> LedsC;
!   MVizC.Random -> RandomC;
    //
    // Communication components.  These are documented in TEP 113:
***************
*** 42,45 ****
--- 42,47 ----
      new SerialAMSenderC(AM_MVIZ_MSG);   // Sends to the serial port
  
+   components CtpP as Ctp;
+   
    MVizC.RadioControl -> ActiveMessageC;
    MVizC.SerialControl -> SerialActiveMessageC;
***************
*** 51,54 ****
--- 53,58 ----
    MVizC.Receive -> Collector.Receive[AM_MVIZ_MSG];
    MVizC.RootControl -> Collector;
+   MVizC.CtpInfo -> Ctp;
+   MVizC.LinkEstimator -> Ctp;
  
    //

Index: MVizC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MViz/Attic/MVizC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** MVizC.nc	28 Oct 2006 07:27:03 -0000	1.1.2.3
--- MVizC.nc	30 Oct 2006 00:52:32 -0000	1.1.2.4
***************
*** 40,43 ****
--- 40,46 ----
      interface Read<uint16_t>;
      interface Leds;
+     interface CtpInfo;
+     interface LinkEstimator;
+     interface Random;
    }
  }
***************
*** 176,183 ****
      if (!sendbusy) {
        mviz_msg_t *o = (mviz_msg_t *)call Send.getPayload(&sendbuf);
-       local.origin ^= 1;
-       if (local.origin == 1) {
-         local.reading = 13000 - local.reading;
-       }
        memcpy(o, &local, sizeof(local));
        if (call Send.send(&sendbuf, sizeof(local)) == SUCCESS)
--- 179,182 ----
***************
*** 208,211 ****
--- 207,211 ----
  
    event void Read.readDone(error_t result, uint16_t data) {
+     uint16_t val;
      if (result != SUCCESS) {
        data = 0xffff;
***************
*** 213,218 ****
      }
      local.reading = data;
    }
! 
    event void SerialSend.sendDone(message_t *msg, error_t error) {
      uartbusy = FALSE;
--- 213,224 ----
      }
      local.reading = data;
+     call CtpInfo.getEtx(&val);
+     local.link_route_value = val;
+     call CtpInfo.getParent(&val);
+     local.link_route_addr = val;
+     local.link_route_value = call LinkEstimator.getLinkQuality(local.link_route_addr);
    }
!   event void LinkEstimator.evicted(am_addr_t addr){}
!   
    event void SerialSend.sendDone(message_t *msg, error_t error) {
      uartbusy = FALSE;