[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/im2sb README.txt, 1.1.2.1, 1.1.2.2 Tsl2561InternalC.nc, 1.1.2.5, 1.1.2.6 Tsl2561InternalP.nc, 1.1.2.3, 1.1.2.4 im2sb.h, 1.1.2.5, 1.1.2.6

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17934

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	README.txt Tsl2561InternalC.nc Tsl2561InternalP.nc im2sb.h 
Log Message:
Small bugfixes

Index: README.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/Attic/README.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** README.txt	13 Nov 2006 19:51:26 -0000	1.1.2.1
--- README.txt	14 Nov 2006 00:54:10 -0000	1.1.2.2
***************
*** 5,9 ****
    TSL2561 - 0x49
    TMP175  - 0X4A
!   MAX136  - 0x35
  
  These address assignments are compatible with the DS2745 on the optional battery board.  Modify the address assignments as needed.
--- 5,9 ----
    TSL2561 - 0x49
    TMP175  - 0X4A
!   MAX136  - 0x34
  
  These address assignments are compatible with the DS2745 on the optional battery board.  Modify the address assignments as needed.

Index: Tsl2561InternalC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/Tsl2561InternalC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Tsl2561InternalC.nc	7 Nov 2006 23:15:26 -0000	1.1.2.5
--- Tsl2561InternalC.nc	14 Nov 2006 00:54:10 -0000	1.1.2.6
***************
*** 67,70 ****
--- 67,71 ----
    Internal.ToHPLC -> Logic.HplTSL256x;
    Internal.SubInit -> Logic.Init;
+   Internal.InterruptAlert -> GeneralIOC.GpioInterrupt[GPIO_TSL2561_LIGHT_INT];
    SplitControl = Logic;
    MainC.SoftwareInit -> Internal;

Index: Tsl2561InternalP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/Tsl2561InternalP.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
*** Tsl2561InternalP.nc	7 Nov 2006 23:15:26 -0000	1.1.2.3
--- Tsl2561InternalP.nc	14 Nov 2006 00:54:10 -0000	1.1.2.4
***************
*** 114,118 ****
    }
  
!   async event InterruptAlert.fired() {}
  
    default async event void HplTSL256x.measureCh0Done[uint8_t id]( error_t error, uint16_t val ){ return; }
--- 114,118 ----
    }
  
!   async event void InterruptAlert.fired() {}
  
    default async event void HplTSL256x.measureCh0Done[uint8_t id]( error_t error, uint16_t val ){ return; }

Index: im2sb.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/im2sb.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** im2sb.h	13 Nov 2006 19:51:44 -0000	1.1.2.5
--- im2sb.h	14 Nov 2006 00:54:10 -0000	1.1.2.6
***************
*** 51,56 ****
  
  #define TSL2561_SLAVE_ADDR (0x49)
! #define TMP175_SLAVE_ADDR (0x4A)
! #define MAX136_SLAVE_ADDR (0x35)
  
  #endif /* _IM2SB_H */
--- 51,56 ----
  
  #define TSL2561_SLAVE_ADDR (0x49)
! #define TMP175_SLAVE_ADDR (0x48)
! #define MAX136_SLAVE_ADDR (0x34)
  
  #endif /* _IM2SB_H */