[gentlenav] r3676 committed - MatrixPilot_trunk: last of my merge of helical turns support as recent...

[gent...@googlecode.com]

Revision: 3676
Author: robert.d...@gmail.com
Date: Thu Aug 20 12:59:48 2015 UTC
Log: MatrixPilot_trunk: last of my merge of helical turns support as
recently tested in branch MatrixPilot_helicalTurns.
https://code.google.com/p/gentlenav/source/detail?r=3676

Modified:
/trunk/Tools/flight_analyzer/matrixpilot_lib.py
/trunk/libUDB/libUDB.c
/trunk/libUDB/magnetometer.c

=======================================
--- /trunk/Tools/flight_analyzer/matrixpilot_lib.py Sat Aug 1 04:50:37
2015 UTC
+++ /trunk/Tools/flight_analyzer/matrixpilot_lib.py Thu Aug 20 12:59:48
2015 UTC
@@ -1190,10 +1190,10 @@
return "Error"
else :
pass
- match = re.match(".*:fgs([-0-9]*?):",line) # flags from
defines.h
+ match = re.match(".*:fgs([A-F0-9]*?):",line) # flags from
defines.h; Match hex letters
if match :
try:
- self.flags = int(match.group(1))
+ self.flags = int(match.group(1),16) # Interpret as
base 16 hex
except:
print "Corrupt flag values in line", line_no
return "Error"
=======================================
--- /trunk/libUDB/libUDB.c Wed May 6 15:02:33 2015 UTC
+++ /trunk/libUDB/libUDB.c Thu Aug 20 12:59:48 2015 UTC
@@ -53,6 +53,10 @@
//#include "../MatrixPilot/telemetry.h"
//#include "../libDCM/gpsParseCommon.h"

+// TODO: do something about these declarations being here - RobD
+void udb_init_ADC(void);
+void udb_init_clock(void);
+
union udb_fbts_byte udb_flags;

// Functions only included with nv memory.
=======================================
--- /trunk/libUDB/magnetometer.c Sat Aug 1 04:50:37 2015 UTC
+++ /trunk/libUDB/magnetometer.c Thu Aug 20 12:59:48 2015 UTC
@@ -35,11 +35,11 @@
int16_t magFieldRaw[3];
int16_t magMessage = 0; // message type

-static magnetometer_callback_funcptr magnetometer_callback = NULL;
-
#if (MAG_YAW_DRIFT == 1)
//#if (MAG_YAW_DRIFT == 1 && HILSIM != 1)

+static magnetometer_callback_funcptr magnetometer_callback = NULL;
+
#define HMC5883_COMMAND 0x3C

#define USE_HMC5883L_ON_I2C1 0