Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11893
Modified Files:
TestMTS400M.nc sensorboardApp.h
Log Message:
Weather data is now stored in processed form in
database table weather.
Index: TestMTS400M.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestMTS400M.nc 28 May 2005 00:36:46 -0000 1.12
--- TestMTS400M.nc 1 Jun 2005 23:56:01 -0000 1.13
***************
*** 268,272 ****
norace uint8_t iNextPacketID;
! char gga_fields[GGA_FIELDS][GPS_CHAR_PER_FIELD]; // = {{0}};
--- 268,272 ----
norace uint8_t iNextPacketID;
! //char gga_fields[GGA_FIELDS][GPS_CHAR_PER_FIELD]; // = {{0}};
***************
*** 566,590 ****
}
-
- #if 0
- // Pack everything into xbow structs so that
- // xlisten can process it.
- // TODO: Write a module that translates firebug
- // structs into xbow structs, along with a dummy
- // module that can be wired in if the xbow
- // translation is not needed.
- pack->xData.dataGps.hour = gga_data_ptr->hours;
- pack->xData.dataGps.minute = gga_data_ptr->minutes;
- temp = (uint32_t)(gga_data_ptr->dec_sec * 1000);
- pack->xData.dataGps.dec_sec = temp;
- pack->xData.dataGps.lat_deg= gga_data_ptr->Lat_deg;
- temp = (uint32_t)(gga_data_ptr->Lat_dec_min * 10000);
- pack->xData.dataGps.lat_dec_min = temp;
- pack->xData.dataGps.long_deg = gga_data_ptr->Long_deg;
- temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000);
- pack->xData.dataGps.long_dec_min= temp;
- pack->xData.dataGps.nsewind = gga_data_ptr->NSEWind;
- #endif
-
if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart
atomic state = GPS_DONE;
--- 566,569 ----
Index: sensorboardApp.h
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/sensorboardApp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sensorboardApp.h 27 May 2005 22:22:50 -0000 1.5
--- sensorboardApp.h 1 Jun 2005 23:56:01 -0000 1.6
***************
*** 51,60 ****
};
typedef struct XDataMsg {
XSensorHeader xSensorHeader;
union {
! XSensorMTS400DataMsg data1;
! GGAMsg dataGps;
GGA_Data gga_data;
}xData;
} __attribute__ ((packed)) XDataMsg;
--- 51,84 ----
};
+
+ typedef struct weather_data {
+
+ uint16_t vref;
+ uint16_t humidity;
+ uint16_t temperature;
+ uint16_t cal_word1;
+ uint16_t cal_word2;
+ uint16_t cal_word3;
+ uint16_t cal_word4;
+ uint16_t intersematemp;
+ uint16_t pressure;
+ uint16_t taosch0;
+ uint16_t taosch1;
+
+ } Weather_Data;
+
+
+ enum {
+ AM_WEATHER_DATA = 251,
+ };
+
+
typedef struct XDataMsg {
XSensorHeader xSensorHeader;
union {
! XSensorMTS400DataMsg data1;
! GGAMsg dataGps;
GGA_Data gga_data;
+ Weather_Data weather_data;
}xData;
} __attribute__ ((packed)) XDataMsg;
|