Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8243/apps/XSensorMTS400
Modified Files:
TestMTS400M.nc
Log Message:
Removed cpp directives for mts420
Index: TestMTS400M.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMTS400M.nc 23 May 2005 22:09:52 -0000 1.4
--- TestMTS400M.nc 23 May 2005 22:25:18 -0000 1.5
***************
*** 340,350 ****
TOSH_MAKE_FLASH_CLK_OUTPUT(); //usart clk
call BattControl.init();
call CommControl.init();
call Leds.init();
- call Leds.greenOn();
-
call GpsControl.init();
-
call TaosControl.init();
call AccelControl.init(); //initialize accelerometer
--- 340,351 ----
TOSH_MAKE_FLASH_CLK_OUTPUT(); //usart clk
+
+ call Leds.greenOn();
+
+ // Why aren't these all wired into StdControl?
call BattControl.init();
call CommControl.init();
call Leds.init();
call GpsControl.init();
call TaosControl.init();
call AccelControl.init(); //initialize accelerometer
***************
*** 356,369 ****
command result_t StdControl.start() {
call HumidityError.enable(); //in case Sensirion doesn't respond
! call TemperatureError.enable(); // same as above
!
call CommControl.start();
call BattControl.start();
-
-
call GpsControl.start();
-
atomic state = START;
atomic sensor_state= SENSOR_NONE;
--- 357,368 ----
command result_t StdControl.start() {
+
call HumidityError.enable(); //in case Sensirion doesn't respond
! call TemperatureError.enable(); // same as above
!
call CommControl.start();
call BattControl.start();
call GpsControl.start();
atomic state = START;
atomic sensor_state= SENSOR_NONE;
***************
*** 540,543 ****
--- 539,543 ----
}
+
memcpy(&(pack->xData.dataGps),gps_data,63);
***************
*** 773,776 ****
--- 773,779 ----
return SUCCESS;
}
+
+
+
/****************************************************************************
***************
*** 787,802 ****
sending_packet = FALSE;
}
! else
! {
! IsUART = !IsUART; // change to uart send
! atomic {
! WaitingForSend = FALSE; // both uart and radio sent, done for current msg
! sending_packet = FALSE;
! }
! }
return SUCCESS;
}
/****************************************************************************
* Radio msg xmitted.
--- 790,808 ----
sending_packet = FALSE;
}
! else {
! IsUART = !IsUART; // change to uart send
! atomic {
! WaitingForSend = FALSE; // both uart and radio sent, done for current msg
! sending_packet = FALSE;
! }
! }
return SUCCESS;
}
+
+
+
+
/****************************************************************************
* Radio msg xmitted.
|
