From c076bc3e2d47b8299aa21ba1b84f066f7f30b31c Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Mon, 11 Jul 2016 20:11:09 +0100
Subject: [PATCH] Minor build optimisations

---
 src/main/io/display.c           |  8 +++-----
 src/main/io/gps.c               |  5 +++--
 src/main/io/rc_curves.c         |  1 -
 src/main/io/serial.c            |  5 +----
 src/main/sensors/acceleration.c | 12 +++++-------
 src/main/sensors/barometer.c    |  1 -
 src/main/sensors/battery.c      |  4 +---
 src/main/sensors/compass.c      |  1 -
 8 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/main/io/display.c b/src/main/io/display.c
index a61b64f27..1e5eee974 100644
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -17,10 +17,12 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdarg.h>
 #include <string.h>
 
 #include "platform.h"
+
+#ifdef DISPLAY
+
 #include "version.h"
 #include "debug.h"
 
@@ -38,16 +40,12 @@
 #include "common/axis.h"
 #include "common/typeconversion.h"
 
-#ifdef DISPLAY
-
 #include "sensors/battery.h"
 #include "sensors/sensors.h"
 #include "sensors/compass.h"
 #include "sensors/acceleration.h"
 #include "sensors/gyro.h"
 
-#include "rx/rx.h"
-
 #include "io/rc_controls.h"
 
 #include "flight/pid.h"
diff --git a/src/main/io/gps.c b/src/main/io/gps.c
index 3006d0911..cf8e141ae 100755
--- a/src/main/io/gps.c
+++ b/src/main/io/gps.c
@@ -23,6 +23,9 @@
 #include <math.h>
 
 #include "platform.h"
+
+#ifdef GPS
+
 #include "build_config.h"
 #include "debug.h"
 
@@ -50,8 +53,6 @@
 #include "config/runtime_config.h"
 
 
-#ifdef GPS
-
 #define LOG_ERROR        '?'
 #define LOG_IGNORED      '!'
 #define LOG_SKIPPED      '>'
diff --git a/src/main/io/rc_curves.c b/src/main/io/rc_curves.c
index ee2fe326f..89b46522f 100644
--- a/src/main/io/rc_curves.c
+++ b/src/main/io/rc_curves.c
@@ -18,7 +18,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "rx/rx.h"
 #include "io/rc_controls.h"
 #include "io/escservo.h"
 
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index be6372b47..890e21828 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -17,7 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "platform.h"
@@ -36,9 +35,8 @@
 #include "drivers/serial_uart.h"
 #endif
 
-#include "drivers/gpio.h"
 #include "drivers/light_led.h"
- 
+
 #if defined(USE_VCP)
 #include "drivers/serial_usb_vcp.h"
 #endif
@@ -47,7 +45,6 @@
 #include "serial_cli.h"
 #include "serial_msp.h"
 
-#include "config/config.h"
 
 #ifdef TELEMETRY
 #include "telemetry/telemetry.h"
diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c
index da86d37eb..5de9c3fce 100644
--- a/src/main/sensors/acceleration.c
+++ b/src/main/sensors/acceleration.c
@@ -29,11 +29,9 @@
 #include "drivers/accgyro.h"
 #include "drivers/system.h"
 
-#include "sensors/battery.h"
 #include "sensors/sensors.h"
 #include "io/beeper.h"
 #include "sensors/boardalignment.h"
-#include "config/runtime_config.h"
 #include "config/config.h"
 
 #include "sensors/acceleration.h"
@@ -67,12 +65,12 @@ bool isAccelerationCalibrationComplete(void)
     return calibratingA == 0;
 }
 
-bool isOnFinalAccelerationCalibrationCycle(void)
+static bool isOnFinalAccelerationCalibrationCycle(void)
 {
     return calibratingA == 1;
 }
 
-bool isOnFirstAccelerationCalibrationCycle(void)
+static bool isOnFirstAccelerationCalibrationCycle(void)
 {
     return calibratingA == CALIBRATING_ACC_CYCLES;
 }
@@ -83,7 +81,7 @@ void resetRollAndPitchTrims(rollAndPitchTrims_t *rollAndPitchTrims)
     rollAndPitchTrims->values.pitch = 0;
 }
 
-void performAcclerationCalibration(rollAndPitchTrims_t *rollAndPitchTrims)
+static void performAcclerationCalibration(rollAndPitchTrims_t *rollAndPitchTrims)
 {
     static int32_t a[3];
 
@@ -115,7 +113,7 @@ void performAcclerationCalibration(rollAndPitchTrims_t *rollAndPitchTrims)
     calibratingA--;
 }
 
-void performInflightAccelerationCalibration(rollAndPitchTrims_t *rollAndPitchTrims)
+static void performInflightAccelerationCalibration(rollAndPitchTrims_t *rollAndPitchTrims)
 {
     uint8_t axis;
     static int32_t b[3];
@@ -168,7 +166,7 @@ void performInflightAccelerationCalibration(rollAndPitchTrims_t *rollAndPitchTri
     }
 }
 
-void applyAccelerationTrims(flightDynamicsTrims_t *accelerationTrims)
+static void applyAccelerationTrims(flightDynamicsTrims_t *accelerationTrims)
 {
     accSmooth[X] -= accelerationTrims->raw[X];
     accSmooth[Y] -= accelerationTrims->raw[Y];
diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c
index 2d7b44e55..9e428ad7e 100644
--- a/src/main/sensors/barometer.c
+++ b/src/main/sensors/barometer.c
@@ -28,7 +28,6 @@ int32_t BaroAlt = 0;
 
 #include "drivers/barometer.h"
 #include "drivers/system.h"
-#include "config/config.h"
 
 #include "sensors/barometer.h"
 
diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c
index c6e3be93c..59fa7ef9a 100644
--- a/src/main/sensors/battery.c
+++ b/src/main/sensors/battery.c
@@ -32,8 +32,6 @@
 
 #include "sensors/battery.h"
 
-#include "rx/rx.h"
-
 #include "io/rc_controls.h"
 #include "io/beeper.h"
 
@@ -170,7 +168,7 @@ void batteryInit(batteryConfig_t *initialBatteryConfig)
 }
 
 #define ADCVREF 3300   // in mV
-int32_t currentSensorToCentiamps(uint16_t src)
+static int32_t currentSensorToCentiamps(uint16_t src)
 {
     int32_t millivolts;
 
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index cca2328c0..6f6735d0f 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -25,7 +25,6 @@
 #include "drivers/sensor.h"
 #include "drivers/compass.h"
 #include "drivers/compass_hmc5883l.h"
-#include "drivers/gpio.h"
 #include "drivers/light_led.h"
 
 #include "sensors/boardalignment.h"