[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/tos/platform/shimmer hardware.h, 1.2, 1.3

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/platform/shimmer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26192

Modified Files:
	hardware.h 
Log Message:

corrections/additions to default pin conditions


Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/platform/shimmer/hardware.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hardware.h	10 Aug 2006 17:24:17 -0000	1.2
--- hardware.h	22 Aug 2006 13:21:32 -0000	1.3
***************
*** 105,115 ****
  TOSH_ASSIGN_PIN(SIMO0, 3, 1);
  
! // connected to ftdi
  TOSH_ASSIGN_PIN(UTXD0, 3, 4);
  TOSH_ASSIGN_PIN(URXD0, 3, 5);
! TOSH_ASSIGN_PIN(UTXD1, 3, 6);
! TOSH_ASSIGN_PIN(URXD1, 3, 7);
! 
! 
  
  // GIO pins
--- 105,113 ----
  TOSH_ASSIGN_PIN(SIMO0, 3, 1);
  
! // connected to UART (0 and 1)
  TOSH_ASSIGN_PIN(UTXD0, 3, 4);
  TOSH_ASSIGN_PIN(URXD0, 3, 5);
! TOSH_ASSIGN_PIN(UTXD1, 3, 4);
! TOSH_ASSIGN_PIN(URXD1, 3, 5);
  
  // GIO pins
***************
*** 133,159 ****
  void TOSH_SET_PIN_DIRECTIONS(void)
  {
-   // Prog Pins tristate em
-   TOSH_MAKE_PROG_IN_INPUT();
-   TOSH_MAKE_PROG_OUT_INPUT();
-   
    //LEDS
-   TOSH_SET_RED_LED_PIN();
-   TOSH_SET_YELLOW_LED_PIN();
-   TOSH_SET_ORANGE_LED_PIN();
-   TOSH_SET_GREEN_LED_PIN();
    TOSH_MAKE_RED_LED_OUTPUT();
    TOSH_MAKE_YELLOW_LED_OUTPUT();
    TOSH_MAKE_ORANGE_LED_OUTPUT();
    TOSH_MAKE_GREEN_LED_OUTPUT();
  
      //RADIO PINS
    //CC2420 pins
    TOSH_MAKE_RADIO_RESET_OUTPUT();
    TOSH_SET_RADIO_RESET_PIN();
  
    TOSH_MAKE_RADIO_1V8_EN_OUTPUT();
    TOSH_CLR_RADIO_1V8_EN_PIN();
  
    TOSH_MAKE_RADIO_CSN_OUTPUT();
    TOSH_CLR_RADIO_CSN_PIN();
  
--- 131,156 ----
  void TOSH_SET_PIN_DIRECTIONS(void)
  {
    //LEDS
    TOSH_MAKE_RED_LED_OUTPUT();
    TOSH_MAKE_YELLOW_LED_OUTPUT();
    TOSH_MAKE_ORANGE_LED_OUTPUT();
    TOSH_MAKE_GREEN_LED_OUTPUT();
+   TOSH_SEL_RED_LED_IOFUNC();
+   TOSH_SEL_YELLOW_LED_IOFUNC();
+   TOSH_SEL_ORANGE_LED_IOFUNC();
+   TOSH_SEL_GREEN_LED_IOFUNC();
  
      //RADIO PINS
    //CC2420 pins
    TOSH_MAKE_RADIO_RESET_OUTPUT();
+   TOSH_SEL_RADIO_RESET_IOFUNC();
    TOSH_SET_RADIO_RESET_PIN();
  
    TOSH_MAKE_RADIO_1V8_EN_OUTPUT();
+   TOSH_SEL_RADIO_1V8_EN_IOFUNC();
    TOSH_CLR_RADIO_1V8_EN_PIN();
  
    TOSH_MAKE_RADIO_CSN_OUTPUT();
+   TOSH_SEL_RADIO_CSN_IOFUNC();
    TOSH_CLR_RADIO_CSN_PIN();
  
***************
*** 162,165 ****
--- 159,166 ----
    TOSH_MAKE_RADIO_FIFOP_INPUT();
    TOSH_MAKE_RADIO_SFD_INPUT();
+   TOSH_SEL_RADIO_CCA_IOFUNC();
+   TOSH_SEL_RADIO_FIFO_IOFUNC();
+   TOSH_SEL_RADIO_FIFOP_IOFUNC();
+   TOSH_SEL_RADIO_SFD_IOFUNC();
  
    TOSH_MAKE_ONEWIRE_PWR_OUTPUT();
***************
*** 171,174 ****
--- 172,176 ----
    // BT PINS
    TOSH_MAKE_BT_RESET_OUTPUT();  
+   TOSH_SEL_BT_RESET_IOFUNC();    
    TOSH_SET_BT_RESET_PIN();
  
***************
*** 188,201 ****
    TOSH_SEL_BT_RXD_MODFUNC();
  
  
    // ADC lines
!   TOSH_MAKE_ADC_0_INPUT();
!   TOSH_MAKE_ADC_1_INPUT();
!   TOSH_MAKE_ADC_2_INPUT();
    
    TOSH_MAKE_ADC_ACCELZ_INPUT();
    TOSH_MAKE_ADC_ACCELY_INPUT();
    TOSH_MAKE_ADC_ACCELX_INPUT();
    
  }
  
--- 190,240 ----
    TOSH_SEL_BT_RXD_MODFUNC();
  
+   // BSL Prog Pins tristate em
+   TOSH_MAKE_PROG_IN_INPUT();
+   TOSH_MAKE_PROG_OUT_INPUT();
+ 
+   // SD chipselect
+   TOSH_MAKE_SD_CS_N_OUTPUT();
+   TOSH_SEL_SD_CS_N_IOFUNC();
  
    // ADC lines
!   TOSH_MAKE_ADC_0_OUTPUT();
!   TOSH_MAKE_ADC_1_OUTPUT();
!   TOSH_MAKE_ADC_2_OUTPUT();
! 
!   TOSH_SEL_ADC_0_IOFUNC();
!   TOSH_SEL_ADC_1_IOFUNC();
!   TOSH_SEL_ADC_2_IOFUNC();
    
    TOSH_MAKE_ADC_ACCELZ_INPUT();
    TOSH_MAKE_ADC_ACCELY_INPUT();
    TOSH_MAKE_ADC_ACCELX_INPUT();
+   TOSH_SEL_ADC_ACCELZ_MODFUNC();
+   TOSH_SEL_ADC_ACCELY_MODFUNC();
+   TOSH_SEL_ADC_ACCELX_MODFUNC();
+ 
+ 
+   // DAC lines
+   // Default is not to use DAC mode.  Please define pin usage if you want to use them
+     
+   // UART pins
+   // These declarations are to allow the UART module to work since it's using the names.
+   // The UART module will set them to the right direction when initialized
+ 
+   // ftdi/gio pins.  Unused for now so we do not set directionality or function
+ 
+   // 1-wire function
+   TOSH_MAKE_ONEWIRE_PWR_OUTPUT();
+   TOSH_SEL_ONEWIRE_PWR_IOFUNC();
+   TOSH_SEL_ONEWIRE_IOFUNC();
+ 
+   // Accelerometer pin definitions
+   TOSH_MAKE_ACCEL_SEL0_OUTPUT();
+   TOSH_MAKE_ACCEL_SEL1_OUTPUT();
+   TOSH_MAKE_ACCEL_SLEEP_N_OUTPUT();
    
+   TOSH_SEL_ACCEL_SEL0_IOFUNC();
+   TOSH_SEL_ACCEL_SEL1_IOFUNC();
+   TOSH_SEL_ACCEL_SLEEP_N_IOFUNC();
  }