[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/btnode3 .platform, 1.4, 1.5 PlatformLedsC.nc, 1.4, 1.5 hardware.h, 1.4, 1.5 VoltageC.nc, 1.4, NONE

[Jan Beutel]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/btnode3
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10992/tos/platforms/btnode3

Modified Files:
	.platform PlatformLedsC.nc hardware.h 
Removed Files:
	VoltageC.nc 
Log Message:
fixed platform definition for btnode3

working apps are Null and Blink (on 4 leds!) - RadioCountToLed still has some weirdness...

Index: .platform
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/btnode3/.platform,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** .platform	12 Dec 2006 18:23:40 -0000	1.4
--- .platform	21 Jun 2007 21:44:16 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  # $Id$
  #
+ 
  push( @includes, qw(
  
***************
*** 17,34 ****
    %T/platforms/mica2
    %T/platforms/mica2/chips/cc1000
!   %T/chips/cc1000
    %T/chips/atm128
    %T/chips/atm128/adc
    %T/chips/atm128/pins
    %T/chips/atm128/spi
    %T/chips/atm128/timer
    %T/lib/serial
    %T/lib/power
!   %T/lib/timer
!   
  #  %T/platforms/mica2/chips/at45db not existent on btnode3
  #  %T/platforms/mica/chips/at45db  not existent on btnode3
  #  %T/chips/at45db
!   
  ) );
  
--- 18,36 ----
    %T/platforms/mica2
    %T/platforms/mica2/chips/cc1000
!   %T/chips/cc1000_lpl
    %T/chips/atm128
    %T/chips/atm128/adc
+   %T/chips/atm128/i2c
    %T/chips/atm128/pins
    %T/chips/atm128/spi
    %T/chips/atm128/timer
+   %T/lib/timer
    %T/lib/serial
    %T/lib/power
! 
  #  %T/platforms/mica2/chips/at45db not existent on btnode3
  #  %T/platforms/mica/chips/at45db  not existent on btnode3
  #  %T/chips/at45db
! 
  ) );
  

Index: PlatformLedsC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/btnode3/PlatformLedsC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlatformLedsC.nc	12 Dec 2006 18:23:40 -0000	1.4
--- PlatformLedsC.nc	21 Jun 2007 21:44:16 -0000	1.5
***************
*** 2,6 ****
  
  /**
!  * Copyright (c) 2006 ETH Zurich.  
   * Copyright (c) 2004-2005 Crossbow Technology, Inc.  All rights reserved.
   *
--- 2,6 ----
  
  /**
!  * Copyright (c) 2006-2007 ETH Zurich.  
   * Copyright (c) 2004-2005 Crossbow Technology, Inc.  All rights reserved.
   *
***************
*** 46,53 ****
    Init = PlatformP.MoteInit;
      
!   Led0 = IO.PortC1;  // Pin C1 = Red LED
!   Led1 = IO.PortC3;  // Pin C3 = Green LED
    Led2 = IO.PortC2;  // Pin C2 = Yellow LED
!   Led3 = IO.PortC0;  // Pin C0 = Blue LED
  }
  
--- 46,53 ----
    Init = PlatformP.MoteInit;
      
!   Led0 = IO.PortC0;  // Pin C0 = Blue LED
!   Led1 = IO.PortC1;  // Pin C1 = Red LED
    Led2 = IO.PortC2;  // Pin C2 = Yellow LED
!   Led3 = IO.PortC3;  // Pin C3 = Green LED
  }
  

Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/btnode3/hardware.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hardware.h	12 Dec 2006 18:23:40 -0000	1.4
--- hardware.h	21 Jun 2007 21:44:16 -0000	1.5
***************
*** 5,9 ****
   *  install, copy or use the software.
   *
!  *  Copyright (c) 2006 ETH Zurich.
   *  Copyright (c) 2004-2005 Crossbow Technology, Inc.
   *  Copyright (c) 2002-2003 Intel Corporation.
--- 5,9 ----
   *  install, copy or use the software.
   *
!  *  Copyright (c) 2006-2007 ETH Zurich.
   *  Copyright (c) 2004-2005 Crossbow Technology, Inc.
   *  Copyright (c) 2002-2003 Intel Corporation.
***************
*** 44,47 ****
--- 44,53 ----
  #define HARDWARE_H
  
+ #ifndef MHZ
+ /* Clock rate is ~8MHz except if specified by user 
+    (this value must be a power of 2, see MicaTimer.h and MeasureClockC.nc) */
+ #define MHZ 8
+ #endif
+ 
  #include <atm128hardware.h>
  #include <Atm128Adc.h>
***************
*** 55,59 ****
  
  enum {
!   PLATFORM_MHZ = 8 // Approximate clock frequency (closest power of 2)
  };
  
--- 61,65 ----
  
  enum {
!   PLATFORM_BAUDRATE = 57600L
  };
  

--- VoltageC.nc DELETED ---