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

@@ @@ -8,25 +8,25 @@ @@
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #ifndef CONFIG_H_
 #define CONFIG_H_
 // --------------------------------------------------------------------------
 // Module config (master.c)
 // --------------------------------------------------------------------------
 #define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT
 #define F_CPU 11059200
 #define MODULE_ID '1'
 #define BOARDTEMP_ADDR 0x90
 #define HEATER_THRESHOLD 25
 // --------------------------------------------------------------------------
 // Error Codes config (led.c, used throughout code)
 // --------------------------------------------------------------------------
 // SD Card

master/master/lib/gps.c

➞

Show inline comments

@@ @@ -84,24 +84,28 @@ char* get_speedKnots() { @@
+}
 char course[8];		//xxx.x
 char* get_course() {
 	return course;
+}
 char dayofmonth[9];	//ddmmyy
 char* get_dayofmonth() {
 	return dayofmonth;
+}
 bool gps_hasfix() {
 	return strcmp("99.99", get_hdop());
+}
 char variation[9];	//xxx.xb
 int calculatedChecksum;
 int receivedChecksum;
 // transmission state machine
 enum decodeState {
 	//shared fields
 	INITIALIZE=0,
 	GET_TYPE,
 	GPS_CHECKSUM,	//XOR of all the bytes between the $ and the * (not including the delimiters themselves), written in hexadecimal
 	//GGA data fields
 	GGA_TIME,

master/master/lib/gps.h

➞

Show inline comments

@@ @@ -4,29 +4,33 @@ @@
  * Wireless Observational Modular Aerial Network
+ *
  * Ethan Zonca
  * Matthew Kanning
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #ifndef GPSMKA_H_
 #define GPSMKA_H_
 #include <stdbool.h>
 #define GGA_MESSAGE
 #define RMC_MESSAGE
 #define UKN_MESSAGE
 void gps_setup();
 char* get_longitude();
 char* get_latitude();
 char* get_timestamp();
 char* get_speedKnots();
 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);
 #endif /* GPSMKA_H_ */
@@ \ No newline at end of file @@

master/master/lib/sensordata.c

➞

Show inline comments

@@ @@ -63,46 +63,46 @@ char logbuf[128]; @@
 bool dataWasReady = false;
 void sensordata_logvalues() {
 	// Generate CSV header after we have queried all slaves once
 	if(slavesensors_dataReady()) {
 		// Only generate/write header the first time data is ready
 		if(!dataWasReady) {
 			char csvHeader[128];
 			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++) {
 				for(uint8_t j=0; j<MAX_NUM_SENSORS; j++) {
 					int16_t tmp = sensordata_get(i, j);
 					if(tmp != -32768) {
 						// FIXME: will the 128 here really provide safety? might want to subtract the strlen
 						snprintf(csvHeader + strlen(csvHeader), 128,"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));
+					}
+				}
+			}
 			// Terminate header string and write to SD card
 			snprintf(csvHeader + strlen(csvHeader), 128,"\r\n");
 			logger_log(csvHeader);
 			dataWasReady = true;
+		}
 		// 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);
 				if(tmp != -32768) {
 					snprintf(logbuf + strlen(logbuf),128," %d,", tmp);
+				}
+			}
+		}
 		snprintf(logbuf + strlen(logbuf),128,"\r\n");
 		logger_log(logbuf);
+	}

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
+ *
  * Ethan Zonca
  * Matthew Kanning
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #include "../config.h"
 #include <avr/io.h>
@@ @@ -84,24 +84,25 @@ char* slavesensors_slavename(uint8_t id) @@
+}
 void slavesensors_network_scan() {
 	serial0_ioff();
 	int atOK;
 	#ifdef DEBUG_OUTPUT
 	serial0_sendString("Beginning network scan...\r\n\r\n");
 	#endif
 	_delay_ms(500); // xbee warmup
 	_delay_ms(200); // xbee warmup
 	wdt_reset();
 	led_on(LED_ACTIVITY);
 	atOK = slavesensors_enterAT();
 	// wait for OK
 	if(atOK == 0)
+	{
 		led_on(LED_CYCLE);
 		serial0_sendString("ATND");
 		serial0_sendChar(0x0D);

master/master/master.c

➞

Show inline comments

@@ @@ -87,29 +87,29 @@ int main(void) @@
 			lastLedCycle = time_millis();
+		}
 		// Periodic: Logging
 		if(time_millis() - lastLog > LOGGER_RATE)
+		{
 			led_on(LED_CYCLE);
 			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();
 			// Write CSV header and log data values
 			sensordata_logvalues();
 			led_off(LED_CYCLE);
 			lastLog = time_millis();
+		}

0 comments (0 inline, 0 general)