From 740234c909531ec170aa7b93ed1132efb22eca24 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Thu, 11 Jan 2018 09:35:08 +0000
Subject: [PATCH] Fix F1 builds

---
 src/main/fc/config.c                   | 1 +
 src/main/rx/nrf24_cx10.c               | 4 ++--
 src/main/rx/nrf24_h8_3d.c              | 4 ++--
 src/main/rx/nrf24_inav.c               | 2 +-
 src/main/rx/nrf24_syma.c               | 2 +-
 src/main/rx/nrf24_v202.c               | 2 +-
 src/main/sensors/current.c             | 2 ++
 src/main/target/CJMCU/initialisation.c | 7 +++++--
 src/main/target/NAZE/config.c          | 3 +++
 src/main/target/NAZE/initialisation.c  | 9 ++++++---
 10 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 920a761a27..37eac69e14 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -54,6 +54,7 @@
 #include "rx/rx.h"
 
 #include "sensors/acceleration.h"
+#include "sensors/battery.h"
 #include "sensors/gyro.h"
 
 #ifndef USE_OSD_SLAVE
diff --git a/src/main/rx/nrf24_cx10.c b/src/main/rx/nrf24_cx10.c
index f51dba595a..88c056e05e 100644
--- a/src/main/rx/nrf24_cx10.c
+++ b/src/main/rx/nrf24_cx10.c
@@ -29,8 +29,8 @@
 #include "build/build_config.h"
 
 #include "drivers/io.h"
-#include "drivers/rx_nrf24l01.h"
-#include "drivers/rx_xn297.h"
+#include "drivers/rx/rx_nrf24l01.h"
+#include "drivers/rx/rx_xn297.h"
 #include "drivers/time.h"
 
 #include "rx/rx.h"
diff --git a/src/main/rx/nrf24_h8_3d.c b/src/main/rx/nrf24_h8_3d.c
index 54a9938f24..9b6b46ddee 100644
--- a/src/main/rx/nrf24_h8_3d.c
+++ b/src/main/rx/nrf24_h8_3d.c
@@ -31,8 +31,8 @@
 #include "common/utils.h"
 
 #include "drivers/io.h"
-#include "drivers/rx_nrf24l01.h"
-#include "drivers/rx_xn297.h"
+#include "drivers/rx/rx_nrf24l01.h"
+#include "drivers/rx/rx_xn297.h"
 #include "drivers/time.h"
 
 #include "rx/rx.h"
diff --git a/src/main/rx/nrf24_inav.c b/src/main/rx/nrf24_inav.c
index 0bd9bb5776..1c15fca17e 100644
--- a/src/main/rx/nrf24_inav.c
+++ b/src/main/rx/nrf24_inav.c
@@ -29,7 +29,7 @@
 #include "common/utils.h"
 
 #include "drivers/io.h"
-#include "drivers/rx_nrf24l01.h"
+#include "drivers/rx/rx_nrf24l01.h"
 #include "drivers/time.h"
 
 #include "rx/rx.h"
diff --git a/src/main/rx/nrf24_syma.c b/src/main/rx/nrf24_syma.c
index cd3498b288..a7f62ca616 100644
--- a/src/main/rx/nrf24_syma.c
+++ b/src/main/rx/nrf24_syma.c
@@ -29,7 +29,7 @@
 #include "build/build_config.h"
 
 #include "drivers/io.h"
-#include "drivers/rx_nrf24l01.h"
+#include "drivers/rx/rx_nrf24l01.h"
 #include "drivers/time.h"
 
 #include "rx/rx.h"
diff --git a/src/main/rx/nrf24_v202.c b/src/main/rx/nrf24_v202.c
index f542b7dbe2..632a0b3ca0 100644
--- a/src/main/rx/nrf24_v202.c
+++ b/src/main/rx/nrf24_v202.c
@@ -31,7 +31,7 @@
 #include "common/utils.h"
 
 #include "drivers/io.h"
-#include "drivers/rx_nrf24l01.h"
+#include "drivers/rx/rx_nrf24l01.h"
 #include "drivers/time.h"
 
 #include "rx/rx.h"
diff --git a/src/main/sensors/current.c b/src/main/sensors/current.c
index fbb314a519..68705ad7d4 100644
--- a/src/main/sensors/current.c
+++ b/src/main/sensors/current.c
@@ -112,11 +112,13 @@ static int32_t currentMeterADCToCentiamps(const uint16_t src)
     return centiAmps; // Returns Centiamps to maintain compatability with the rest of the code
 }
 
+#if defined(USE_ADC) || defined(USE_VIRTUAL_CURRENT_METER)
 static void updateCurrentmAhDrawnState(currentMeterMAhDrawnState_t *state, int32_t amperageLatest, int32_t lastUpdateAt)
 {
     state->mAhDrawnF = state->mAhDrawnF + (amperageLatest * lastUpdateAt / (100.0f * 1000 * 3600));
     state->mAhDrawn = state->mAhDrawnF;
 }
+#endif
 
 //
 // ADC
diff --git a/src/main/target/CJMCU/initialisation.c b/src/main/target/CJMCU/initialisation.c
index 0eecbd4a44..abdb42171d 100644
--- a/src/main/target/CJMCU/initialisation.c
+++ b/src/main/target/CJMCU/initialisation.c
@@ -23,20 +23,23 @@
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
 #include "io/serial.h"
+#include "pg/bus_i2c.h"
+#include "pg/bus_spi.h"
+
 
 extern void spiPreInit(void); // XXX In fc/fc_init.c
 
 void targetBusInit(void)
 {
 #if defined(USE_SPI) && defined(USE_SPI_DEVICE_1)
-    spiPinConfigure();
+    spiPinConfigure(spiPinConfig());
     spiPreInit();
     spiInit(SPIDEV_1);
 #endif
 
     if (!doesConfigurationUsePort(SERIAL_PORT_USART3)) {
         serialRemovePort(SERIAL_PORT_USART3);
-        i2cHardwareConfigure();
+        i2cHardwareConfigure(i2cConfig());
         i2cInit(I2C_DEVICE);
     }
 }
diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c
index 5aa80ec562..2a5d656368 100644
--- a/src/main/target/NAZE/config.c
+++ b/src/main/target/NAZE/config.c
@@ -39,6 +39,9 @@
 #include "sensors/compass.h"
 #include "sensors/gyro.h"
 
+#include "pg/beeper_dev.h"
+#include "pg/flash.h"
+
 #include "hardware_revision.h"
 
 void targetConfiguration(void)
diff --git a/src/main/target/NAZE/initialisation.c b/src/main/target/NAZE/initialisation.c
index 406bc4f579..c99ac4f691 100644
--- a/src/main/target/NAZE/initialisation.c
+++ b/src/main/target/NAZE/initialisation.c
@@ -24,13 +24,16 @@
 #include "drivers/bus_spi.h"
 #include "io/serial.h"
 #include "hardware_revision.h"
+#include "pg/bus_i2c.h"
+#include "pg/bus_spi.h"
+
 
 extern void spiPreInit(void); // XXX In fc/fc_init.c
 
 void targetBusInit(void)
 {
 #ifdef USE_SPI
-    spiPinConfigure();
+    spiPinConfigure(spiPinConfig());
     spiPreInit();
 #ifdef USE_SPI_DEVICE_2
     spiInit(SPIDEV_2);
@@ -42,11 +45,11 @@ void targetBusInit(void)
 
         if (!doesConfigurationUsePort(SERIAL_PORT_USART3)) {
             serialRemovePort(SERIAL_PORT_USART3);
-            i2cHardwareConfigure();
+            i2cHardwareConfigure(i2cConfig());
             i2cInit(I2C_DEVICE);
         }
     } else {
-        i2cHardwareConfigure();
+        i2cHardwareConfigure(i2cConfig());
         i2cInit(I2C_DEVICE);
     }
 }