Ground tools updates:

 New quatosLogDump with options & graphing, now similar to logDump;
 logDump: add records range options, new export fields, fix/improve/include graphing (Windows also), simplify with updated logger module, rename some options;
 logger: store all data in one array indexed by fieldID, add field names arry, remove deprecated storage fields;
 New shared plotter module (uses PLplot) with many options for log graphing;

git-svn-id: http://autoquad.googlecode.com/svn/trunk@433 69e9ae41-46e5-6d7e-5b29-2a8ba9409dbb

Author: [email protected]

Makefile

@@ -67,8 +67,9 @@ loader: $(BUILD_PATH)/loader.o $(BUILD_PATH)/serial.o $(BUILD_PATH)/stmbootloade
 telemetryDump: $(BUILD_PATH)/telemetryDump.o $(BUILD_PATH)/serial.o
 	$(CC) -o $(BUILD_PATH)/telemetryDump $(ALL_CFLAGS) $(BUILD_PATH)/telemetryDump.o $(BUILD_PATH)/serial.o
 
-logDump: $(BUILD_PATH)/logDump.o $(BUILD_PATH)/logger.o $(BUILD_PATH)/logDump_mavlink.o
-	$(CC) -o $(BUILD_PATH)/logDump $(ALL_CFLAGS) $(BUILD_PATH)/logDump.o $(BUILD_PATH)/logger.o $(BUILD_PATH)/logDump_mavlink.o $(WITH_PLPLOT)
+logDump: $(BUILD_PATH)/logDump.o $(BUILD_PATH)/logger.o $(BUILD_PATH)/plotter.o #$(BUILD_PATH)/logDump_mavlink.o
+	$(CC) -o $(BUILD_PATH)/logDump $(ALL_CFLAGS) $(BUILD_PATH)/logDump.o $(BUILD_PATH)/logger.o $(BUILD_PATH)/plotter.o $(WITH_PLPLOT) 
+#$(BUILD_PATH)/logDump_mavlink.o  -DUSE_MAVLINK
 
 batCal: $(BUILD_PATH)/batCal.o $(BUILD_PATH)/logger.o
 	$(CC) -o $(BUILD_PATH)/batCal $(ALL_CFLAGS) $(BUILD_PATH)/batCal.o $(BUILD_PATH)/logger.o $(WITH_PLPLOT)
@@ -79,9 +80,8 @@ quatosTool: $(BUILD_PATH)/quatosTool.o
 escLogDump: $(BUILD_PATH)/escLogDump.o
 	$(CC) -o $(BUILD_PATH)/escLogDump $(ALL_CFLAGS) $(BUILD_PATH)/escLogDump.o
 
-quatosLogDump: $(BUILD_PATH)/quatosLogDump.o
-	$(CC) -o $(BUILD_PATH)/quatosLogDump $(ALL_CFLAGS) $(BUILD_PATH)/quatosLogDump.o
-
+quatosLogDump: $(BUILD_PATH)/quatosLogDump.o $(BUILD_PATH)/plotter.o
+	$(CC) -o $(BUILD_PATH)/quatosLogDump $(ALL_CFLAGS) $(BUILD_PATH)/quatosLogDump.o $(BUILD_PATH)/plotter.o $(WITH_PLPLOT)
 
 
 $(BUILD_PATH)/loader.o: loader.c serial.h stmbootloader.h
@@ -96,8 +96,9 @@ $(BUILD_PATH)/serial.o: serial.c serial.h
 $(BUILD_PATH)/telemetryDump.o: telemetryDump.c telemetryDump.h
 	$(CC) -c $(ALL_CFLAGS) telemetryDump.c -o $@
 
-$(BUILD_PATH)/logDump.o: logDump.c logDump_templates.h logDump.h logger.h logDump_mavlink.h
-	$(CC) -c $(ALL_CFLAGS) logDump.c -o $@ -I$(INCPATH) -I$(MAVLINK) $(WITH_PLPLOT)
+$(BUILD_PATH)/logDump.o: logDump.cc logDump_templates.h logDump.h logger.h plotter.h #logDump_mavlink.h
+	$(CC) -c $(ALL_CFLAGS) logDump.cc -o $@ -I$(INCPATH) $(WITH_PLPLOT) 
+#-I$(MAVLINK) -DUSE_MAVLINK
 
 $(BUILD_PATH)/logDump_mavlink.o: logDump_mavlink.cpp logDump_mavlink.h
 	$(CC) -c $(ALL_CFLAGS) logDump_mavlink.cpp -o $@ -I$(MAVLINK)
@@ -111,11 +112,15 @@ $(BUILD_PATH)/quatosTool.o: quatosTool.cc
 $(BUILD_PATH)/logger.o: logger.c logger.h
 	$(CC) -c $(ALL_CFLAGS) logger.c -o $@
 
+$(BUILD_PATH)/plotter.o: plotter.cc plotter.h
+	$(CC) -c $(ALL_CFLAGS) plotter.cc -o $@  $(WITH_PLPLOT)
+	cp plotter*.pal $(BUILD_PATH)/
+
 $(BUILD_PATH)/escLogDump.o: escLogDump.c
 	$(CC) -c $(ALL_CFLAGS) escLogDump.c -o $@
 
-$(BUILD_PATH)/quatosLogDump.o: quatosLogDump.c
-	$(CC) -c $(ALL_CFLAGS) quatosLogDump.c -o $@
+$(BUILD_PATH)/quatosLogDump.o: quatosLogDump.cc plotter.h
+	$(CC) -c $(ALL_CFLAGS) quatosLogDump.cc -o $@
 
 clean:
 	rm -f $(BUILD_PATH)/loader $(BUILD_PATH)/telemetryDump $(BUILD_PATH)/logDump $(BUILD_PATH)/batCal $(BUILD_PATH)/quatosTool $(BUILD_PATH)/*.o $(BUILD_PATH)/*.exe

batCal.cc

@@ -59,13 +59,14 @@ void batCalPlot(MatrixXd &ab) {
 	}
 
 	plinit();
+	plschr(0.0, 0.75);
 	plcol0(15);
 	plenv(100.0, 0.0, yMin, yMax, 0, 0);
 	pllab("SOC (%)", "Volts", "Battery Voltage vs State of Charge");
 
 	sprintf(s, "y = %5.1f + %5.1f*x + %5.1f*x^2 + %5.1f*x^3 + %5.1f*x^4 + %5.1f*x^5",
 		ab(0, 0), ab(1, 0), ab(2, 0), ab(3, 0), ab(4, 0), ab(5, 0));
-        plptex(95.0, yMax-(yMax-yMin)/10.0, -10, 0, 0, s);
+    plptex(95.0, yMax-(yMax-yMin)/10.0, -10, 0, 0, s);
 	printf("%s\n", s);
 
 	// plot data
@@ -152,12 +153,12 @@ int batCalLoadLog(char *logFile) {
 	else {
 		numRecs = 0;
 		while (loggerReadEntry(lf, &l) != EOF) {
-			if (l.vIn < zeroSOC)
+			if (l.data[LOG_ADC_VIN] < zeroSOC)
 				break;
 
-			if (l.throttle > 0) {
+			if (l.data[LOG_MOT_THROTTLE] > 0) {
 				logData = (logData_t *)realloc(logData, sizeof(logData_t) * (numRecs+1));
-				logData[numRecs].vIn = l.vIn;
+				logData[numRecs].vIn = l.data[LOG_ADC_VIN];
 				numRecs++;
 			}
 		}