seniordesign-firmware Changeset - 9342b3947420

Changeset - 9342b3947420

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-04 17:16:54
ethanzonca@CL-ENS241-08.cedarville.edu

Fixed CSV header for written data, moved GPS fix logic to gps library.

6 files changed with 16 insertions and 7 deletions:

master/master/config.h

master/master/lib/gps.c

master/master/lib/gps.h

master/master/lib/sensordata.c

master/master/lib/slavesensors.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

@@ @@ -17,7 +17,7 @@ @@
 // Module config (master.c)
 // --------------------------------------------------------------------------
 #define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT
 #define F_CPU 11059200
 #define MODULE_ID '1'

master/master/lib/gps.c

➞

Show inline comments

@@ @@ -93,6 +93,10 @@ char* get_dayofmonth() { @@
 	return dayofmonth;
+}
 bool gps_hasfix() {
 	return strcmp("99.99", get_hdop());
+}
 char variation[9];	//xxx.xb
 int calculatedChecksum;
 int receivedChecksum;

master/master/lib/gps.h

➞

Show inline comments

@@ @@ -13,6 +13,9 @@ @@
 #ifndef GPSMKA_H_
 #define GPSMKA_H_
 #include <stdbool.h>
 #define GGA_MESSAGE
 #define RMC_MESSAGE
 #define UKN_MESSAGE
@@ @@ -26,6 +29,7 @@ char* get_course(); @@
 char* get_hdop();
 char* get_sv();
 char* get_dayofmonth();
 bool gps_hasfix();
 void parse_gps_transmission(void);
 void XORbyteWithChecksum(uint8_t byte);

master/master/lib/sensordata.c

➞

Show inline comments

@@ @@ -72,7 +72,7 @@ void sensordata_logvalues() { @@
 			csvHeader[0] = 0x00;
 			// Add master data headers
-			snprintf(csvHeader, 128, "Time,BoardTemp,Lat,Lon,HDOP,Speed,GPS SV,");
+			snprintf(csvHeader, 128, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV");
 			// Add slave data headers
 			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) {
@@ @@ -93,7 +93,7 @@ void sensordata_logvalues() { @@
 		// Write CSV sensor values to SD card
 		logbuf[0] = 0x00;
 		snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
+		snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course(), get_sv());
 		for(int i=0; i<MAX_NUM_SLAVES; i++) {
 			for(int j=0; j<MAX_NUM_SENSORS; j++) {
 				int16_t tmp = sensordata_get(i, j);

master/master/lib/slavesensors.c

➞

Show inline comments

 /*
- * Master Firmware: Slave Sensor Data Aquisition
+ * Master Firmware: Slave Sensor Data Acquisition
+ *
  * Wireless Observational Modular Aerial Network
+ *
@@ @@ -93,6 +93,7 @@ void slavesensors_network_scan() { @@
 	#endif
 	_delay_ms(500); // xbee warmup
 	_delay_ms(200); // xbee warmup
 	wdt_reset();
 	led_on(LED_ACTIVITY);

master/master/master.c

➞

Show inline comments

@@ @@ -96,11 +96,11 @@ int main(void) @@
 			heater_regulateTemp();
 			// Turn on sideboard LED if we have a fix
 			if(strcmp("99.99", get_hdop()) == 0) {
 				led_off(LED_SIDEBOARD);
 			if(gps_hasfix()) {
 				led_on(LED_SIDEBOARD);
+			}
 			else {
-				led_on(LED_SIDEBOARD);
+				led_off(LED_SIDEBOARD);
+			}
 			sensors_readBoardTemp();

0 comments (0 inline, 0 general)