[Firebug-cvs] fireboard/fireboard/sensorboards/xbow_mts420ca fireboardsensor.nc,1.1.1.1,1.2 fireboar
Brought to you by:
doolin
Menu
▾
▴
[Firebug-cvs] fireboard/fireboard/sensorboards/xbow_mts420ca fireboardsensor.nc,1.1.1.1,1.2 fireboardsensorM.nc,1.1.1.1,1.2
|
From: <do...@us...> - 2004-01-22 00:40:10
|
Update of /cvsroot/firebug/fireboard/fireboard/sensorboards/xbow_mts420ca
In directory sc8-pr-cvs1:/tmp/cvs-serv31002/fireboard/sensorboards/xbow_mts420ca
Modified Files:
fireboardsensor.nc fireboardsensorM.nc
Log Message:
Crash bang boom. Light and barometer are down at the moment, but the driver code is getting much cleaner. May need to back out a couple of
minor changes later. There may be a file or two that have been removed from the archive that will be actually needed, it/they can be added back if it is
not possible to make the system files work.
Index: fireboardsensor.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensorboards/xbow_mts420ca/fireboardsensor.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fireboardsensor.nc 5 Jan 2004 21:03:27 -0000 1.1.1.1
--- fireboardsensor.nc 22 Jan 2004 00:40:06 -0000 1.2
***************
*** 12,16 ****
includes sensorboard;
includes fireboard;
! includes gps;
configuration fireboardsensor {
--- 12,17 ----
includes sensorboard;
includes fireboard;
! includes leadtek_9546;
! includes sensirion_sht11;
configuration fireboardsensor {
Index: fireboardsensorM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensorboards/xbow_mts420ca/fireboardsensorM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fireboardsensorM.nc 5 Jan 2004 21:03:27 -0000 1.1.1.1
--- fireboardsensorM.nc 22 Jan 2004 00:40:06 -0000 1.2
***************
*** 31,35 ****
uses {
-
interface Leds;
--- 31,34 ----
***************
*** 65,82 ****
Firedata_msg firemsg = {0};
!
! GGA_Msg gga_msg;
char state1;
- uint16_t TaosData;
-
- uint16_t calibration[6];
- uint16_t C1,C2,C3,C4,C5,C6;
- uint16_t PressureData;
-
- uint16_t HumData;
-
-
enum {IDLE, BUSY,
GPS_DONE, SHT_DONE,
--- 64,71 ----
Firedata_msg firemsg = {0};
! GGA_Msg gga_msg = {0};
char state1;
enum {IDLE, BUSY,
GPS_DONE, SHT_DONE,
***************
*** 84,89 ****
-
-
default event result_t Data.dataReady[uint8_t id](void * msg) {
return SUCCESS;
--- 73,76 ----
***************
*** 94,98 ****
state1 = IDLE;
init_debug();
! call Leds.init();
return SUCCESS;
}
--- 81,85 ----
state1 = IDLE;
init_debug();
! //call Leds.init();
return SUCCESS;
}
***************
*** 100,106 ****
command result_t StdControl.start() {
! call Leds.redOn();
call GlobalTimer.start(TIMER_REPEAT, 3000) ;
! SODbg(DBG_USR2, "fireboardsensorM.StdControl.start()\n");
return SUCCESS;
}
--- 87,93 ----
command result_t StdControl.start() {
! //call Leds.redOn();
call GlobalTimer.start(TIMER_REPEAT, 3000) ;
! //SODbg(DBG_USR2, "fireboardsensorM.StdControl.start()\n");
return SUCCESS;
}
***************
*** 115,119 ****
event result_t GlobalTimer.fired() {
! SODbg(DBG_USR2, "fireboardsensorM.GlobalTimer.fired()\n");
switch (state1) {
--- 102,107 ----
event result_t GlobalTimer.fired() {
! //SODbg(DBG_USR2, "fireboardsensorM.GlobalTimer.fired()\n");
!
switch (state1) {
***************
*** 125,129 ****
state1 = BUSY;
call LeadTek9546.powerOn();
! signal Data.dataReady[0]((void*)(&gga_msg));
break;
--- 113,119 ----
state1 = BUSY;
call LeadTek9546.powerOn();
! if (signal Data.dataReady[0]((void*)(&gga_msg))) {
! state1 = GPS_DONE;
! }
break;
***************
*** 145,150 ****
case LIGHT_DONE:
state1 = BUSY;
! signal Data.dataReady[1](&firemsg);
! state1 = IDLE;
break;
--- 135,141 ----
case LIGHT_DONE:
state1 = BUSY;
! if (signal Data.dataReady[1](&firemsg)) {
! state1 = IDLE;
! }
break;
***************
*** 165,169 ****
event result_t SHT11.powerOffDone() {
! SODbg(DBG_USR2, "fireboardsensorM.SHT11.stopDone()\n")
state1 = SHT_DONE;
return SUCCESS;
--- 156,160 ----
event result_t SHT11.powerOffDone() {
! //SODbg(DBG_USR2, "fireboardsensorM.SHT11.stopDone()\n")
state1 = SHT_DONE;
return SUCCESS;
***************
*** 186,190 ****
//call Leds.greenToggle();
! SODbg(DBG_USR2, "SHT11.dataReady: Humidity: Temp(adc): %i Humidity(adc): %i Temp(degCx10): %i Humidity(%): %i \n",tempdata,rel_humdata,(int)temp, (int)rel_hum);
atomic {
--- 177,181 ----
//call Leds.greenToggle();
! SODbg(DBG_USR2, "SHT11.dataReady: Humidity: Temp(adc): %i Humidity(adc): %i Temp(degCx10): %i Humidity(%): %i \r\n",tempdata,rel_humdata,(int)temp, (int)rel_hum);
atomic {
***************
*** 224,228 ****
baro_pres = msg->baro_pres;
! SODbg(DBG_USR2, "Pressure: Temp(adc): %i Press(adc): %i Temp(degCx10): %i Press(mbar): %i \n", tempdata,baro_presdata,(int)temp, (int)baro_pres);
#endif
--- 215,219 ----
baro_pres = msg->baro_pres;
! SODbg(DBG_USR2, "Pressure: Temp(adc): %i Press(adc): %i Temp(degCx10): %i Press(mbar): %i \r\n", tempdata,baro_presdata,(int)temp, (int)baro_pres);
#endif
***************
*** 241,245 ****
event result_t LeadTek9546.powerOffDone() {
! state1 = GPS_DONE;
return SUCCESS;
}
--- 232,236 ----
event result_t LeadTek9546.powerOffDone() {
! //state1 = GPS_DONE;
return SUCCESS;
}
***************
*** 252,255 ****
--- 243,248 ----
GPS_Msg * gps_data = (GPS_Msg*)userdata;
+
+ SODbg(DBG_USR2, "\r\n");
for (i=0; i<=gps_data->data[0]; i++) {
/** UARTPutChar is an SODebug function.
***************
*** 258,266 ****
UARTPutChar(gps_data->data[i]);
}
! SODbg(DBG_USR2, "\n");
! call Leds.greenToggle();
! SODbg(DBG_USR2, "fireboardsensor.LeadTek.dataReady()\n");
atomic {
call LeadTek9546.powerOff();
--- 251,259 ----
UARTPutChar(gps_data->data[i]);
}
! SODbg(DBG_USR2, "\r\n");
! //call Leds.greenToggle();
! //SODbg(DBG_USR2, "fireboardsensor.LeadTek.dataReady()\n");
atomic {
call LeadTek9546.powerOff();
***************
*** 271,274 ****
--- 264,268 ----
+
/** Taos TSL250RD light intensity sensor events.
*/
***************
*** 277,281 ****
event result_t TAOS.powerOffDone() {
! SODbg(DBG_USR2, "fireboardsensor.TAOS.powerOffDone()\n");
state1 = LIGHT_DONE;
return SUCCESS;
--- 271,275 ----
event result_t TAOS.powerOffDone() {
! //SODbg(DBG_USR2, "fireboardsensor.TAOS.powerOffDone()\n");
state1 = LIGHT_DONE;
return SUCCESS;
***************
*** 287,290 ****
--- 281,285 ----
taos_tsl250rd_data_msg * data_msg = (taos_tsl250rd_data_msg*)userdata;
+ float lux = 0;
#if DBG_USR2
***************
*** 294,298 ****
uint16_t step;
uint16_t adc;
! float lux;
channel = data_msg->channel;
--- 289,293 ----
uint16_t step;
uint16_t adc;
!
channel = data_msg->channel;
***************
*** 305,309 ****
//call Leds.greenToggle();
! SODbg(DBG_USR2, "Taos Ch%i data: %i Cord: %i Step: %i ADC Counts: %i Light(lux): %i \n",
channel, taos_data,cord,step,adc,(int)lux);
#endif
--- 300,304 ----
//call Leds.greenToggle();
! SODbg(DBG_USR2, "Taos Ch%i data: %i Cord: %i Step: %i ADC Counts: %i Light(lux): %i \r\n",
channel, taos_data,cord,step,adc,(int)lux);
#endif
|
