From 101ce74071820352926eb4d201f95da6dac726f4 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 18 Feb 2019 20:38:31 +1100 Subject: [PATCH] Rover: Rally no longer takes ahrs in constructor --- APMrover2/AP_Rally.h | 2 +- APMrover2/Parameters.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/APMrover2/AP_Rally.h b/APMrover2/AP_Rally.h index 16574756c9..100be3cd17 100644 --- a/APMrover2/AP_Rally.h +++ b/APMrover2/AP_Rally.h @@ -20,7 +20,7 @@ class AP_Rally_Rover : public AP_Rally { public: - AP_Rally_Rover(AP_AHRS &ahrs) : AP_Rally(ahrs) { } + AP_Rally_Rover() : AP_Rally() { } /* Do not allow copies */ AP_Rally_Rover(const AP_Rally_Rover &other) = delete; diff --git a/APMrover2/Parameters.cpp b/APMrover2/Parameters.cpp index cc6f367f78..f060ae0b26 100644 --- a/APMrover2/Parameters.cpp +++ b/APMrover2/Parameters.cpp @@ -733,7 +733,6 @@ ParametersG2::ParametersG2(void) proximity(rover.serial_manager), avoid(rover.ahrs, fence, rover.g2.proximity, &rover.g2.beacon), follow(), - rally(rover.ahrs), windvane(), airspeed() {