From 4dee6b7dddf27e2e39f97b8d00e7d9a206db5228 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Wed, 25 Jan 2017 11:34:20 +0000
Subject: [PATCH] Fixed up unit tests and ROM sizes

---
 src/main/target/NAZE/target.h              |  3 +--
 src/test/unit/parameter_groups_unittest.cc | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index b9cc396a3a..315faf2fe5 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -101,8 +101,7 @@
 #define ACC_MPU6500_ALIGN       CW0_DEG
 
 #define BARO
-#define USE_BARO_MS5611
-#define USE_BARO_BMP085
+#define USE_BARO_MS5611 // needed for Flip32 board
 #define USE_BARO_BMP280
 
 /*
diff --git a/src/test/unit/parameter_groups_unittest.cc b/src/test/unit/parameter_groups_unittest.cc
index df45a1829c..a48e98e055 100644
--- a/src/test/unit/parameter_groups_unittest.cc
+++ b/src/test/unit/parameter_groups_unittest.cc
@@ -22,10 +22,8 @@
 #include <limits.h>
 
 extern "C" {
-    #include "build/debug.h"
-
     #include <platform.h>
-
+    #include "build/debug.h"
     #include "config/parameter_group.h"
     #include "config/parameter_group_ids.h"
 
@@ -49,7 +47,7 @@ PG_RESET_TEMPLATE(motorConfig_t, motorConfig,
 
 TEST(ParameterGroupsfTest, Test_pgResetAll)
 {
-    memset(motorConfig(), 0, sizeof(motorConfig_t));
+    memset(motorConfigMutable(), 0, sizeof(motorConfig_t));
     pgResetAll(0);
     EXPECT_EQ(1150, motorConfig()->minthrottle);
     EXPECT_EQ(1850, motorConfig()->maxthrottle);
@@ -59,7 +57,7 @@ TEST(ParameterGroupsfTest, Test_pgResetAll)
 
 TEST(ParameterGroupsfTest, Test_pgFind)
 {
-    memset(motorConfig(), 0, sizeof(motorConfig_t));
+    memset(motorConfigMutable(), 0, sizeof(motorConfig_t));
     const pgRegistry_t *pgRegistry = pgFind(PG_MOTOR_CONFIG);
     pgResetCurrent(pgRegistry);
     EXPECT_EQ(1150, motorConfig()->minthrottle);
@@ -69,7 +67,7 @@ TEST(ParameterGroupsfTest, Test_pgFind)
 
     motorConfig_t motorConfig2;
     memset(&motorConfig2, 0, sizeof(motorConfig_t));
-    motorConfig()->motorPwmRate = 500;
+    motorConfigMutable()->motorPwmRate = 500;
     pgStore(pgRegistry, &motorConfig2, sizeof(motorConfig_t), 0);
     EXPECT_EQ(1150, motorConfig2.minthrottle);
     EXPECT_EQ(1850, motorConfig2.maxthrottle);