[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250 tda5250RegDefaultSettings.h, 1.4, 1.5 tda5250BusResourceSettings.h, 1.5, 1.6

[akoepke]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7090/platforms/eyesIFX/chips/tda5250

Modified Files:
	tda5250RegDefaultSettings.h tda5250BusResourceSettings.h 
Log Message:
switch to metric MHz for SMCLK, adjust constants, include SmclkManager
reduce baud rate for radio -- it can not handle more than 23kBit/s with a
50kHz frequency shift


Index: tda5250RegDefaultSettings.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/tda5250RegDefaultSettings.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tda5250RegDefaultSettings.h	12 Dec 2006 18:23:41 -0000	1.4
--- tda5250RegDefaultSettings.h	5 Apr 2007 06:38:45 -0000	1.5
***************
*** 44,51 ****
  // Default values of data registers
  
! #define TDA5250_REG_DEFAULT_SETTING_CONFIG           0x84F9 
  #define TDA5250_REG_DEFAULT_SETTING_FSK              0x0A0C
  #define TDA5250_REG_DEFAULT_SETTING_XTAL_TUNING      0x0012
! #define TDA5250_REG_DEFAULT_SETTING_LPF              0x6A
  #define TDA5250_REG_DEFAULT_SETTING_ON_TIME          0xFEC0
  #define TDA5250_REG_DEFAULT_SETTING_OFF_TIME         0xF380
--- 44,70 ----
  // Default values of data registers
  
! /** regulate distance by switching the amplifiers */
! // longest distance
! #define FULL_RANGE                                   0x84F9
! // shorter distance; low rx, high tx energy consumption (30m)
! #define MED_RANGE_LP                                 0x84E9
! // shorter distance; high rx, low tx energy consumption (25m)
! #define MED_RANGE_HP                                 0x84F8
! // shortest: low rx; low tx energy consumption (1m to 3m range)
! #define TABLE_TOP                                    0x84E8
! 
! /** regulate distance using variable resistor */
! #define RF_DAMPING_0dB  255
! #define RF_DAMPING_5dB  248
! #define RF_DAMPING_10dB 245
! #define RF_DAMPING_15dB 241
! #define RF_DAMPING_20dB 239
! 
! #define INITIAL_RF_POWER RF_DAMPING_0dB
! 
! #define TDA5250_REG_DEFAULT_SETTING_CONFIG           FULL_RANGE
  #define TDA5250_REG_DEFAULT_SETTING_FSK              0x0A0C
  #define TDA5250_REG_DEFAULT_SETTING_XTAL_TUNING      0x0012
! #define TDA5250_REG_DEFAULT_SETTING_LPF              0x68 
  #define TDA5250_REG_DEFAULT_SETTING_ON_TIME          0xFEC0
  #define TDA5250_REG_DEFAULT_SETTING_OFF_TIME         0xF380

Index: tda5250BusResourceSettings.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/chips/tda5250/tda5250BusResourceSettings.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tda5250BusResourceSettings.h	27 Feb 2007 19:18:24 -0000	1.5
--- tda5250BusResourceSettings.h	5 Apr 2007 06:38:45 -0000	1.6
***************
*** 40,52 ****
      TDA5250_UART_BUS_ID = unique(MSP430_UARTO_BUS)
  };
- /*
- msp430_uart_union_config_t tda5250_uart_config = { {ubr: UBR_1MHZ_38400, umctl: UMCTL_1MHZ_38400, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0, urxe: 1, utxe: 0} };
- */
  
  enum {
!     UBR_1MHZ_49000=0x0015,  UMCTL_1MHZ_49000=0x92
  };
  
! msp430_uart_union_config_t tda5250_uart_config = { {ubr: UBR_1MHZ_49000, umctl: UMCTL_1MHZ_49000, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0, urxe: 1, utxe: 0} };
  
  #endif
--- 40,50 ----
      TDA5250_UART_BUS_ID = unique(MSP430_UARTO_BUS)
  };
  
  enum {
!     // real milli seconds
!     UBR_1MHZ_23405=0x002A,  UMCTL_1MHZ_23405=0xDD, // 23405 bit/s
  };
  
! msp430_uart_union_config_t tda5250_uart_config = { {ubr: UBR_1MHZ_23405, umctl: UMCTL_1MHZ_23405, ssel: 0x02, pena: 0, pev: 0, spb: 0, clen: 1, listen: 0, mm: 0, ckpl: 0, urxse: 0, urxeie: 1, urxwie: 0, urxe: 1, utxe: 0} };
  
  #endif