Moved time functions out of system.h into time.h

src/main/blackbox/blackbox.c

@@ -42,7 +42,7 @@
 
 #include "drivers/compass/compass.h"
 #include "drivers/sensor.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"

src/main/cms/cms.c

@@ -44,6 +44,7 @@
 #include "common/typeconversion.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 
 // For rcData, stopAllMotors, stopPwmAllMotors
 #include "config/feature.h"

src/main/cms/cms_menu_blackbox.c

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

src/main/cms/cms_menu_imu.c

@@ -29,8 +29,6 @@
 
 #include "build/version.h"
 
-#include "drivers/system.h"
-
 #include "cms/cms.h"
 #include "cms/cms_types.h"
 #include "cms/cms_menu_imu.h"

src/main/cms/cms_menu_ledstrip.c

@@ -34,8 +34,6 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-
 #include "fc/config.h"
 
 

src/main/cms/cms_menu_misc.c

@@ -26,7 +26,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/accgyro_adxl345.c

@@ -20,7 +20,6 @@
 
 #include <platform.h>
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
 
 #include "drivers/sensor.h"

src/main/drivers/accgyro/accgyro_l3g4200d.c

@@ -20,15 +20,17 @@
 
 #include <platform.h>
 
-#include "drivers/system.h"
-#include "drivers/bus_i2c.h"
+#include "accgyro.h"
+#include "accgyro_l3g4200d.h"
 
 #include "common/maths.h"
 #include "common/axis.h"
 
+#include "drivers/bus_i2c.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
-#include "accgyro.h"
-#include "accgyro_l3g4200d.h"
+#include "drivers/system.h"
+
 
 // L3G4200D, Standard address 0x68
 #define L3G4200D_ADDRESS         0x68

src/main/drivers/accgyro/accgyro_l3gd20.c

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

src/main/drivers/accgyro/accgyro_lsm303dlhc.c

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

src/main/drivers/accgyro/accgyro_mma845x.c

@@ -20,7 +20,6 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
 #include "drivers/bus_i2c.h"
 

src/main/drivers/accgyro/accgyro_mpu.c

@@ -29,14 +29,14 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/exti.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu3050.h"
 #include "accgyro_mpu6050.h"

src/main/drivers/accgyro/accgyro_mpu3050.c

@@ -23,11 +23,12 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/exti.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu3050.h"

src/main/drivers/accgyro/accgyro_mpu6050.c

@@ -26,15 +26,14 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-
-#include "drivers/system.h"
-#include "drivers/gpio.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/exti.h"
+#include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6050.h"

src/main/drivers/accgyro/accgyro_mpu6500.c

@@ -24,12 +24,12 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
 #include "drivers/exti.h"
 #include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6500.h"

src/main/drivers/accgyro/accgyro_spi_bmi160.c

@@ -37,13 +37,13 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
-#include "drivers/nvic.h"
 #include "drivers/bus_spi.h"
-
+#include "drivers/exti.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_spi_bmi160.h"
 

src/main/drivers/accgyro/accgyro_spi_icm20689.c

@@ -24,14 +24,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/exti.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
+#include "drivers/exti.h"
 #include "drivers/gpio.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/io.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_spi_icm20689.h"

src/main/drivers/accgyro/accgyro_spi_mpu6000.c

@@ -30,14 +30,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_spi.h"
-
+#include "drivers/exti.h"
 #include "drivers/gyro_sync.h"
-
+#include "drivers/io.h"
+#include "drivers/time.h"
 #include "drivers/sensor.h"
+#include "drivers/system.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 

src/main/drivers/accgyro/accgyro_spi_mpu6500.c

@@ -23,12 +23,12 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
+#include "drivers/bus_spi.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/bus_spi.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "accgyro.h"
 #include "accgyro_mpu.h"
 #include "accgyro_mpu6500.h"

src/main/drivers/accgyro/accgyro_spi_mpu9250.c

@@ -33,18 +33,18 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/io.h"
-
-#include "drivers/system.h"
-#include "drivers/exti.h"
-#include "drivers/bus_spi.h"
-#include "drivers/gyro_sync.h"
-#include "drivers/light_led.h"
-
-#include "drivers/sensor.h"
 #include "drivers/accgyro/accgyro.h"
 #include "drivers/accgyro/accgyro_mpu.h"
 #include "drivers/accgyro/accgyro_spi_mpu9250.h"
+#include "drivers/bus_spi.h"
+#include "drivers/exti.h"
+#include "drivers/gyro_sync.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/sensor.h"
+#include "drivers/time.h"
+#include "drivers/system.h"
+
 
 static void mpu9250AccAndGyroInit(gyroDev_t *gyro);
 

src/main/drivers/adc.c

@@ -23,8 +23,6 @@
 #include "build/build_config.h"
 #include "build/debug.h"
 
-#include "drivers/system.h"
-
 #include "adc.h"
 #include "adc_impl.h"
 

src/main/drivers/adc_stm32f10x.c

@@ -26,7 +26,6 @@
 #include "build/build_config.h"
 
 #include "drivers/accgyro/accgyro.h"
-#include "drivers/system.h"
 #include "drivers/sensor.h"
 #include "adc.h"
 #include "adc_impl.h"

src/main/drivers/adc_stm32f30x.c

@@ -22,14 +22,13 @@
 #include "platform.h"
 
 #include "drivers/accgyro/accgyro.h"
-#include "drivers/system.h"
 #include "drivers/gpio.h"
-
+#include "drivers/io.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
 
 #include "adc.h"
 #include "adc_impl.h"
-#include "drivers/io.h"
 #include "rcc.h"
 #include "dma.h"
 

src/main/drivers/barometer/barometer_bmp085.c

@@ -24,12 +24,12 @@
 
 #include "barometer.h"
 
-#include "drivers/gpio.h"
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
-#include "drivers/nvic.h"
 #include "drivers/exti.h"
+#include "drivers/gpio.h"
 #include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 
 #include "barometer_bmp085.h"
 

src/main/drivers/barometer/barometer_bmp280.c

@@ -24,8 +24,8 @@
 
 #include "barometer.h"
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/time.h"
 
 #include "barometer_bmp280.h"
 #include "barometer_spi_bmp280.h"

src/main/drivers/barometer/barometer_ms5611.c

@@ -25,9 +25,9 @@
 #include "barometer.h"
 #include "barometer_spi_ms5611.h"
 
-#include "drivers/gpio.h"
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/gpio.h"
+#include "drivers/time.h"
 
 // MS5611, Standard address 0x77
 #define MS5611_ADDR                 0x77

src/main/drivers/bus_i2c_hal.c

@@ -20,14 +20,15 @@
 
 #include <platform.h>
 
-#include "drivers/io.h"
-#include "drivers/system.h"
-
 #include "drivers/bus_i2c.h"
+#include "drivers/io.h"
 #include "drivers/nvic.h"
+#include "drivers/time.h"
+
 #include "io_impl.h"
 #include "rcc.h"
 
+
 #if !defined(SOFT_I2C) && defined(USE_I2C)
 
 #define CLOCKSPEED 800000    // i2c clockspeed 400kHz default (conform specs), 800kHz  and  1200kHz (Betaflight default)

src/main/drivers/bus_i2c_stm32f10x.c

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

src/main/drivers/compass/compass_ak8963.c

@@ -28,11 +28,11 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "drivers/compass/compass.h"
 
 #include "drivers/accgyro/accgyro.h"

src/main/drivers/compass/compass_ak8975.c

@@ -28,13 +28,12 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
-#include "drivers/gpio.h"
 #include "drivers/bus_i2c.h"
-
+#include "drivers/gpio.h"
 #include "drivers/sensor.h"
-#include "compass.h"
+#include "drivers/time.h"
 
+#include "compass.h"
 #include "compass_ak8975.h"
 
 // This sensor is available in MPU-9150.

src/main/drivers/compass/compass_hmc5883l.c

@@ -29,14 +29,14 @@
 #include "common/axis.h"
 #include "common/maths.h"
 
-#include "drivers/system.h"
-#include "drivers/nvic.h"
-#include "drivers/io.h"
-#include "drivers/exti.h"
 #include "drivers/bus_i2c.h"
+#include "drivers/exti.h"
+#include "drivers/io.h"
 #include "drivers/light_led.h"
-
+#include "drivers/nvic.h"
 #include "drivers/sensor.h"
+#include "drivers/time.h"
+
 #include "compass.h"
 
 #include "compass_hmc5883l.h"

src/main/drivers/display_ug2864hsweg01.c

@@ -21,7 +21,6 @@
 #include "platform.h"
 
 #include "drivers/bus_i2c.h"
-#include "drivers/system.h"
 
 #include "display_ug2864hsweg01.h"
 

src/main/drivers/flash_m25p16.c

@@ -24,9 +24,9 @@
 
 #include "flash.h"
 #include "flash_m25p16.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
+#include "drivers/io.h"
+#include "drivers/time.h"
 
 #define M25P16_INSTRUCTION_RDID             0x9F
 #define M25P16_INSTRUCTION_READ_BYTES       0x03

src/main/drivers/light_ws2811strip_stdperiph.c

@@ -28,7 +28,6 @@
 #include "common/color.h"
 #include "light_ws2811strip.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 #include "timer.h"
 

src/main/drivers/max7456.c

@@ -28,14 +28,14 @@
 #include "common/printf.h"
 
 #include "drivers/bus_spi.h"
-#include "drivers/light_led.h"
-#include "drivers/io.h"
-#include "drivers/system.h"
-#include "drivers/nvic.h"
 #include "drivers/dma.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/max7456.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 #include "drivers/vcd.h"
-#include "max7456.h"
-#include "max7456_symbols.h"
 
 // VM0 bits
 #define VIDEO_BUFFER_DISABLE        0x01

src/main/drivers/pwm_esc_detect.c

@@ -24,7 +24,7 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/io.h"
 #include "pwm_esc_detect.h"
 #include "timer.h"

src/main/drivers/pwm_output.c

@@ -21,7 +21,7 @@
 #include <math.h>
 
 #include "platform.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "drivers/io.h"
 #include "pwm_output.h"

src/main/drivers/pwm_output_dshot.c

@@ -32,7 +32,6 @@
 #include "pwm_output.h"
 #include "drivers/nvic.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 
 static uint8_t dmaMotorTimerCount = 0;

src/main/drivers/pwm_output_dshot_hal.c

@@ -27,7 +27,6 @@
 #include "pwm_output.h"
 #include "drivers/nvic.h"
 #include "dma.h"
-#include "drivers/system.h"
 #include "rcc.h"
 
 static uint8_t dmaMotorTimerCount = 0;

src/main/drivers/rx_nrf24l01.c

@@ -30,10 +30,10 @@
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
-#include "io_impl.h"
-#include "rx_spi.h"
-#include "rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/io_impl.h"
+#include "drivers/rx_spi.h"
+#include "drivers/rx_nrf24l01.h"
+#include "drivers/time.h"
 
 #define NRF24_CE_HI()   {IOHi(DEFIO_IO(RX_CE_PIN));}
 #define NRF24_CE_LO()   {IOLo(DEFIO_IO(RX_CE_PIN));}

src/main/drivers/rx_pwm.c

@@ -27,8 +27,6 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
-
 #include "drivers/nvic.h"
 #include "drivers/io.h"
 #include "timer.h"

src/main/drivers/sdcard.c

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

src/main/drivers/serial_escserial.c

@@ -34,9 +34,9 @@ typedef enum {
 
 #include "common/utils.h"
 
-#include "drivers/nvic.h"
-#include "drivers/system.h"
 #include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/time.h"
 #include "timer.h"
 
 #include "serial.h"

src/main/drivers/serial_softserial.c

@@ -35,7 +35,6 @@
 #include "common/utils.h"
 
 #include "drivers/nvic.h"
-#include "drivers/system.h"
 #include "drivers/io.h"
 #include "timer.h"
 

src/main/drivers/serial_usb_vcp.c

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

src/main/drivers/sonar_hcsr04.c

@@ -22,11 +22,11 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
-#include "drivers/nvic.h"
-#include "drivers/io.h"
 #include "drivers/exti.h"
-#include "sonar_hcsr04.h"
+#include "drivers/io.h"
+#include "drivers/nvic.h"
+#include "drivers/sonar_hcsr04.h"
+#include "drivers/time.h"
 
 /* HC-SR04 consists of ultrasonic transmitter, receiver, and control circuits.
  * When triggered it sends out a series of 40KHz ultrasonic pulses and receives

src/main/drivers/sound_beeper.c

@@ -20,7 +20,6 @@
 
 #include "platform.h"
 
-#include "drivers/system.h"
 #include "drivers/io.h"
 
 #include "sound_beeper.h"

src/main/drivers/system.h

@@ -21,12 +21,6 @@
 #include <stdbool.h>
 
 void systemInit(void);
-void delayMicroseconds(uint32_t us);
-void delay(uint32_t ms);
-
-uint32_t micros(void);
-uint32_t microsISR(void);
-uint32_t millis(void);
 
 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_hal.c

@@ -30,7 +30,6 @@
 
 #include "drivers/io.h"
 #include "rcc.h"
-#include "drivers/system.h"
 
 #include "timer.h"
 #include "timer_impl.h"

src/main/drivers/usb_io.c

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

src/main/drivers/vtx_rtc6705.c

@@ -31,10 +31,11 @@
 
 #include "common/maths.h"
 
-#include "vtx_rtc6705.h"
-#include "drivers/io.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
+#include "drivers/io.h"
+#include "drivers/time.h"
+#include "drivers/vtx_rtc6705.h"
+
 
 #define RTC6705_SET_HEAD 0x3210 //fosc=8mhz r=400
 #define RTC6705_SET_A1 0x8F3031 //5865

src/main/drivers/vtx_rtc6705_soft_spi.c

@@ -24,10 +24,9 @@
 
 #include "drivers/bus_spi.h"
 #include "drivers/io.h"
-#include "drivers/system.h"
-#include "light_led.h"
-
-#include "vtx_rtc6705.h"
+#include "drivers/light_led.h"
+#include "drivers/time.h"
+#include "drivers/vtx_rtc6705.h"
 
 #define DP_5G_MASK                  0x7000
 #define PA5G_BS_MASK                0x0E00

src/main/fc/cli.c

@@ -71,6 +71,7 @@ extern uint8_t __config_end;
 #include "drivers/sonar_hcsr04.h"
 #include "drivers/stack_check.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/vcd.h"
 

src/main/fc/fc_core.c

@@ -33,9 +33,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/light_led.h"
-#include "drivers/system.h"
 #include "drivers/gyro_sync.h"
+#include "drivers/light_led.h"
+#include "drivers/time.h"
 
 #include "sensors/acceleration.h"
 #include "sensors/barometer.h"

src/main/fc/fc_dispatch.c

@@ -23,7 +23,8 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
+
 #include "fc/fc_dispatch.h"
 
 static dispatchEntry_t *head = NULL;

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 "drivers/transponder_ir.h"
 
 #include "fc/fc_init.h"

src/main/fc/fc_init.c

@@ -39,6 +39,7 @@
 #include "drivers/nvic.h"
 #include "drivers/sensor.h"
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/light_led.h"

src/main/fc/rc_adjustments.c

@@ -31,7 +31,7 @@
 #include "common/maths.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"

src/main/fc/rc_controls.c

@@ -34,8 +34,6 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
-
 #include "fc/config.h"
 #include "fc/fc_core.h"
 #include "fc/rc_controls.h"

src/main/flight/failsafe.c

@@ -27,7 +27,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/flight/imu.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/runtime_config.h"
 

src/main/flight/mixer.c

@@ -32,9 +32,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/pwm_output.h"
 #include "drivers/pwm_esc_detect.h"
+#include "drivers/time.h"
 
 #include "io/motors.h"
 

src/main/flight/navigation.c

@@ -34,7 +34,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/fc_core.h"

src/main/flight/servos.c

@@ -35,7 +35,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/pwm_output.h"
-#include "drivers/system.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/io/beeper.c

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

src/main/io/dashboard.c

@@ -31,9 +31,9 @@
 
 #include "build/build_config.h"
 
-#include "drivers/system.h"
 #include "drivers/display.h"
 #include "drivers/display_ug2864hsweg01.h"
+#include "drivers/time.h"
 
 #include "cms/cms.h"
 

src/main/io/displayport_msp.c

@@ -30,7 +30,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/display.h"
-#include "drivers/system.h"
 
 #include "fc/fc_msp.h"
 

src/main/io/gps.c

@@ -38,11 +38,8 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/light_led.h"
-
-#include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/dashboard.h"
 #include "io/gps.h"

src/main/io/ledstrip.c

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

src/main/io/osd.c

@@ -53,9 +53,9 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/max7456_symbols.h"
 #include "drivers/display.h"
-#include "drivers/system.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
 #include "io/asyncfatfs/asyncfatfs.h"

src/main/io/osd_slave.c

@@ -32,9 +32,9 @@
 #include "common/printf.h"
 #include "common/utils.h"
 
-#include "drivers/max7456_symbols.h"
 #include "drivers/display.h"
-#include "drivers/system.h"
+#include "drivers/max7456_symbols.h"
+#include "drivers/time.h"
 
 #include "io/osd_slave.h"
 

src/main/io/serial.c

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

src/main/io/serial_4way.c

@@ -30,7 +30,6 @@
 #include "drivers/timer.h"
 #include "drivers/pwm_output.h"
 #include "drivers/light_led.h"
-#include "drivers/system.h"
 
 #include "flight/mixer.h"
 

src/main/io/serial_4way_avrootloader.c

@@ -27,8 +27,8 @@
 #ifdef  USE_SERIAL_4WAY_BLHELI_INTERFACE
 
 #include "drivers/io.h"
-#include "drivers/system.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 #include "drivers/timer.h"
 
 #include "io/serial.h"

src/main/io/serial_4way_stk500v2.c

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

src/main/io/statusindicator.c

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

src/main/io/transponder_ir.c

@@ -30,7 +30,6 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/transponder_ir.h"
-#include "drivers/system.h"
 #include "drivers/usb_io.h"
 
 #include "fc/config.h"

src/main/io/vtx_control.c

@@ -25,10 +25,10 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/vtx_common.h"
 #include "drivers/buttons.h"
 #include "drivers/light_led.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
+#include "drivers/vtx_common.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"

src/main/io/vtx_rtc6705.c

@@ -37,6 +37,7 @@
 #include "config/parameter_group_ids.h"
 
 #include "drivers/system.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 #include "drivers/vtx_rtc6705.h"
 

src/main/io/vtx_smartaudio.c

@@ -36,8 +36,8 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/system.h"
 #include "drivers/serial.h"
+#include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
 #include "fc/rc_controls.h"

src/main/io/vtx_tramp.c

@@ -33,7 +33,6 @@
 
 #include "io/serial.h"
 #include "drivers/serial.h"
-#include "drivers/system.h"
 #include "drivers/vtx_common.h"
 #include "io/vtx_tramp.h"
 #include "io/vtx_string.h"

src/main/msp/msp_serial.c

@@ -27,8 +27,6 @@
 
 #include "io/serial.h"
 
-#include "drivers/system.h"
-
 #include "msp/msp.h"
 #include "msp/msp_serial.h"
 

src/main/osd_slave/osd_slave_init.c

@@ -33,32 +33,32 @@
 #include "config/parameter_group.h"
 #include "config/parameter_group_ids.h"
 
-#include "drivers/nvic.h"
-#include "drivers/sensor.h"
-#include "drivers/system.h"
-#include "drivers/dma.h"
-#include "drivers/io.h"
-#include "drivers/light_led.h"
-#include "drivers/sound_beeper.h"
-#include "drivers/timer.h"
-#include "drivers/serial.h"
-#include "drivers/serial_softserial.h"
-#include "drivers/serial_uart.h"
 #include "drivers/adc.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_spi.h"
-#include "drivers/inverter.h"
-#include "drivers/usb_io.h"
-#include "drivers/transponder_ir.h"
+#include "drivers/dma.h"
 #include "drivers/exti.h"
+#include "drivers/inverter.h"
+#include "drivers/io.h"
+#include "drivers/light_led.h"
+#include "drivers/nvic.h"
+#include "drivers/sensor.h"
+#include "drivers/serial.h"
+#include "drivers/serial_softserial.h"
+#include "drivers/serial_uart.h"
+#include "drivers/sound_beeper.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
+#include "drivers/timer.h"
+#include "drivers/transponder_ir.h"
+#include "drivers/usb_io.h"
 
+#include "fc/cli.h"
 #include "fc/config.h"
-#include "osd_slave/osd_slave_init.h"
+#include "fc/rc_controls.h"
 #include "fc/fc_msp.h"
 #include "fc/fc_tasks.h"
-#include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
-#include "fc/cli.h"
 
 #include "msp/msp_serial.h"
 
@@ -67,11 +67,13 @@
 
 #include "io/beeper.h"
 #include "io/displayport_max7456.h"
-#include "io/serial.h"
 #include "io/flashfs.h"
 #include "io/ledstrip.h"
-#include "io/transponder_ir.h"
 #include "io/osd_slave.h"
+#include "io/serial.h"
+#include "io/transponder_ir.h"
+
+#include "osd_slave/osd_slave_init.h"
 
 #include "scheduler/scheduler.h"
 

src/main/rx/crsf.c

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

src/main/rx/ibus.c

@@ -31,10 +31,10 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
-
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
+#include "drivers/time.h"
+
 #include "io/serial.h"
 
 #ifdef TELEMETRY

src/main/rx/jetiexbus.c

@@ -46,9 +46,9 @@
 
 #include "common/utils.h"
 
-#include "drivers/system.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.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"

src/main/rx/nrf24_inav.c

@@ -29,7 +29,7 @@
 #include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"

src/main/rx/nrf24_syma.c

@@ -29,7 +29,7 @@
 #include "build/build_config.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"

src/main/rx/nrf24_v202.c

@@ -31,7 +31,7 @@
 #include "common/utils.h"
 
 #include "drivers/rx_nrf24l01.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "rx/rx.h"
 #include "rx/rx_spi.h"

src/main/rx/rx.c

@@ -37,7 +37,7 @@
 #include "drivers/adc.h"
 #include "drivers/rx_pwm.h"
 #include "drivers/rx_spi.h"
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "fc/config.h"
 #include "fc/rc_controls.h"

src/main/rx/sbus.c

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

src/main/rx/spektrum.c

@@ -28,8 +28,9 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/system.h"
 #include "drivers/light_led.h"
+#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 

src/main/rx/sumd.c

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

src/main/rx/sumh.c

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

src/main/rx/xbus.c

@@ -23,7 +23,7 @@
 
 #ifdef SERIAL_RX
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 #include "io/serial.h"
 

src/main/scheduler/scheduler.c

@@ -31,7 +31,7 @@
 #include "common/time.h"
 #include "common/utils.h"
 
-#include "drivers/system.h"
+#include "drivers/time.h"
 
 // DEBUG_SCHEDULER, timings for:
 // 0 - gyroUpdate()

src/main/sensors/acceleration.c

@@ -50,7 +50,6 @@
 #include "drivers/accgyro/accgyro_spi_mpu6500.h"
 #include "drivers/accgyro/accgyro_spi_mpu9250.h"
 #include "drivers/bus_spi.h"
-#include "drivers/system.h"
 
 #include "fc/config.h"
 #include "fc/runtime_config.h"