[Firebug-cvs] mts400/apps/TestFireBoard Makefile,1.1,1.2 fireboard.nc,1.2,1.3 fireboardM.nc,1.2,1.3
Brought to you by:
doolin
Menu
▾
▴
[Firebug-cvs] mts400/apps/TestFireBoard Makefile,1.1,1.2 fireboard.nc,1.2,1.3 fireboardM.nc,1.2,1.3
|
From: <do...@us...> - 2003-12-12 00:13:29
|
Update of /cvsroot/firebug/mts400/apps/TestFireBoard
In directory sc8-pr-cvs1:/tmp/cvs-serv4427
Modified Files:
Makefile fireboard.nc fireboardM.nc
Log Message:
Cleaned up global fireboard driver.
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/mts400/apps/TestFireBoard/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile 26 Nov 2003 18:38:45 -0000 1.1
--- Makefile 12 Dec 2003 00:13:26 -0000 1.2
***************
*** 1,3 ****
! COMPONENT=fireboard
SENSORBOARD=gps
include ../Makelocal
--- 1,3 ----
! COMPONENT=fireboardtest
SENSORBOARD=gps
include ../Makelocal
Index: fireboard.nc
===================================================================
RCS file: /cvsroot/firebug/mts400/apps/TestFireBoard/fireboard.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fireboard.nc 27 Nov 2003 00:04:27 -0000 1.2
--- fireboard.nc 12 Dec 2003 00:13:26 -0000 1.3
***************
*** 3,16 ****
includes sensorboard;
!
configuration fireboard {
}
implementation {
! components Main,
! fireboardM,
MicaWbSwitch,
UARTGpsPacket,
--- 3,16 ----
includes sensorboard;
! includes fireboard;
configuration fireboard {
+ provides interface StdControl;
}
implementation {
! components fireboardM,
MicaWbSwitch,
UARTGpsPacket,
***************
*** 21,27 ****
LedsC;
! Main.StdControl -> fireboardM.StdControl;
! Main.StdControl -> TimerC.StdControl;
! Main.StdControl -> MicaWbSwitch.StdControl;
fireboardM.Leds -> LedsC;
--- 21,26 ----
LedsC;
! fireboardM.StdControl = StdControl;
! fireboardM.WBSwitch -> MicaWbSwitch.StdControl;
fireboardM.Leds -> LedsC;
Index: fireboardM.nc
===================================================================
RCS file: /cvsroot/firebug/mts400/apps/TestFireBoard/fireboardM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fireboardM.nc 26 Nov 2003 19:17:43 -0000 1.2
--- fireboardM.nc 12 Dec 2003 00:13:26 -0000 1.3
***************
*** 19,22 ****
--- 19,23 ----
interface Timer as GlobalTimer;
+ interface StdControl as WBSwitch;
interface StdControl as SwitchControl;
interface Switch as PowerSwitch;
***************
*** 36,48 ****
//Intersema
! interface SplitControl as PressureControl;
! //interface StdControl as PressureControl;
! interface ADC as IntersemaTemp;
! interface ADC as IntersemaPressure;
! interface Calibration as IntersemaCal;
! interface SplitControl as TaosControl;
! interface ADC as TaosCh0;
! interface ADC as TaosCh1;
}
--- 37,49 ----
//Intersema
! interface SplitControl as PressureControl;
! //interface StdControl as PressureControl;
! interface ADC as IntersemaTemp;
! interface ADC as IntersemaPressure;
! interface Calibration as IntersemaCal;
! interface SplitControl as TaosControl;
! interface ADC as TaosCh0;
! interface ADC as TaosCh1;
}
***************
*** 55,59 ****
#include "SODebug.h"
#include "gps.h"
! #define DBG_USR2 0
--- 56,60 ----
#include "SODebug.h"
#include "gps.h"
! #define DBG_USR2 1
***************
*** 65,68 ****
--- 66,70 ----
#define GPS_ONE_SHOT 1
+ Firedata_msg firemsg;
//char state;
***************
*** 80,84 ****
MAIN_SWITCH_ON, MAIN_SWITCH_OFF, WAIT_SWITCH_ON,
WAIT_SWITCH_OFF, TIMER,
! GPS_DONE, SHT_DONE, HUMIDITY_DONE, PRESSURE_DONE, LIGHT_DONE};
--- 82,86 ----
MAIN_SWITCH_ON, MAIN_SWITCH_OFF, WAIT_SWITCH_ON,
WAIT_SWITCH_OFF, TIMER,
! GPS_DONE, SHT_DONE, HUMIDITY_DONE, PRESSURE_DONE, LIGHT_DONE, DATA_DONE};
***************
*** 95,101 ****
command result_t StdControl.init() {
init_debug();
- state1 = IDLE;
call Leds.init();
/** Control.init in GpsPacket.nc */
call GpsControl.init();
--- 97,105 ----
command result_t StdControl.init() {
+ state1 = IDLE;
init_debug();
call Leds.init();
+ //call GlobalTimer.init();
+ //call MicaWbSwitch.init();
/** Control.init in GpsPacket.nc */
call GpsControl.init();
***************
*** 108,122 ****
call Leds.redOn();
-
call HumidityError.enable(); //in case Sensirion doesn't respond
call TemperatureError.enable(); // "
-
- /** Control.start in GpsPacket.nc, calls
- * SwitchControl.start and ByteControl.start()
- * Move those functions up here out of the GPS
- * driver, then abstract the sensorboard
- * component away.
- */
- //call GpsControl.start();
call GlobalTimer.start(TIMER_REPEAT, 3000) ;
return SUCCESS;
--- 112,117 ----
***************
*** 138,142 ****
}
-
/** Ok, this function turns on the gps unit for reading,
* which is turned of elsewhere when the read is finished.
--- 133,136 ----
***************
*** 146,149 ****
--- 140,149 ----
call Leds.greenToggle();
+ /** Control.start in GpsPacket.nc, calls
+ * SwitchControl.start and ByteControl.start()
+ * Move those functions up here out of the GPS
+ * driver, then abstract the sensorboard
+ * component away.
+ */
call GpsControl.start();
***************
*** 157,164 ****
event result_t GlobalTimer.fired() {
switch (state1) {
case BUSY:
- SODbg(DBG_USR2, "gps_sht_baroM.GlobalTimer.fired(), BUSY\n");
break;
--- 157,165 ----
event result_t GlobalTimer.fired() {
+ SODbg(DBG_USR2, "fireboardM.GlobalTimer.fired()\n");
+
switch (state1) {
case BUSY:
break;
***************
*** 385,389 ****
async event result_t Humidity.dataReady(uint16_t data) {
! SODbg(DBG_USR2, "gsp_shtM.Humidity.dataReady()\n")
atomic {
--- 386,390 ----
async event result_t Humidity.dataReady(uint16_t data) {
! SODbg(DBG_USR2, "gps_shtM.Humidity.dataReady()\n")
atomic {
***************
*** 601,605 ****
return SUCCESS;
}
-
}
--- 602,605 ----
|
