Split time declarations out of system.h into time.h

src/main/blackbox/blackbox.c

@@ -45,7 +45,7 @@
 #include "drivers/pwm_rx.h"
 #include "drivers/sensor.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"

src/main/blackbox/blackbox_io.c

@@ -38,7 +38,7 @@
 
 #include "drivers/gpio.h"
 #include "drivers/sensor.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/serial.h"
 #include "drivers/compass.h"
 #include "drivers/timer.h"

src/main/cms/cms.c

@@ -43,6 +43,7 @@
 #include "common/typeconversion.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/cms/cms_menu_blackbox.c

@@ -36,7 +36,7 @@
 
 #include "config/feature.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 

src/main/cms/cms_menu_builtin.c

@@ -30,7 +30,7 @@
 
 #include "build/version.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "cms/cms.h"
 #include "cms/cms_types.h"

src/main/drivers/accgyro_l3g4200d.c

@@ -21,6 +21,7 @@
 #include <platform.h>
 
 #include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 
 #include "common/maths.h"

src/main/drivers/accgyro_l3gd20.c

@@ -24,7 +24,7 @@
 
 #include "common/maths.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "bus_spi.h"
 

src/main/drivers/accgyro_lsm303dlhc.c

@@ -27,7 +27,7 @@
 #include "common/maths.h"
 #include "common/axis.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "bus_i2c.h"
 

src/main/drivers/accgyro_mma845x.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "bus_i2c.h"
 

src/main/drivers/accgyro_mpu.c

@@ -31,6 +31,7 @@
 #include "nvic.h"
 
 #include "system.h"
+#include "time.h"
 #include "io.h"
 #include "exti.h"
 #include "bus_i2c.h"

src/main/drivers/accgyro_mpu3050.c

@@ -23,6 +23,7 @@
 #include "common/maths.h"
 
 #include "system.h"
+#include "time.h"
 #include "exti.h"
 #include "bus_i2c.h"
 

src/main/drivers/accgyro_mpu6050.c

@@ -28,7 +28,7 @@
 
 #include "nvic.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 #include "exti.h"
 #include "bus_i2c.h"

src/main/drivers/accgyro_mpu6500.c

@@ -25,6 +25,7 @@
 #include "common/maths.h"
 
 #include "system.h"
+#include "time.h"
 #include "exti.h"
 #include "gpio.h"
 #include "gyro_sync.h"

src/main/drivers/accgyro_spi_mpu6000.c

@@ -31,6 +31,7 @@
 #include "common/maths.h"
 
 #include "system.h"
+#include "time.h"
 #include "io.h"
 #include "exti.h"
 #include "bus_spi.h"

src/main/drivers/accgyro_spi_mpu6500.c

@@ -24,6 +24,7 @@
 #include "common/maths.h"
 
 #include "system.h"
+#include "time.h"
 #include "exti.h"
 #include "io.h"
 #include "bus_spi.h"

src/main/drivers/accgyro_spi_mpu9250.c

@@ -36,6 +36,7 @@
 #include "io.h"
 
 #include "system.h"
+#include "time.h"
 #include "exti.h"
 #include "bus_spi.h"
 #include "gyro_sync.h"

src/main/drivers/adc.c

@@ -23,7 +23,7 @@
 #include "build/build_config.h"
 #include "build/debug.h"
 
-#include "system.h"
+#include "time.h"
 
 #include "adc.h"
 #include "adc_impl.h"

src/main/drivers/adc_stm32f10x.c

@@ -25,7 +25,7 @@
 
 #include "build/build_config.h"
 
-#include "system.h"
+#include "time.h"
 #include "sensor.h"
 #include "accgyro.h"
 #include "adc.h"

src/main/drivers/adc_stm32f30x.c

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "platform.h"
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 
 #include "sensor.h"

src/main/drivers/adc_stm32f4xx.c

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "platform.h"
-#include "system.h"
+#include "time.h"
 
 #include "io.h"
 #include "io_impl.h"

src/main/drivers/adc_stm32f7xx.c

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "platform.h"
-#include "system.h"
+#include "time.h"
 
 #include "io.h"
 #include "io_impl.h"

src/main/drivers/barometer_bmp085.c

@@ -25,7 +25,7 @@
 #include "barometer.h"
 
 #include "gpio.h"
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 #include "nvic.h"
 #include "exti.h"

src/main/drivers/barometer_bmp280.c

@@ -24,7 +24,7 @@
 
 #include "barometer.h"
 
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 
 #include "barometer_bmp280.h"

src/main/drivers/barometer_ms5611.c

@@ -25,7 +25,7 @@
 #include "barometer.h"
 #include "barometer_spi_ms5611.h"
 
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 
 // MS5611, Standard address 0x77

src/main/drivers/bus_i2c_hal.c

@@ -21,7 +21,7 @@
 #include <platform.h>
 
 #include "io.h"
-#include "system.h"
+#include "time.h"
 
 #include "bus_i2c.h"
 #include "nvic.h"

src/main/drivers/bus_i2c_stm32f10x.c

@@ -24,7 +24,7 @@
 #include "build/atomic.h"
 
 #include "io.h"
-#include "system.h"
+#include "time.h"
 
 #include "bus_i2c.h"
 #include "nvic.h"

src/main/drivers/bus_i2c_stm32f30x.c

@@ -20,7 +20,7 @@
 
 #include <platform.h>
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "io_impl.h"
 #include "rcc.h"

src/main/drivers/compass_ak8963.c

@@ -31,7 +31,7 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 #include "bus_spi.h"
 

src/main/drivers/compass_ak8975.c

@@ -30,7 +30,7 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 #include "bus_i2c.h"
 

src/main/drivers/compass_hmc5883l.c

@@ -29,7 +29,7 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "system.h"
+#include "time.h"
 #include "nvic.h"
 #include "io.h"
 #include "exti.h"

src/main/drivers/compass_ist8310.c

@@ -29,7 +29,7 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "system.h"
+#include "time.h"
 #include "nvic.h"
 #include "io.h"
 #include "exti.h"

src/main/drivers/compass_mag3110.c

@@ -30,7 +30,7 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 #include "bus_i2c.h"
 

src/main/drivers/display_ug2864hsweg01.c

@@ -21,7 +21,7 @@
 #include "platform.h"
 
 #include "bus_i2c.h"
-#include "system.h"
+#include "time.h"
 
 #include "display_ug2864hsweg01.h"
 

src/main/drivers/flash_m25p16.c

@@ -25,7 +25,7 @@
 #include "flash_m25p16.h"
 #include "io.h"
 #include "bus_spi.h"
-#include "system.h"
+#include "time.h"
 
 #define M25P16_INSTRUCTION_RDID             0x9F
 #define M25P16_INSTRUCTION_READ_BYTES       0x03

src/main/drivers/gps_i2cnav.c

@@ -26,7 +26,7 @@
 #include "gps_i2cnav.h"
 
 #include "gpio.h"
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 
 #ifndef GPS_I2C_INSTANCE

src/main/drivers/io_pca9685.c

@@ -4,7 +4,7 @@
 #include <platform.h>
 
 #include "gpio.h"
-#include "system.h"
+#include "time.h"
 #include "bus_i2c.h"
 
 #include "common/maths.h"

src/main/drivers/light_led_stm32f10x.c

@@ -23,7 +23,7 @@
 
 #include "common/utils.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 
 #include "light_led.h"

src/main/drivers/light_ws2811strip_hal.c

@@ -27,7 +27,7 @@
 #include "nvic.h"
 #include "dma.h"
 #include "io.h"
-#include "system.h"
+#include "time.h"
 #include "rcc.h"
 #include "timer.h"
 

src/main/drivers/light_ws2811strip_stm32f4xx.c

@@ -27,7 +27,7 @@
 #include "nvic.h"
 #include "dma.h"
 #include "io.h"
-#include "system.h"
+#include "time.h"
 #include "rcc.h"
 #include "timer.h"
 

src/main/drivers/logging.c

@@ -27,7 +27,7 @@
 
 #ifdef BOOTLOG
 
-#include "system.h"
+#include "time.h"
 
 static bootLogEntry_t   events[MAX_BOOTLOG_ENTRIES];
 static int              eventCount;

src/main/drivers/max7456.c

@@ -30,7 +30,7 @@
 #include "drivers/bus_spi.h"
 #include "drivers/light_led.h"
 #include "drivers/io.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
 

src/main/drivers/pitotmeter_ms4525.c

@@ -22,7 +22,7 @@
 
 #include "bus_i2c.h"
 #include "pitotmeter.h"
-#include "system.h"
+#include "time.h"
 
 #include "common/utils.h"
 

src/main/drivers/pwm_rx.c

@@ -27,7 +27,7 @@
 
 #include "common/utils.h"
 
-#include "system.h"
+#include "time.h"
 
 #include "nvic.h"
 #include "io.h"

src/main/drivers/rx_nrf24l01.c

@@ -28,7 +28,7 @@
 
 #include "build/build_config.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 #include "io.h"
 #include "io_impl.h"

src/main/drivers/rx_spi.c

@@ -28,7 +28,7 @@
 
 #include "build/build_config.h"
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 #include "io.h"
 #include "io_impl.h"

src/main/drivers/sdcard.c

@@ -27,7 +27,7 @@
 #include "dma.h"
 
 #include "bus_spi.h"
-#include "system.h"
+#include "time.h"
 
 #include "sdcard.h"
 #include "sdcard_standard.h"

src/main/drivers/serial_softserial.c

@@ -28,7 +28,7 @@
 #include "common/utils.h"
 
 #include "nvic.h"
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "timer.h"
 

src/main/drivers/serial_uart_stm32f10x.c

@@ -27,7 +27,7 @@
 
 #include <platform.h>
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "nvic.h"
 #include "dma.h"

src/main/drivers/serial_uart_stm32f30x.c

@@ -28,7 +28,7 @@
 
 #include <platform.h>
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "nvic.h"
 #include "dma.h"

src/main/drivers/serial_uart_stm32f4xx.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "rcc.h"
 #include "nvic.h"

src/main/drivers/serial_uart_stm32f7xx.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 #include "rcc.h"
 #include "nvic.h"

src/main/drivers/serial_usb_vcp.c

@@ -37,7 +37,7 @@ USBD_HandleTypeDef USBD_Device;
 #include "hw_config.h"
 #endif
 
-#include "system.h"
+#include "time.h"
 
 #include "serial.h"
 #include "serial_usb_vcp.h"

src/main/drivers/sonar_hcsr04.c

@@ -25,7 +25,7 @@
 #include "build/build_config.h"
 
 
-#include "system.h"
+#include "time.h"
 #include "exti.h"
 #include "io.h"
 #include "gpio.h"

src/main/drivers/sonar_srf10.c

@@ -25,7 +25,7 @@
 #include "build/build_config.h"
 
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/bus_i2c.h"
 
 #include "drivers/rangefinder.h"

src/main/drivers/sound_beeper.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#include "system.h"
+#include "time.h"
 #include "io.h"
 
 #include "sound_beeper.h"

src/main/drivers/sound_beeper_stm32f10x.c

@@ -24,7 +24,7 @@
 #include "build/build_config.h"
 
 
-#include "system.h"
+#include "time.h"
 #include "gpio.h"
 
 #include "sound_beeper.h"

src/main/drivers/system.c

@@ -28,6 +28,7 @@
 #include "build/build_config.h"
 
 #include "system.h"
+#include "time.h"
 
 #ifndef EXTI_CALLBACK_HANDLER_COUNT
 #define EXTI_CALLBACK_HANDLER_COUNT 1

src/main/drivers/system.h

@@ -20,18 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "common/time.h"
-
 void systemInit(void);
-void delayMicroseconds(timeUs_t us);
-void delay(timeMs_t ms);
-
-timeUs_t micros(void);
-timeUs_t microsISR(void);
-timeMs_t millis(void);
-
-uint32_t ticks(void);
-timeDelta_t ticks_diff_us(uint32_t begin, uint32_t end);
 
 typedef enum {
     FAILURE_DEVELOPER = 0,

src/main/drivers/time.h

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Cleanflight.
+ *
+ * Cleanflight is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Cleanflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Cleanflight.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#include "common/time.h"
+
+void delayMicroseconds(timeUs_t us);
+void delay(timeMs_t ms);
+
+timeUs_t micros(void);
+timeUs_t microsISR(void);
+timeMs_t millis(void);
+
+uint32_t ticks(void);
+timeDelta_t ticks_diff_us(uint32_t begin, uint32_t end);

src/main/drivers/timer.c

@@ -29,7 +29,7 @@
 
 #include "io.h"
 #include "rcc.h"
-#include "system.h"
+#include "time.h"
 
 #include "timer.h"
 #include "timer_impl.h"

src/main/drivers/timer_hal.c

@@ -29,7 +29,7 @@
 
 #include "io.h"
 #include "rcc.h"
-#include "system.h"
+#include "time.h"
 
 #include "timer.h"
 #include "timer_impl.h"

src/main/drivers/usb_detection.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 #include "io.h"
-#include "system.h"
+#include "time.h"
 
 static IO_t usbDetectPin = IO_NONE;
 

src/main/drivers/usb_io.c

@@ -23,7 +23,7 @@
 #ifdef USB_IO
 
 #include "io.h"
-#include "system.h"
+#include "time.h"
 #include "usb_io.h"
 #include "sdcard.h"
 

src/main/fc/cli.c

@@ -63,6 +63,7 @@ extern uint8_t __config_end;
 #include "drivers/serial.h"
 #include "drivers/stack_check.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 
 #include "fc/cli.h"

src/main/fc/fc_core.c

@@ -34,7 +34,7 @@
 #include "drivers/light_led.h"
 #include "drivers/gyro_sync.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sensors/sensors.h"
 #include "sensors/diagnostics.h"

src/main/fc/fc_hardfaults.c

@@ -21,7 +21,7 @@
 #include "platform.h"
 
 #include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/fc_init.h"
 

src/main/fc/fc_init.c

@@ -38,7 +38,7 @@
 #include "drivers/logging.h"
 #include "drivers/nvic.h"
 #include "drivers/sensor.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/dma.h"
 #include "drivers/exti.h"
 #include "drivers/gpio.h"
@@ -49,6 +49,7 @@
 #include "drivers/serial.h"
 #include "drivers/serial_softserial.h"
 #include "drivers/serial_uart.h"
+#include "drivers/system.h"
 #include "drivers/accgyro.h"
 #include "drivers/compass.h"
 #include "drivers/pwm_mapping.h"

src/main/fc/fc_msp.c

@@ -41,6 +41,7 @@
 #include "drivers/sdcard.h"
 #include "drivers/serial.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"

src/main/fc/rc_adjustments.c

@@ -32,7 +32,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"

src/main/fc/rc_controls.c

@@ -33,7 +33,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"

src/main/flight/failsafe.c

@@ -30,7 +30,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/beeper.h"
 

src/main/flight/hil.c

@@ -32,7 +32,7 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sensors/sensors.h"
 #include "sensors/acceleration.h"

src/main/flight/imu.c

@@ -36,7 +36,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/flight/mixer.c

@@ -32,7 +32,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/pwm_output.h"
 #include "drivers/pwm_mapping.h"
 

src/main/flight/servos.c

@@ -38,7 +38,7 @@
 
 #include "drivers/pwm_output.h"
 #include "drivers/pwm_mapping.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/gimbal.h"
 

src/main/io/beeper.c

@@ -24,7 +24,7 @@
 #include "common/utils.h"
 
 #include "drivers/sound_beeper.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sensors/battery.h"
 #include "sensors/sensors.h"

src/main/io/dashboard.c

@@ -27,7 +27,7 @@
 #include "build/version.h"
 #include "build/build_config.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/display_ug2864hsweg01.h"
 
 #include "cms/cms.h"

src/main/io/displayport_msp.c

@@ -27,7 +27,7 @@
 #include "common/utils.h"
 
 #include "drivers/display.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/fc_msp.h"
 

src/main/io/gps.c

@@ -39,6 +39,7 @@
 #include "drivers/light_led.h"
 #include "drivers/serial.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sensors/sensors.h"
 #include "sensors/compass.h"

src/main/io/gps_i2cnav.c

@@ -33,7 +33,7 @@
 
 #include "drivers/gps_i2cnav.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/io/gps_naza.c

@@ -35,7 +35,7 @@
 #include "common/utils.h"
 
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/io/gps_nmea.c

@@ -34,7 +34,7 @@
 #include "common/utils.h"
 
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/io/gps_ublox.c

@@ -37,7 +37,7 @@
 #include "common/utils.h"
 
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/io/ledstrip.c

@@ -40,7 +40,7 @@
 
 #include "drivers/light_ws2811strip.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/io/osd.c

@@ -54,7 +54,7 @@
 #include "drivers/display.h"
 #include "drivers/max7456.h"
 #include "drivers/max7456_symbols.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/displayport_max7456.h"
 #include "io/flashfs.h"

src/main/io/serial.c

@@ -30,6 +30,7 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/serial.h"
 #if defined(USE_SOFTSERIAL1) || defined(USE_SOFTSERIAL2)
 #include "drivers/serial_softserial.h"

src/main/io/serial_4way.c

@@ -34,7 +34,7 @@
 #include "drivers/pwm_mapping.h"
 #include "drivers/pwm_output.h"
 #include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "flight/mixer.h"
 #include "io/beeper.h"
 #include "io/serial_4way.h"

src/main/io/serial_4way_avrootloader.c

@@ -27,7 +27,7 @@
 #ifdef  USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 #include "common/utils.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/serial.h"
 #include "drivers/buf_writer.h"
 #include "drivers/pwm_mapping.h"

src/main/io/serial_4way_stk500v2.c

@@ -31,7 +31,7 @@
 #include "drivers/buf_writer.h"
 #include "drivers/pwm_mapping.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 

src/main/io/statusindicator.c

@@ -20,7 +20,7 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/light_led.h"
 
 #include "statusindicator.h"

src/main/navigation/navigation.c

@@ -32,7 +32,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/navigation/navigation_fixedwing.c

@@ -30,7 +30,7 @@
 #include "common/maths.h"
 #include "common/filter.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "sensors/sensors.h"
 #include "sensors/acceleration.h"

src/main/navigation/navigation_fw_launch.c

@@ -32,7 +32,7 @@
 
 #include "config/feature.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
 #include "drivers/accgyro.h"
 

src/main/navigation/navigation_multicopter.c

@@ -26,7 +26,7 @@
 #include "build/build_config.h"
 #include "build/debug.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "common/axis.h"
 #include "common/maths.h"

src/main/navigation/navigation_pos_estimator.c

@@ -33,7 +33,7 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/rx/crsf.c

@@ -30,7 +30,7 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
 

src/main/rx/ibus.c

@@ -34,7 +34,7 @@
 #include "common/utils.h"
 
 #include "drivers/serial.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 

src/main/rx/jetiexbus.c

@@ -49,7 +49,7 @@
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 

src/main/rx/nrf24_cx10.c

@@ -30,7 +30,7 @@
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"

src/main/rx/nrf24_h8_3d.c

@@ -32,7 +32,7 @@
 
 #include "drivers/rx_nrf24l01.h"
 #include "drivers/rx_xn297.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"