[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/apps/MOBIUS/SixAxisCmdCtrl SixAxisCmdCtrlM.nc, 1.2, 1.3

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/MOBIUS/SixAxisCmdCtrl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28709/SixAxisCmdCtrl

Modified Files:
	SixAxisCmdCtrlM.nc 
Log Message:

Added USE_8MHZ_CRYSTAL so that normal MSP 4.15MHZ mode can be switched
in easily to configure the Bluetooth module. Then 8MHZ will work from
then on. 





Index: SixAxisCmdCtrlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/MOBIUS/SixAxisCmdCtrl/SixAxisCmdCtrlM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SixAxisCmdCtrlM.nc	19 Dec 2007 15:35:49 -0000	1.2
--- SixAxisCmdCtrlM.nc	4 Jan 2008 13:07:33 -0000	1.3
***************
*** 79,82 ****
--- 79,86 ----
  implementation {
   
+ /* comment out USE_8MHZ_CRYSTAL and load this code once so that the baudrate of the RovingNetworks 
+    Bluetooth module is setup(once only), then uncomment it and load for 8MHZ operation */
+ #define USE_8MHZ_CRYSTAL
+ 
  #ifdef LOW_BATTERY_INDICATION
    //#define DEBUG_LOW_BATTERY_INDICATION
***************
*** 117,121 ****
  
    norace uint8_t current_buffer = 0, dma_blocks = 0, g_data;
!   uint16_t leftover_byte_count, sbuf0[36], sbuf1[36], timestamp0, timestamp1, 
             sample_freq = SAMPLING_100HZ, new_sample_freq = SAMPLING_0HZ_OFF;
  
--- 121,125 ----
  
    norace uint8_t current_buffer = 0, dma_blocks = 0, g_data;
!   uint16_t sbuf0[36], sbuf1[36], timestamp0, timestamp1, 
             sample_freq = SAMPLING_100HZ, new_sample_freq = SAMPLING_0HZ_OFF;
  
***************
*** 201,204 ****
--- 205,210 ----
    
    command result_t StdControl.init() {
+ 
+ #ifdef USE_8MHZ_CRYSTAL
      /* 
       * set up 8mhz clock to max out 
***************
*** 237,240 ****
--- 243,247 ----
       * end clock set up 
       */
+ #endif /* USE_8MHZ_CRYSTAL */
  
      call AccelStdControl.init();
***************
*** 265,269 ****
      call SerialCommandStdControl.init();
      dma_blocks = 0;
-     leftover_byte_count=0;
      return SUCCESS;
    }
--- 272,275 ----
***************
*** 643,649 ****
  
    async event void Bluetooth.dataAvailable(uint8_t data){
!     leftover_byte_count++;
!     if( leftover_byte_count > 2)
!       call SerialCommandParser.handleByte(data);
    }
  
--- 649,653 ----
  
    async event void Bluetooth.dataAvailable(uint8_t data){
!     call SerialCommandParser.handleByte(data);
    }