Fix after rebase

src/main/drivers/bus_i2c_hal.c

@@ -20,8 +20,6 @@
 
 #include <platform.h>
 
-#include "build_config.h"
-
 #include "io.h"
 #include "system.h"
 

src/main/drivers/bus_spi_hal.c

@@ -20,8 +20,6 @@
 
 #include <platform.h>
 
-#include "build_config.h"
-
 #include "bus_spi.h"
 #include "dma.h"
 #include "io.h"

src/main/drivers/gpio_stm32f7xx.c

@@ -20,8 +20,6 @@
 
 #include "platform.h"
 
-#include "build_config.h"
-
 #include "gpio.h"
 
 #define MODE_OFFSET 0

src/main/drivers/serial_uart_hal.c

@@ -26,7 +26,7 @@
 
 #include "platform.h"
 
-#include "build_config.h"
+#include "build/build_config.h"
 
 #include "common/utils.h"
 #include "io.h"
@@ -283,7 +283,7 @@ uint32_t uartTotalRxBytesWaiting(serialPort_t *instance)
     }
 }
 
-uint8_t uartTotalTxBytesFree(serialPort_t *instance)
+uint32_t uartTotalTxBytesFree(serialPort_t *instance)
 {
     uartPort_t *s = (uartPort_t*)instance;
 

src/main/drivers/serial_usb_vcp_hal.c

@@ -16,19 +16,18 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <stdbool.h>
-#include <string.h>
 
 #include "platform.h"
 
-#include "build_config.h"
+#include "build/build_config.h"
+
 #include "common/utils.h"
-#include "drivers/io.h"
+#include "io.h"
 
 #include "vcp_hal/usbd_cdc_interface.h"
 
-#include "drivers/system.h"
+#include "system.h"
 
 #include "serial.h"
 #include "serial_usb_vcp.h"
@@ -39,8 +38,7 @@
 static vcpPort_t vcpPort;
 USBD_HandleTypeDef USBD_Device;
 
-
-void usbVcpSetBaudRate(serialPort_t *instance, uint32_t baudRate)
+static void usbVcpSetBaudRate(serialPort_t *instance, uint32_t baudRate)
 {
     UNUSED(instance);
     UNUSED(baudRate);
@@ -48,7 +46,7 @@ void usbVcpSetBaudRate(serialPort_t *instance, uint32_t baudRate)
     // TODO implement
 }
 
-void usbVcpSetMode(serialPort_t *instance, portMode_t mode)
+static void usbVcpSetMode(serialPort_t *instance, portMode_t mode)
 {
     UNUSED(instance);
     UNUSED(mode);
@@ -56,20 +54,20 @@ void usbVcpSetMode(serialPort_t *instance, portMode_t mode)
     // TODO implement
 }
 
-bool isUsbVcpTransmitBufferEmpty(serialPort_t *instance)
+static bool isUsbVcpTransmitBufferEmpty(serialPort_t *instance)
 {
     UNUSED(instance);
     return true;
 }
 
-uint32_t usbVcpAvailable(serialPort_t *instance)
+static uint32_t usbVcpAvailable(serialPort_t *instance)
 {
     UNUSED(instance);
     uint32_t receiveLength = vcpAvailable();
     return receiveLength;
 }
 
-uint8_t usbVcpRead(serialPort_t *instance)
+static uint8_t usbVcpRead(serialPort_t *instance)
 {
     UNUSED(instance);
     return vcpRead();
@@ -134,7 +132,7 @@ static void usbVcpBeginWrite(serialPort_t *instance)
     port->buffering = true;
 }
 
-uint8_t usbTxBytesFree()
+uint32_t usbTxBytesFree()
 {
     // Because we block upon transmit and don't buffer bytes, our "buffer" capacity is effectively unlimited.
     return 255;
@@ -156,9 +154,9 @@ static const struct serialPortVTable usbVTable[] = {
         .serialSetBaudRate = usbVcpSetBaudRate,
         .isSerialTransmitBufferEmpty = isUsbVcpTransmitBufferEmpty,
         .setMode = usbVcpSetMode,
+        .writeBuf = usbVcpWriteBuf,
         .beginWrite = usbVcpBeginWrite,
-        .endWrite = usbVcpEndWrite,
-        .writeBuf = usbVcpWriteBuf
+        .endWrite = usbVcpEndWrite
     }
 };
 

src/main/drivers/system_stm32f7xx.c

@@ -22,20 +22,12 @@
 
 #include "platform.h"
 
-#include "gpio.h"
+#include "accgyro_mpu.h"
+#include "exti.h"
 #include "nvic.h"
 #include "system.h"
 
-
 #include "exti.h"
-#include "debug.h"
-#include "sensor.h"
-#include "accgyro.h"
-#include "accgyro_mpu.h"
-#include "accgyro_spi_mpu6000.h"
-#include "accgyro_mpu6500.h"
-#include "accgyro_spi_mpu9250.h"
-
 
 #define AIRCR_VECTKEY_MASK    ((uint32_t)0x05FA0000)
 void SystemClock_Config(void);
@@ -181,7 +173,6 @@ void systemInit(void)
     // Init cycle counter
     cycleCounterInit();
 
-    memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
     // SysTick
     //SysTick_Config(SystemCoreClock / 1000);
     HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);

src/main/drivers/timer_hal.c

@@ -20,12 +20,14 @@
 #include <string.h>
 
 #include "platform.h"
+
+#include "build/atomic.h"
+
 #include "common/utils.h"
-#include "common/atomic.h"
 
 #include "nvic.h"
 
-#include "gpio.h"
+#include "io.h"
 #include "rcc.h"
 #include "system.h"
 

src/main/drivers/timer_stm32f7xx.c

@@ -5,6 +5,13 @@
   http://www.st.com/software_license_agreement_liberty_v2
 */
 
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "platform.h"
+
+#include "common/utils.h"
+
 #include "stm32f7xx.h"
 #include "timer.h"
 #include "rcc.h"

src/main/target/ANYFCF7/target.c

@@ -15,11 +15,12 @@
  * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdbool.h>
 #include <stdint.h>
 
 #include <platform.h>
+#include "drivers/io.h"
 #include "drivers/pwm_mapping.h"
+#include "drivers/timer.h"
 
 const uint16_t multiPPM[] = {
     PWM1  | (MAP_TO_PPM_INPUT << 8),     // PPM input

src/main/target/ANYFCF7/target.h

@@ -42,7 +42,6 @@
 
 // MPU6000 interrupts
 #define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
 #define MPU_INT_EXTI PC4
 #define USE_EXTI