Merge pull request #175 from AvSquirrel/ahrsFusion

AHRS: Correct pitch/roll direction. New heading filter.

main/ry835ai.go

@@ -316,13 +316,14 @@ func validateNMEAChecksum(s string) (string, bool) {
 	return s_out, true
 }
 
-// Only count this heading if a "sustained" >10kts is obtained. This filters out a lot of heading
+//  Only count this heading if a "sustained" >7 kts is obtained. This filters out a lot of heading
 //  changes while on the ground and "movement" is really only changes in GPS fix as it settles down.
 //TODO: Some more robust checking above current and last speed.
+//TODO: Dynamic adjust for gain based on groundspeed
 func setTrueCourse(groundSpeed, trueCourse uint16) {
 	if myMPU6050 != nil && globalStatus.RY835AI_connected && globalSettings.AHRS_Enabled {
-		if mySituation.GroundSpeed >= 10 && groundSpeed >= 10 {
+		if mySituation.GroundSpeed >= 7 && groundSpeed >= 7 {
-			myMPU6050.ResetHeading(float64(trueCourse))
+			myMPU6050.ResetHeading(float64(trueCourse), 0.01)
 		}
 	}
 }

mpu6050/mpu6050.go

@@ -31,10 +31,10 @@ type MPU6050 struct {
 	roll_resting  float64
 
 	// For tracking heading (mixing GPS track and the gyro output).
-	heading              float64 // Current heading.
+	heading            float64 // Current heading.
-	gps_track            float64 // Last reading directly from the gyro for comparison with current heading.
+	gps_track          float64 // Last reading directly from the gyro for comparison with current heading.
-	gps_track_valid      bool
+	gps_track_valid    bool
-	heading_when_gps_set float64
+	heading_correction float64
 
 	quit chan struct{}
 }
@@ -97,7 +97,7 @@ func (d *MPU6050) getMPUData() {
 
 	// Convert from radians to degrees.
 	pitch := float64(pr) * (float64(180.0) / math.Pi)
-	roll := float64(rr) * (float64(180.0) / math.Pi)
+	roll := float64(-rr) * (float64(180.0) / math.Pi)
 	heading := float64(hr) * (float64(180.0) / math.Pi)
 	if heading < float64(0.0) {
 		heading = float64(360.0) + heading
@@ -107,12 +107,10 @@ func (d *MPU6050) getMPUData() {
 		d.pitch = pitch
 		d.roll = roll
 
-		// Calculate the change in direction from current and previous IMU reading.
+		// Heading is raw value off the IMU. Without mag compass fusion, need to apply correction bias.
-		if d.gps_track_valid {
+		// Amount of correction is set by ResetHeading() -- doesn't necessarily have to be based off GPS.
-			d.heading = normalizeHeading((heading - d.heading_when_gps_set) + d.gps_track)
+		d.heading = normalizeHeading((heading - d.heading_correction))
-		} else {
+
-			d.heading = heading
-		}
 	} else {
 		//		log.Printf("mpu6050.calculatePitchAndRoll(): mpu.ReadMPU() err: %s\n", err.Error())
 	}
@@ -150,11 +148,29 @@ func (d *MPU6050) Run() {
 }
 
 // Set heading from a known value (usually GPS true heading).
-func (d *MPU6050) ResetHeading(heading float64) {
+func (d *MPU6050) ResetHeading(newHeading float64, gain float64) {
-	log.Printf("reset true heading: %f\n", heading)
+	if gain < 0.001 { // sanitize our inputs!
-	d.gps_track = heading
+		gain = 0.001
-	d.gps_track_valid = true
+	} else if gain > 1 {
-	d.heading_when_gps_set = d.heading
+		gain = 1
+	}
+
+	old_hdg := d.heading // only used for debug log report
+	//newHeading = float64(30*time.Now().Minute()) // demo input for testing
+	newHeading = normalizeHeading(newHeading) // sanitize the inputs
+
+	// By applying gain factor, this becomes a 1st order function that slowly converges on solution.
+	// Time constant is poll rate over gain. With gain of 0.1, convergence to +/-2 deg on a 180 correction difference is about 4 sec; 0.01 converges in 45 sec.
+
+	hdg_corr_bias := float64(d.heading - newHeading) // desired adjustment to heading_correction
+	if hdg_corr_bias > 180 {
+		hdg_corr_bias = hdg_corr_bias - 360
+	} else if hdg_corr_bias < -180 {
+		hdg_corr_bias = hdg_corr_bias + 360
+	}
+	hdg_corr_bias = hdg_corr_bias * gain
+	d.heading_correction = normalizeHeading(d.heading_correction + hdg_corr_bias)
+	log.Printf("Adjusted heading. Old: %f Desired: %f  Adjustment: %f  New: %f\n", old_hdg, newHeading, hdg_corr_bias, d.heading-hdg_corr_bias)
 }
 
 // Close.

web/plates/js/ahrs.js

@@ -212,7 +212,7 @@ void main() { \
 
 		g.mvMatrix.rotate(15, 1, 0, 0); // adjust viewing angle slightly by pitching the airplane up
 
-		g.mvMatrix.rotate(-this.pitch, 1, 0, 0);
+		g.mvMatrix.rotate(this.pitch, 1, 0, 0);
 		g.mvMatrix.rotate(-this.roll, 0, 0, 1);
 		g.mvMatrix.rotate(-this.heading, 0, 1, 0);