diff --git a/Makefile b/Makefile index 805f849bfc..d8636a7570 100644 --- a/Makefile +++ b/Makefile @@ -36,10 +36,10 @@ VALID_TARGETS = NAZE OLIMEXINO STM32F3DISCOVERY CHEBUZZF3 # Working directories ROOT = $(dir $(lastword $(MAKEFILE_LIST))) -SRC_DIR = $(ROOT)/src -OBJECT_DIR = $(ROOT)/obj -BIN_DIR = $(ROOT)/obj -CMSIS_DIR = $(ROOT)/lib/CMSIS +SRC_DIR = $(ROOT)/src/main +OBJECT_DIR = $(ROOT)/obj/main +BIN_DIR = $(ROOT)/obj/main +CMSIS_DIR = $(ROOT)/lib/main/CMSIS INCLUDE_DIRS = $(SRC_DIR) # Search path for sources @@ -47,7 +47,7 @@ VPATH := $(SRC_DIR):$(SRC_DIR)/startup ifeq ($(TARGET),$(filter $(TARGET),STM32F3DISCOVERY CHEBUZZF3)) -STDPERIPH_DIR = $(ROOT)/lib/STM32F30x_StdPeriph_Driver +STDPERIPH_DIR = $(ROOT)/lib/main/STM32F30x_StdPeriph_Driver VPATH := $(VPATH):$(CMSIS_DIR)/CM1/CoreSupport:$(CMSIS_DIR)/CM1/DeviceSupport/ST/STM32F30x CMSIS_SRC = $(notdir $(wildcard $(CMSIS_DIR)/CM1/CoreSupport/*.c \ @@ -71,7 +71,7 @@ endif else -STDPERIPH_DIR = $(ROOT)/lib/STM32F10x_StdPeriph_Driver +STDPERIPH_DIR = $(ROOT)/lib/main/STM32F10x_StdPeriph_Driver # Search path and source files for the CMSIS sources VPATH := $(VPATH):$(CMSIS_DIR)/CM3/CoreSupport:$(CMSIS_DIR)/CM3/DeviceSupport/ST/STM32F10x @@ -92,49 +92,49 @@ DEVICE_FLAGS = -DSTM32F10X_MD endif COMMON_SRC = build_config.c \ - battery.c \ - boardalignment.c \ - buzzer.c \ - config.c \ + config/config.c \ + config/runtime_config.c \ common/maths.c \ common/printf.c \ common/typeconversion.c \ - failsafe.c \ main.c \ mw.c \ - sensors_acceleration.c \ - sensors_barometer.c \ - sensors_compass.c \ - sensors_gyro.c \ - sensors_initialisation.c \ - sensors_sonar.c \ + flight/autotune.c \ + flight/failsafe.c \ + flight/flight.c \ + flight/imu.c \ + flight/mixer.c \ drivers/bus_i2c_soft.c \ - drivers/serial_common.c \ + drivers/serial.c \ drivers/sound_beeper.c \ - drivers/system_common.c \ - flight_autotune.c \ - flight_common.c \ - flight_imu.c \ - flight_mixer.c \ - gps_common.c \ - gps_conversion.c \ - runtime_config.c \ - rc_controls.c \ - rc_curves.c \ - rx_common.c \ - rx_msp.c \ - rx_pwm.c \ - rx_sbus.c \ - rx_sumd.c \ - rx_spektrum.c \ - telemetry_common.c \ - telemetry_frsky.c \ - telemetry_hott.c \ - telemetry_msp.c \ - serial_common.c \ - serial_cli.c \ - serial_msp.c \ - statusindicator.c \ + drivers/system.c \ + io/battery.c \ + io/buzzer.c \ + io/gps.c \ + io/gps_conversion.c \ + io/rc_controls.c \ + io/rc_curves.c \ + io/serial.c \ + io/serial_cli.c \ + io/serial_msp.c \ + io/statusindicator.c \ + rx/rx.c \ + rx/msp.c \ + rx/pwm.c \ + rx/sbus.c \ + rx/sumd.c \ + rx/spektrum.c \ + sensors/boardalignment.c \ + sensors/acceleration.c \ + sensors/barometer.c \ + sensors/compass.c \ + sensors/gyro.c \ + sensors/initialisation.c \ + sensors/sonar.c \ + telemetry/telemetry.c \ + telemetry/frsky.c \ + telemetry/hott.c \ + telemetry/msp.c \ $(CMSIS_SRC) \ $(STDPERIPH_SRC) @@ -145,7 +145,7 @@ NAZE_SRC = startup_stm32f10x_md_gcc.S \ drivers/accgyro_mma845x.c \ drivers/accgyro_mpu3050.c \ drivers/accgyro_mpu6050.c \ - drivers/adc_common.c \ + drivers/adc.c \ drivers/adc_stm32f10x.c \ drivers/barometer_bmp085.c \ drivers/barometer_ms5611.c \ @@ -159,14 +159,14 @@ NAZE_SRC = startup_stm32f10x_md_gcc.S \ drivers/pwm_output.c \ drivers/pwm_rx.c \ drivers/serial_softserial.c \ - drivers/serial_uart_common.c \ + drivers/serial_uart.c \ drivers/serial_uart_stm32f10x.c \ - drivers/timer_common.c \ + drivers/timer.c \ $(COMMON_SRC) OLIMEXINO_SRC = startup_stm32f10x_md_gcc.S \ drivers/accgyro_mpu6050.c \ - drivers/adc_common.c \ + drivers/adc.c \ drivers/adc_stm32f10x.c \ drivers/bus_i2c_stm32f10x.c \ drivers/bus_spi.c \ @@ -176,15 +176,15 @@ OLIMEXINO_SRC = startup_stm32f10x_md_gcc.S \ drivers/pwm_rssi.c \ drivers/pwm_rx.c \ drivers/serial_softserial.c \ - drivers/serial_uart_common.c \ + drivers/serial_uart.c \ drivers/serial_uart_stm32f10x.c \ - drivers/timer_common.c \ + drivers/timer.c \ $(COMMON_SRC) -STM32F3DISCOVERY_COMMON_SRC = startup_stm32f30x_md_gcc.S \ +STM32F3DISCOVERY_SRC_COMMON = startup_stm32f30x_md_gcc.S \ drivers/accgyro_l3gd20.c \ drivers/accgyro_lsm303dlhc.c \ - drivers/adc_common.c \ + drivers/adc.c \ drivers/adc_stm32f30x.c \ drivers/bus_i2c_stm32f30x.c \ drivers/bus_spi.c \ @@ -193,12 +193,12 @@ STM32F3DISCOVERY_COMMON_SRC = startup_stm32f30x_md_gcc.S \ drivers/pwm_output.c \ drivers/pwm_rssi.c \ drivers/pwm_rx.c \ - drivers/serial_uart_common.c \ + drivers/serial_uart.c \ drivers/serial_uart_stm32f30x.c \ drivers/serial_softserial.c \ - drivers/timer_common.c + drivers/timer.c -STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_COMMON_SRC) \ +STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_SRC_COMMON) \ drivers/accgyro_adxl345.c \ drivers/accgyro_bma280.c \ drivers/accgyro_mma845x.c \ @@ -207,7 +207,7 @@ STM32F3DISCOVERY_SRC = $(STM32F3DISCOVERY_COMMON_SRC) \ drivers/accgyro_l3g4200d.c \ $(COMMON_SRC) -CHEBUZZF3_SRC = $(STM32F3DISCOVERY_COMMON_SRC) \ +CHEBUZZF3_SRC = $(STM32F3DISCOVERY_SRC) \ $(COMMON_SRC) # In some cases, %.s regarded as intermediate file, which is actually not. diff --git a/lib/CMSIS/CM1/CoreSupport/arm_common_tables.h b/lib/main/CMSIS/CM1/CoreSupport/arm_common_tables.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/arm_common_tables.h rename to lib/main/CMSIS/CM1/CoreSupport/arm_common_tables.h diff --git a/lib/CMSIS/CM1/CoreSupport/arm_const_structs.h b/lib/main/CMSIS/CM1/CoreSupport/arm_const_structs.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/arm_const_structs.h rename to lib/main/CMSIS/CM1/CoreSupport/arm_const_structs.h diff --git a/lib/CMSIS/CM1/CoreSupport/arm_math.h b/lib/main/CMSIS/CM1/CoreSupport/arm_math.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/arm_math.h rename to lib/main/CMSIS/CM1/CoreSupport/arm_math.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cm0.h b/lib/main/CMSIS/CM1/CoreSupport/core_cm0.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cm0.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cm0.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cm0plus.h b/lib/main/CMSIS/CM1/CoreSupport/core_cm0plus.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cm0plus.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cm0plus.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cm3.h b/lib/main/CMSIS/CM1/CoreSupport/core_cm3.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cm3.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cm3.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cm4.h b/lib/main/CMSIS/CM1/CoreSupport/core_cm4.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cm4.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cm4.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cm4_simd.h b/lib/main/CMSIS/CM1/CoreSupport/core_cm4_simd.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cm4_simd.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cm4_simd.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cmFunc.h b/lib/main/CMSIS/CM1/CoreSupport/core_cmFunc.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cmFunc.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cmFunc.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_cmInstr.h b/lib/main/CMSIS/CM1/CoreSupport/core_cmInstr.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_cmInstr.h rename to lib/main/CMSIS/CM1/CoreSupport/core_cmInstr.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_sc000.h b/lib/main/CMSIS/CM1/CoreSupport/core_sc000.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_sc000.h rename to lib/main/CMSIS/CM1/CoreSupport/core_sc000.h diff --git a/lib/CMSIS/CM1/CoreSupport/core_sc300.h b/lib/main/CMSIS/CM1/CoreSupport/core_sc300.h similarity index 100% rename from lib/CMSIS/CM1/CoreSupport/core_sc300.h rename to lib/main/CMSIS/CM1/CoreSupport/core_sc300.h diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f302x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f302x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f302x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f302x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f303xc.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f303xc.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f303xc.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f303xc.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f30x.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f30x.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f30x.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f30x.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f334x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f334x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f334x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/TrueSTUDIO/startup_stm32f334x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f302x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f302x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f302x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f302x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f303xc.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f303xc.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f303xc.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f303xc.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f30x.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f30x.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f30x.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f30x.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f334x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f334x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f334x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/arm/startup_stm32f334x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/gcc_ride7/startup_stm32f30x.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/gcc_ride7/startup_stm32f30x.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/gcc_ride7/startup_stm32f30x.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/gcc_ride7/startup_stm32f30x.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f302x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f302x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f302x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f302x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f303xc.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f303xc.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f303xc.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f303xc.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f30x.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f30x.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f30x.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f30x.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f334x8.s b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f334x8.s similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f334x8.s rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/startup/iar/startup_stm32f334x8.s diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x.h similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x.h rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x.h diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_conf.h diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.c b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.c similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.c rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.c diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.h similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.h rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_gpio.h diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.c b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.c similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.c rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.c diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.h similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.h rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/stm32f30x_rcc.h diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.c b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.c similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.c rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.c diff --git a/lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.h b/lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.h similarity index 100% rename from lib/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.h rename to lib/main/CMSIS/CM1/DeviceSupport/ST/STM32F30x/system_stm32f30x.h diff --git a/lib/CMSIS/CM3/CoreSupport/core_cm3.c b/lib/main/CMSIS/CM3/CoreSupport/core_cm3.c similarity index 100% rename from lib/CMSIS/CM3/CoreSupport/core_cm3.c rename to lib/main/CMSIS/CM3/CoreSupport/core_cm3.c diff --git a/lib/CMSIS/CM3/CoreSupport/core_cm3.h b/lib/main/CMSIS/CM3/CoreSupport/core_cm3.h similarity index 100% rename from lib/CMSIS/CM3/CoreSupport/core_cm3.h rename to lib/main/CMSIS/CM3/CoreSupport/core_cm3.h diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x_conf.h diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c diff --git a/lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h similarity index 100% rename from lib/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h rename to lib/main/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/misc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/misc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/misc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/misc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h diff --git a/lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h rename to lib/main/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h diff --git a/lib/STM32F10x_StdPeriph_Driver/src/misc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/misc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/misc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/misc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c diff --git a/lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c similarity index 100% rename from lib/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c rename to lib/main/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c diff --git a/lib/STM32F30x_StdPeriph_Driver/Release_Notes.html b/lib/main/STM32F30x_StdPeriph_Driver/Release_Notes.html similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/Release_Notes.html rename to lib/main/STM32F30x_StdPeriph_Driver/Release_Notes.html diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_adc.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_adc.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_adc.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_adc.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_can.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_can.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_can.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_can.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_comp.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_comp.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_comp.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_comp.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_crc.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_crc.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_crc.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_crc.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dac.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dac.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dac.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dac.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dbgmcu.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dbgmcu.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dbgmcu.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dbgmcu.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_dma.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_exti.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_exti.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_exti.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_exti.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_flash.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_flash.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_flash.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_flash.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_gpio.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_hrtim.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_hrtim.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_hrtim.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_hrtim.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_i2c.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_i2c.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_i2c.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_i2c.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_iwdg.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_iwdg.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_iwdg.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_iwdg.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_misc.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_misc.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_misc.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_misc.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_opamp.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_opamp.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_opamp.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_opamp.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_pwr.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_pwr.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_pwr.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_pwr.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rcc.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rtc.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rtc.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rtc.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_rtc.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_spi.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_spi.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_spi.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_spi.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_syscfg.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_syscfg.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_syscfg.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_syscfg.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_tim.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_usart.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_usart.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_usart.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_usart.h diff --git a/lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_wwdg.h b/lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_wwdg.h similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/inc/stm32f30x_wwdg.h rename to lib/main/STM32F30x_StdPeriph_Driver/inc/stm32f30x_wwdg.h diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_adc.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_adc.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_adc.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_adc.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_can.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_can.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_can.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_can.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_comp.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_comp.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_comp.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_comp.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_crc.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_crc.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_crc.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_crc.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dac.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dac.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dac.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dac.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dbgmcu.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dbgmcu.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dbgmcu.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dbgmcu.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_dma.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_exti.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_exti.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_exti.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_exti.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_flash.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_flash.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_flash.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_flash.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_gpio.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_gpio.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_gpio.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_gpio.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_hrtim.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_hrtim.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_hrtim.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_hrtim.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_i2c.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_i2c.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_i2c.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_i2c.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_iwdg.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_iwdg.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_iwdg.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_iwdg.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_misc.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_misc.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_misc.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_misc.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_opamp.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_opamp.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_opamp.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_opamp.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_pwr.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_pwr.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_pwr.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_pwr.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_rcc.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_rcc.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_rcc.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_rcc.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_rtc.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_rtc.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_rtc.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_rtc.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_spi.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_spi.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_spi.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_spi.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_syscfg.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_syscfg.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_syscfg.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_syscfg.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_tim.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_usart.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_usart.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_usart.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_usart.c diff --git a/lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_wwdg.c b/lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_wwdg.c similarity index 100% rename from lib/STM32F30x_StdPeriph_Driver/src/stm32f30x_wwdg.c rename to lib/main/STM32F30x_StdPeriph_Driver/src/stm32f30x_wwdg.c diff --git a/lib/gtest/inc/gtest/gtest.h b/lib/test/gtest/inc/gtest/gtest.h similarity index 100% rename from lib/gtest/inc/gtest/gtest.h rename to lib/test/gtest/inc/gtest/gtest.h diff --git a/lib/gtest/src/gtest-all.cc b/lib/test/gtest/src/gtest-all.cc similarity index 100% rename from lib/gtest/src/gtest-all.cc rename to lib/test/gtest/src/gtest-all.cc diff --git a/lib/gtest/src/gtest_main.cc b/lib/test/gtest/src/gtest_main.cc similarity index 100% rename from lib/gtest/src/gtest_main.cc rename to lib/test/gtest/src/gtest_main.cc diff --git a/src/build_config.c b/src/main/build_config.c similarity index 72% rename from src/build_config.c rename to src/main/build_config.c index fc645661e0..fbfc847ec6 100644 --- a/src/build_config.c +++ b/src/main/build_config.c @@ -3,10 +3,10 @@ #include "platform.h" -#include "drivers/gpio_common.h" -#include "drivers/timer_common.h" +#include "drivers/gpio.h" +#include "drivers/timer.h" #include "drivers/pwm_mapping.h" -#include "flight_mixer.h" +#include "flight/mixer.h" #include "build_config.h" diff --git a/src/build_config.h b/src/main/build_config.h similarity index 100% rename from src/build_config.h rename to src/main/build_config.h diff --git a/src/common/axis.h b/src/main/common/axis.h similarity index 100% rename from src/common/axis.h rename to src/main/common/axis.h diff --git a/src/common/maths.c b/src/main/common/maths.c similarity index 100% rename from src/common/maths.c rename to src/main/common/maths.c diff --git a/src/common/maths.h b/src/main/common/maths.h similarity index 100% rename from src/common/maths.h rename to src/main/common/maths.h diff --git a/src/common/printf.c b/src/main/common/printf.c similarity index 95% rename from src/common/printf.c rename to src/main/common/printf.c index 993340be6a..76625cdc66 100644 --- a/src/common/printf.c +++ b/src/main/common/printf.c @@ -35,8 +35,8 @@ #include -#include "drivers/serial_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "io/serial.h" #include "build_config.h" #include "printf.h" diff --git a/src/common/printf.h b/src/main/common/printf.h similarity index 100% rename from src/common/printf.h rename to src/main/common/printf.h diff --git a/src/common/typeconversion.c b/src/main/common/typeconversion.c similarity index 100% rename from src/common/typeconversion.c rename to src/main/common/typeconversion.c diff --git a/src/common/typeconversion.h b/src/main/common/typeconversion.h similarity index 100% rename from src/common/typeconversion.h rename to src/main/common/typeconversion.h diff --git a/src/config.c b/src/main/config/config.c similarity index 93% rename from src/config.c rename to src/main/config/config.c index 99cfa4c08b..4c9f68ada7 100755 --- a/src/config.c +++ b/src/main/config/config.c @@ -6,36 +6,36 @@ #include "build_config.h" #include "common/axis.h" -#include "flight_common.h" +#include "flight/flight.h" -#include "drivers/accgyro_common.h" -#include "drivers/system_common.h" +#include "drivers/accgyro.h" +#include "drivers/system.h" -#include "sensors_common.h" -#include "sensors_gyro.h" +#include "sensors/sensors.h" +#include "sensors/gyro.h" -#include "statusindicator.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" -#include "drivers/serial_common.h" -#include "serial_common.h" -#include "telemetry_common.h" +#include "io/statusindicator.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" +#include "drivers/serial.h" +#include "io/serial.h" +#include "telemetry/telemetry.h" -#include "flight_mixer.h" -#include "boardalignment.h" -#include "battery.h" -#include "gimbal.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rc_curves.h" -#include "rx_common.h" -#include "gps_common.h" -#include "failsafe.h" +#include "flight/mixer.h" +#include "sensors/boardalignment.h" +#include "io/battery.h" +#include "io/gimbal.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "io/rc_curves.h" +#include "rx/rx.h" +#include "io/gps.h" +#include "flight/failsafe.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" void setPIDController(int type); // FIXME PID code needs to be in flight_pid.c/h diff --git a/src/config.h b/src/main/config/config.h similarity index 100% rename from src/config.h rename to src/main/config/config.h diff --git a/src/config_master.h b/src/main/config/config_master.h similarity index 100% rename from src/config_master.h rename to src/main/config/config_master.h diff --git a/src/config_profile.h b/src/main/config/config_profile.h similarity index 100% rename from src/config_profile.h rename to src/main/config/config_profile.h diff --git a/src/runtime_config.c b/src/main/config/runtime_config.c similarity index 92% rename from src/runtime_config.c rename to src/main/config/runtime_config.c index 412e2aa321..f48190680e 100644 --- a/src/runtime_config.c +++ b/src/main/config/runtime_config.c @@ -1,7 +1,7 @@ #include #include -#include "runtime_config.h" +#include "config/runtime_config.h" flags_t f; diff --git a/src/runtime_config.h b/src/main/config/runtime_config.h similarity index 100% rename from src/runtime_config.h rename to src/main/config/runtime_config.h diff --git a/src/drivers/accgyro_common.h b/src/main/drivers/accgyro.h similarity index 100% rename from src/drivers/accgyro_common.h rename to src/main/drivers/accgyro.h diff --git a/src/drivers/accgyro_adxl345.c b/src/main/drivers/accgyro_adxl345.c similarity index 94% rename from src/drivers/accgyro_adxl345.c rename to src/main/drivers/accgyro_adxl345.c index 51b1e8a99d..a2269922d0 100755 --- a/src/drivers/accgyro_adxl345.c +++ b/src/main/drivers/accgyro_adxl345.c @@ -3,10 +3,10 @@ #include -#include "system_common.h" +#include "system.h" #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_adxl345.h" // ADXL345, Alternative address mode 0x53 diff --git a/src/drivers/accgyro_adxl345.h b/src/main/drivers/accgyro_adxl345.h similarity index 100% rename from src/drivers/accgyro_adxl345.h rename to src/main/drivers/accgyro_adxl345.h diff --git a/src/drivers/accgyro_bma280.c b/src/main/drivers/accgyro_bma280.c similarity index 93% rename from src/drivers/accgyro_bma280.c rename to src/main/drivers/accgyro_bma280.c index 6c12be0d24..ea3ce30ae0 100644 --- a/src/drivers/accgyro_bma280.c +++ b/src/main/drivers/accgyro_bma280.c @@ -5,7 +5,7 @@ #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_bma280.h" // BMA280, default I2C address mode 0x18 diff --git a/src/drivers/accgyro_bma280.h b/src/main/drivers/accgyro_bma280.h similarity index 100% rename from src/drivers/accgyro_bma280.h rename to src/main/drivers/accgyro_bma280.h diff --git a/src/drivers/accgyro_l3g4200d.c b/src/main/drivers/accgyro_l3g4200d.c similarity index 94% rename from src/drivers/accgyro_l3g4200d.c rename to src/main/drivers/accgyro_l3g4200d.c index 5569c3fc9b..04830b4160 100644 --- a/src/drivers/accgyro_l3g4200d.c +++ b/src/main/drivers/accgyro_l3g4200d.c @@ -3,13 +3,13 @@ #include -#include "system_common.h" +#include "system.h" #include "bus_i2c.h" #include "common/maths.h" #include "common/axis.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_l3g4200d.h" // L3G4200D, Standard address 0x68 diff --git a/src/drivers/accgyro_l3g4200d.h b/src/main/drivers/accgyro_l3g4200d.h similarity index 100% rename from src/drivers/accgyro_l3g4200d.h rename to src/main/drivers/accgyro_l3g4200d.h diff --git a/src/drivers/accgyro_l3gd20.c b/src/main/drivers/accgyro_l3gd20.c similarity index 98% rename from src/drivers/accgyro_l3gd20.c rename to src/main/drivers/accgyro_l3gd20.c index 2d384d76a1..44e4df99a8 100644 --- a/src/drivers/accgyro_l3gd20.c +++ b/src/main/drivers/accgyro_l3gd20.c @@ -20,11 +20,11 @@ #include "common/maths.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "bus_spi.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_l3gd20.h" extern int16_t debug[4]; diff --git a/src/drivers/accgyro_l3gd20.h b/src/main/drivers/accgyro_l3gd20.h similarity index 100% rename from src/drivers/accgyro_l3gd20.h rename to src/main/drivers/accgyro_l3gd20.h diff --git a/src/drivers/accgyro_lsm303dlhc.c b/src/main/drivers/accgyro_lsm303dlhc.c similarity index 92% rename from src/drivers/accgyro_lsm303dlhc.c rename to src/main/drivers/accgyro_lsm303dlhc.c index ea4b385ff3..0b92c115e9 100644 --- a/src/drivers/accgyro_lsm303dlhc.c +++ b/src/main/drivers/accgyro_lsm303dlhc.c @@ -6,11 +6,11 @@ #include "common/maths.h" #include "common/axis.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_lsm303dlhc.h" extern int16_t debug[4]; diff --git a/src/drivers/accgyro_lsm303dlhc.h b/src/main/drivers/accgyro_lsm303dlhc.h similarity index 100% rename from src/drivers/accgyro_lsm303dlhc.h rename to src/main/drivers/accgyro_lsm303dlhc.h diff --git a/src/drivers/accgyro_mma845x.c b/src/main/drivers/accgyro_mma845x.c similarity index 95% rename from src/drivers/accgyro_mma845x.c rename to src/main/drivers/accgyro_mma845x.c index 91513c95e7..66e1725ace 100644 --- a/src/drivers/accgyro_mma845x.c +++ b/src/main/drivers/accgyro_mma845x.c @@ -3,11 +3,11 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_mma845x.h" // MMA8452QT, Standard address 0x1C diff --git a/src/drivers/accgyro_mma845x.h b/src/main/drivers/accgyro_mma845x.h similarity index 100% rename from src/drivers/accgyro_mma845x.h rename to src/main/drivers/accgyro_mma845x.h diff --git a/src/drivers/accgyro_mpu3050.c b/src/main/drivers/accgyro_mpu3050.c similarity index 94% rename from src/drivers/accgyro_mpu3050.c rename to src/main/drivers/accgyro_mpu3050.c index 2a151017c3..975106f99b 100755 --- a/src/drivers/accgyro_mpu3050.c +++ b/src/main/drivers/accgyro_mpu3050.c @@ -5,10 +5,10 @@ #include "common/maths.h" -#include "system_common.h" +#include "system.h" #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_mpu3050.h" diff --git a/src/drivers/accgyro_mpu3050.h b/src/main/drivers/accgyro_mpu3050.h similarity index 100% rename from src/drivers/accgyro_mpu3050.h rename to src/main/drivers/accgyro_mpu3050.h diff --git a/src/drivers/accgyro_mpu6050.c b/src/main/drivers/accgyro_mpu6050.c similarity index 96% rename from src/drivers/accgyro_mpu6050.c rename to src/main/drivers/accgyro_mpu6050.c index a4292ce1a5..2b14dba80d 100644 --- a/src/drivers/accgyro_mpu6050.c +++ b/src/main/drivers/accgyro_mpu6050.c @@ -5,11 +5,11 @@ #include "common/maths.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "bus_i2c.h" -#include "accgyro_common.h" +#include "accgyro.h" #include "accgyro_mpu6050.h" // MPU6050, Standard address 0x68 diff --git a/src/drivers/accgyro_mpu6050.h b/src/main/drivers/accgyro_mpu6050.h similarity index 100% rename from src/drivers/accgyro_mpu6050.h rename to src/main/drivers/accgyro_mpu6050.h diff --git a/src/drivers/adc_common.c b/src/main/drivers/adc.c similarity index 85% rename from src/drivers/adc_common.c rename to src/main/drivers/adc.c index 5467170c84..18e698f95f 100755 --- a/src/drivers/adc_common.c +++ b/src/main/drivers/adc.c @@ -2,11 +2,11 @@ #include #include "platform.h" -#include "system_common.h" +#include "system.h" -#include "accgyro_common.h" +#include "accgyro.h" -#include "adc_common.h" +#include "adc.h" adc_config_t adcConfig[ADC_CHANNEL_COUNT]; volatile uint16_t adcValues[ADC_CHANNEL_COUNT]; diff --git a/src/drivers/adc_common.h b/src/main/drivers/adc.h similarity index 100% rename from src/drivers/adc_common.h rename to src/main/drivers/adc.h diff --git a/src/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c similarity index 93% rename from src/drivers/adc_stm32f10x.c rename to src/main/drivers/adc_stm32f10x.c index bca0f54abe..04781e8a57 100644 --- a/src/drivers/adc_stm32f10x.c +++ b/src/main/drivers/adc_stm32f10x.c @@ -3,13 +3,13 @@ #include #include "platform.h" -#include "system_common.h" +#include "system.h" -#include "sensors_common.h" // FIXME dependency into the main code +#include "sensors/sensors.h" // FIXME dependency into the main code -#include "accgyro_common.h" +#include "accgyro.h" -#include "adc_common.h" +#include "adc.h" // Driver for STM32F103CB onboard ADC // diff --git a/src/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c similarity index 93% rename from src/drivers/adc_stm32f30x.c rename to src/main/drivers/adc_stm32f30x.c index e9e6473201..ba62fca619 100644 --- a/src/drivers/adc_stm32f30x.c +++ b/src/main/drivers/adc_stm32f30x.c @@ -2,15 +2,15 @@ #include #include "platform.h" -#include "system_common.h" +#include "system.h" -#include "gpio_common.h" +#include "gpio.h" -#include "sensors_common.h" // FIXME dependency into the main code +#include "sensors/sensors.h" // FIXME dependency into the main code -#include "accgyro_common.h" +#include "accgyro.h" -#include "adc_common.h" +#include "adc.h" extern adc_config_t adcConfig[ADC_CHANNEL_COUNT]; extern volatile uint16_t adcValues[ADC_CHANNEL_COUNT]; diff --git a/src/drivers/barometer_common.h b/src/main/drivers/barometer.h similarity index 100% rename from src/drivers/barometer_common.h rename to src/main/drivers/barometer.h diff --git a/src/drivers/barometer_bmp085.c b/src/main/drivers/barometer_bmp085.c similarity index 96% rename from src/drivers/barometer_bmp085.c rename to src/main/drivers/barometer_bmp085.c index 762134cc81..cafd3f1174 100755 --- a/src/drivers/barometer_bmp085.c +++ b/src/main/drivers/barometer_bmp085.c @@ -3,10 +3,10 @@ #include -#include "barometer_common.h" +#include "barometer.h" -#include "gpio_common.h" -#include "system_common.h" +#include "gpio.h" +#include "system.h" #include "bus_i2c.h" // BMP085, Standard address 0x77 diff --git a/src/drivers/barometer_bmp085.h b/src/main/drivers/barometer_bmp085.h similarity index 100% rename from src/drivers/barometer_bmp085.h rename to src/main/drivers/barometer_bmp085.h diff --git a/src/drivers/barometer_ms5611.c b/src/main/drivers/barometer_ms5611.c similarity index 95% rename from src/drivers/barometer_ms5611.c rename to src/main/drivers/barometer_ms5611.c index 9c6b49ae78..385a877b54 100644 --- a/src/drivers/barometer_ms5611.c +++ b/src/main/drivers/barometer_ms5611.c @@ -3,10 +3,10 @@ #include -#include "barometer_common.h" +#include "barometer.h" -#include "gpio_common.h" -#include "system_common.h" +#include "gpio.h" +#include "system.h" #include "bus_i2c.h" // MS5611, Standard address 0x77 diff --git a/src/drivers/barometer_ms5611.h b/src/main/drivers/barometer_ms5611.h similarity index 100% rename from src/drivers/barometer_ms5611.h rename to src/main/drivers/barometer_ms5611.h diff --git a/src/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h similarity index 100% rename from src/drivers/bus_i2c.h rename to src/main/drivers/bus_i2c.h diff --git a/src/drivers/bus_i2c_soft.c b/src/main/drivers/bus_i2c_soft.c similarity index 94% rename from src/drivers/bus_i2c_soft.c rename to src/main/drivers/bus_i2c_soft.c index bb855b06f6..d31328c822 100644 --- a/src/drivers/bus_i2c_soft.c +++ b/src/main/drivers/bus_i2c_soft.c @@ -5,7 +5,7 @@ #include "build_config.h" -#include "gpio_common.h" +#include "gpio.h" // Software I2C driver, using same pins as hardware I2C, with hw i2c module disabled. // SCL PB10 diff --git a/src/drivers/bus_i2c_stm32f10x.c b/src/main/drivers/bus_i2c_stm32f10x.c similarity index 97% rename from src/drivers/bus_i2c_stm32f10x.c rename to src/main/drivers/bus_i2c_stm32f10x.c index 298cfcd6db..e1f02b5a86 100755 --- a/src/drivers/bus_i2c_stm32f10x.c +++ b/src/main/drivers/bus_i2c_stm32f10x.c @@ -5,8 +5,8 @@ #include "build_config.h" -#include "gpio_common.h" -#include "system_common.h" +#include "gpio.h" +#include "system.h" #include "bus_i2c.h" diff --git a/src/drivers/bus_i2c_stm32f30x.c b/src/main/drivers/bus_i2c_stm32f30x.c similarity index 96% rename from src/drivers/bus_i2c_stm32f30x.c rename to src/main/drivers/bus_i2c_stm32f30x.c index c478b2b5ce..caae99fc19 100644 --- a/src/drivers/bus_i2c_stm32f30x.c +++ b/src/main/drivers/bus_i2c_stm32f30x.c @@ -5,8 +5,8 @@ #include "build_config.h" -#include "gpio_common.h" -#include "system_common.h" +#include "gpio.h" +#include "system.h" #include "bus_i2c.h" diff --git a/src/drivers/bus_spi.c b/src/main/drivers/bus_spi.c similarity index 94% rename from src/drivers/bus_spi.c rename to src/main/drivers/bus_spi.c index 85159c1125..4dd848726f 100644 --- a/src/drivers/bus_spi.c +++ b/src/main/drivers/bus_spi.c @@ -3,7 +3,7 @@ #include -#include "gpio_common.h" +#include "gpio.h" #include "bus_spi.h" diff --git a/src/drivers/bus_spi.h b/src/main/drivers/bus_spi.h similarity index 100% rename from src/drivers/bus_spi.h rename to src/main/drivers/bus_spi.h diff --git a/src/drivers/compass_hmc5883l.c b/src/main/drivers/compass_hmc5883l.c similarity index 96% rename from src/drivers/compass_hmc5883l.c rename to src/main/drivers/compass_hmc5883l.c index dd9e65a9e8..9473822157 100755 --- a/src/drivers/compass_hmc5883l.c +++ b/src/main/drivers/compass_hmc5883l.c @@ -9,13 +9,13 @@ #include "common/axis.h" #include "common/maths.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "bus_i2c.h" #include "light_led.h" -#include "boardalignment.h" -#include "sensors_common.h" +#include "sensors/boardalignment.h" +#include "sensors/sensors.h" #include "compass_hmc5883l.h" diff --git a/src/drivers/compass_hmc5883l.h b/src/main/drivers/compass_hmc5883l.h similarity index 100% rename from src/drivers/compass_hmc5883l.h rename to src/main/drivers/compass_hmc5883l.h diff --git a/src/drivers/gpio_common.h b/src/main/drivers/gpio.h similarity index 100% rename from src/drivers/gpio_common.h rename to src/main/drivers/gpio.h diff --git a/src/drivers/gpio_stm32f10x.c b/src/main/drivers/gpio_stm32f10x.c similarity index 96% rename from src/drivers/gpio_stm32f10x.c rename to src/main/drivers/gpio_stm32f10x.c index f536e74d6e..af357ae8c0 100644 --- a/src/drivers/gpio_stm32f10x.c +++ b/src/main/drivers/gpio_stm32f10x.c @@ -4,7 +4,7 @@ #include "platform.h" -#include "gpio_common.h" +#include "gpio.h" void gpioInit(GPIO_TypeDef *gpio, gpio_config_t *config) { diff --git a/src/drivers/gpio_stm32f30x.c b/src/main/drivers/gpio_stm32f30x.c similarity index 95% rename from src/drivers/gpio_stm32f30x.c rename to src/main/drivers/gpio_stm32f30x.c index 53f4dc9ec8..e05f4091b9 100644 --- a/src/drivers/gpio_stm32f30x.c +++ b/src/main/drivers/gpio_stm32f30x.c @@ -4,7 +4,7 @@ #include "platform.h" -#include "gpio_common.h" +#include "gpio.h" #define MODE_OFFSET 0 #define PUPD_OFFSET 2 diff --git a/src/drivers/light_led.h b/src/main/drivers/light_led.h similarity index 100% rename from src/drivers/light_led.h rename to src/main/drivers/light_led.h diff --git a/src/drivers/light_ledring.c b/src/main/drivers/light_ledring.c similarity index 89% rename from src/drivers/light_ledring.c rename to src/main/drivers/light_ledring.c index 6c07a86771..b325584501 100644 --- a/src/drivers/light_ledring.c +++ b/src/main/drivers/light_ledring.c @@ -10,10 +10,10 @@ #include "bus_i2c.h" // FIXME there should be no dependencies on the main source code -#include "escservo.h" -#include "rc_controls.h" -#include "sensors_common.h" -#include "flight_common.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "sensors/sensors.h" +#include "flight/flight.h" #include "light_ledring.h" diff --git a/src/drivers/light_ledring.h b/src/main/drivers/light_ledring.h similarity index 100% rename from src/drivers/light_ledring.h rename to src/main/drivers/light_ledring.h diff --git a/src/drivers/pwm_mapping.c b/src/main/drivers/pwm_mapping.c similarity index 96% rename from src/drivers/pwm_mapping.c rename to src/main/drivers/pwm_mapping.c index df4fa71f27..ba0b32cfdb 100755 --- a/src/drivers/pwm_mapping.c +++ b/src/main/drivers/pwm_mapping.c @@ -6,8 +6,8 @@ #include "platform.h" -#include "gpio_common.h" -#include "timer_common.h" +#include "gpio.h" +#include "timer.h" #include "pwm_output.h" #include "pwm_rssi.h" diff --git a/src/drivers/pwm_mapping.h b/src/main/drivers/pwm_mapping.h similarity index 100% rename from src/drivers/pwm_mapping.h rename to src/main/drivers/pwm_mapping.h diff --git a/src/drivers/pwm_output.c b/src/main/drivers/pwm_output.c similarity index 97% rename from src/drivers/pwm_output.c rename to src/main/drivers/pwm_output.c index 219645e3ec..737f526548 100644 --- a/src/drivers/pwm_output.c +++ b/src/main/drivers/pwm_output.c @@ -5,10 +5,10 @@ #include "platform.h" -#include "gpio_common.h" -#include "timer_common.h" +#include "gpio.h" +#include "timer.h" -#include "failsafe.h" // FIXME dependency into the main code from a driver +#include "flight/failsafe.h" // FIXME dependency into the main code from a driver #include "pwm_mapping.h" diff --git a/src/drivers/pwm_output.h b/src/main/drivers/pwm_output.h similarity index 100% rename from src/drivers/pwm_output.h rename to src/main/drivers/pwm_output.h diff --git a/src/drivers/pwm_rssi.c b/src/main/drivers/pwm_rssi.c similarity index 98% rename from src/drivers/pwm_rssi.c rename to src/main/drivers/pwm_rssi.c index ab8a2a2038..1135cf253d 100644 --- a/src/drivers/pwm_rssi.c +++ b/src/main/drivers/pwm_rssi.c @@ -5,8 +5,8 @@ #include "platform.h" -#include "gpio_common.h" -#include "timer_common.h" +#include "gpio.h" +#include "timer.h" #include "pwm_mapping.h" diff --git a/src/drivers/pwm_rssi.h b/src/main/drivers/pwm_rssi.h similarity index 100% rename from src/drivers/pwm_rssi.h rename to src/main/drivers/pwm_rssi.h diff --git a/src/drivers/pwm_rx.c b/src/main/drivers/pwm_rx.c similarity index 98% rename from src/drivers/pwm_rx.c rename to src/main/drivers/pwm_rx.c index 6cf2f676e0..eb3895d69a 100644 --- a/src/drivers/pwm_rx.c +++ b/src/main/drivers/pwm_rx.c @@ -5,8 +5,8 @@ #include "platform.h" -#include "gpio_common.h" -#include "timer_common.h" +#include "gpio.h" +#include "timer.h" #include "pwm_mapping.h" diff --git a/src/drivers/pwm_rx.h b/src/main/drivers/pwm_rx.h similarity index 100% rename from src/drivers/pwm_rx.h rename to src/main/drivers/pwm_rx.h diff --git a/src/drivers/serial_common.c b/src/main/drivers/serial.c similarity index 92% rename from src/drivers/serial_common.c rename to src/main/drivers/serial.c index d55be05e5d..203c8f2674 100644 --- a/src/drivers/serial_common.c +++ b/src/main/drivers/serial.c @@ -3,7 +3,7 @@ #include "platform.h" -#include "serial_common.h" +#include "serial.h" void serialPrint(serialPort_t *instance, const char *str) { diff --git a/src/drivers/serial_common.h b/src/main/drivers/serial.h similarity index 100% rename from src/drivers/serial_common.h rename to src/main/drivers/serial.h diff --git a/src/drivers/serial_softserial.c b/src/main/drivers/serial_softserial.c similarity index 95% rename from src/drivers/serial_softserial.c rename to src/main/drivers/serial_softserial.c index 62ab548bec..bcac31cc64 100644 --- a/src/drivers/serial_softserial.c +++ b/src/main/drivers/serial_softserial.c @@ -4,11 +4,11 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" -#include "timer_common.h" +#include "system.h" +#include "gpio.h" +#include "timer.h" -#include "serial_common.h" +#include "serial.h" #include "serial_softserial.h" #if defined(STM32F10X_MD) || defined(CHEBUZZF3) diff --git a/src/drivers/serial_softserial.h b/src/main/drivers/serial_softserial.h similarity index 100% rename from src/drivers/serial_softserial.h rename to src/main/drivers/serial_softserial.h diff --git a/src/drivers/serial_uart_common.c b/src/main/drivers/serial_uart.c similarity index 96% rename from src/drivers/serial_uart_common.c rename to src/main/drivers/serial_uart.c index 536eef763b..7894358e2e 100644 --- a/src/drivers/serial_uart_common.c +++ b/src/main/drivers/serial_uart.c @@ -9,8 +9,8 @@ #include "platform.h" -#include "serial_common.h" -#include "serial_uart_common.h" +#include "serial.h" +#include "serial_uart.h" uartPort_t *serialUSART1(uint32_t baudRate, portMode_t mode); uartPort_t *serialUSART2(uint32_t baudRate, portMode_t mode); diff --git a/src/drivers/serial_uart_common.h b/src/main/drivers/serial_uart.h similarity index 100% rename from src/drivers/serial_uart_common.h rename to src/main/drivers/serial_uart.h diff --git a/src/drivers/serial_uart_stm32f10x.c b/src/main/drivers/serial_uart_stm32f10x.c similarity index 94% rename from src/drivers/serial_uart_stm32f10x.c rename to src/main/drivers/serial_uart_stm32f10x.c index a16baacbf3..73b09df7fc 100755 --- a/src/drivers/serial_uart_stm32f10x.c +++ b/src/main/drivers/serial_uart_stm32f10x.c @@ -11,11 +11,11 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" -#include "serial_common.h" -#include "serial_uart_common.h" +#include "serial.h" +#include "serial_uart.h" static uartPort_t uartPort1; static uartPort_t uartPort2; diff --git a/src/drivers/serial_uart_stm32f30x.c b/src/main/drivers/serial_uart_stm32f30x.c similarity index 94% rename from src/drivers/serial_uart_stm32f30x.c rename to src/main/drivers/serial_uart_stm32f30x.c index f6f07a9166..d2ca85332b 100644 --- a/src/drivers/serial_uart_stm32f30x.c +++ b/src/main/drivers/serial_uart_stm32f30x.c @@ -12,11 +12,11 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" -#include "serial_common.h" -#include "serial_uart_common.h" +#include "serial.h" +#include "serial_uart.h" // Using RX DMA disables the use of receive callbacks #define USE_USART1_RX_DMA diff --git a/src/drivers/sonar_hcsr04.c b/src/main/drivers/sonar_hcsr04.c similarity index 95% rename from src/drivers/sonar_hcsr04.c rename to src/main/drivers/sonar_hcsr04.c index 72b8c4940a..3867a67b84 100644 --- a/src/drivers/sonar_hcsr04.c +++ b/src/main/drivers/sonar_hcsr04.c @@ -4,8 +4,8 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "sonar_hcsr04.h" diff --git a/src/drivers/sonar_hcsr04.h b/src/main/drivers/sonar_hcsr04.h similarity index 100% rename from src/drivers/sonar_hcsr04.h rename to src/main/drivers/sonar_hcsr04.h diff --git a/src/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c similarity index 89% rename from src/drivers/sound_beeper.c rename to src/main/drivers/sound_beeper.c index d8cac315d9..43bd2e9d18 100644 --- a/src/drivers/sound_beeper.c +++ b/src/main/drivers/sound_beeper.c @@ -5,8 +5,8 @@ #include "platform.h" -#include "system_common.h" -#include "gpio_common.h" +#include "system.h" +#include "gpio.h" #include "sound_beeper.h" diff --git a/src/drivers/sound_beeper.h b/src/main/drivers/sound_beeper.h similarity index 100% rename from src/drivers/sound_beeper.h rename to src/main/drivers/sound_beeper.h diff --git a/src/drivers/system_common.c b/src/main/drivers/system.c similarity index 95% rename from src/drivers/system_common.c rename to src/main/drivers/system.c index af0e0f9930..e11f05c398 100755 --- a/src/drivers/system_common.c +++ b/src/main/drivers/system.c @@ -5,13 +5,13 @@ #include "platform.h" -#include "gpio_common.h" +#include "gpio.h" #include "light_led.h" #include "sound_beeper.h" #include "bus_i2c.h" #include "bus_spi.h" -#include "system_common.h" +#include "system.h" // cycles per microsecond static volatile uint32_t usTicks = 0; diff --git a/src/drivers/system_common.h b/src/main/drivers/system.h similarity index 100% rename from src/drivers/system_common.h rename to src/main/drivers/system.h diff --git a/src/drivers/timer_common.c b/src/main/drivers/timer.c similarity index 96% rename from src/drivers/timer_common.c rename to src/main/drivers/timer.c index cec19f584b..5d9b2b478a 100644 --- a/src/drivers/timer_common.c +++ b/src/main/drivers/timer.c @@ -6,10 +6,10 @@ #include "platform.h" -#include "gpio_common.h" -#include "system_common.h" +#include "gpio.h" +#include "system.h" -#include "timer_common.h" +#include "timer.h" /* FreeFlight/Naze32 timer layout TIM2_CH1 RC1 PWM1 diff --git a/src/drivers/timer_common.h b/src/main/drivers/timer.h similarity index 100% rename from src/drivers/timer_common.h rename to src/main/drivers/timer.h diff --git a/src/flight_autotune.c b/src/main/flight/autotune.c similarity index 96% rename from src/flight_autotune.c rename to src/main/flight/autotune.c index 96e9c98d5a..ee51c022fc 100644 --- a/src/flight_autotune.c +++ b/src/main/flight/autotune.c @@ -6,9 +6,9 @@ #include "common/axis.h" #include "common/maths.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "flight_common.h" +#include "flight/flight.h" extern int16_t debug[4]; diff --git a/src/flight_autotune.h b/src/main/flight/autotune.h similarity index 100% rename from src/flight_autotune.h rename to src/main/flight/autotune.h diff --git a/src/failsafe.c b/src/main/flight/failsafe.c similarity index 91% rename from src/failsafe.c rename to src/main/flight/failsafe.c index c6fcdde7c5..3b5f0dd60b 100644 --- a/src/failsafe.c +++ b/src/main/flight/failsafe.c @@ -3,12 +3,12 @@ #include "common/axis.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rx_common.h" -#include "runtime_config.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "rx/rx.h" +#include "config/runtime_config.h" -#include "failsafe.h" +#include "flight/failsafe.h" /* * Usage: diff --git a/src/failsafe.h b/src/main/flight/failsafe.h similarity index 100% rename from src/failsafe.h rename to src/main/flight/failsafe.h diff --git a/src/flight_common.c b/src/main/flight/flight.c similarity index 96% rename from src/flight_common.c rename to src/main/flight/flight.c index e3a7a66550..39e7e305cb 100644 --- a/src/flight_common.c +++ b/src/main/flight/flight.c @@ -5,15 +5,15 @@ #include "common/axis.h" #include "common/maths.h" -#include "runtime_config.h" +#include "config/runtime_config.h" -#include "drivers/accgyro_common.h" -#include "sensors_common.h" -#include "sensors_gyro.h" -#include "rc_controls.h" -#include "flight_common.h" -#include "flight_autotune.h" -#include "gps_common.h" +#include "drivers/accgyro.h" +#include "sensors/sensors.h" +#include "sensors/gyro.h" +#include "io/rc_controls.h" +#include "flight/flight.h" +#include "flight/autotune.h" +#include "io/gps.h" extern uint16_t cycleTime; diff --git a/src/flight_common.h b/src/main/flight/flight.h similarity index 100% rename from src/flight_common.h rename to src/main/flight/flight.h diff --git a/src/flight_imu.c b/src/main/flight/imu.c similarity index 92% rename from src/flight_imu.c rename to src/main/flight/imu.c index b77acefe29..1bc4d2f3ef 100755 --- a/src/flight_imu.c +++ b/src/main/flight/imu.c @@ -9,36 +9,36 @@ #include #include "common/axis.h" -#include "flight_common.h" +#include "flight/flight.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "sensors_common.h" -#include "drivers/accgyro_common.h" -#include "sensors_gyro.h" -#include "sensors_compass.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" +#include "sensors/sensors.h" +#include "drivers/accgyro.h" +#include "sensors/gyro.h" +#include "sensors/compass.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" -#include "gps_common.h" +#include "io/gps.h" -#include "gimbal.h" -#include "flight_mixer.h" +#include "io/gimbal.h" +#include "flight/mixer.h" // FIXME remove dependency on config.h -#include "boardalignment.h" -#include "battery.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rx_common.h" -#include "drivers/serial_common.h" -#include "serial_common.h" -#include "telemetry_common.h" -#include "failsafe.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "sensors/boardalignment.h" +#include "io/battery.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "rx/rx.h" +#include "drivers/serial.h" +#include "io/serial.h" +#include "telemetry/telemetry.h" +#include "flight/failsafe.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" int16_t gyroADC[XYZ_AXIS_COUNT], accADC[XYZ_AXIS_COUNT], accSmooth[XYZ_AXIS_COUNT]; diff --git a/src/flight_imu.h b/src/main/flight/imu.h similarity index 100% rename from src/flight_imu.h rename to src/main/flight/imu.h diff --git a/src/flight_mixer.c b/src/main/flight/mixer.c similarity index 96% rename from src/flight_mixer.c rename to src/main/flight/mixer.c index 123ffed8cd..5c9346e649 100755 --- a/src/flight_mixer.c +++ b/src/main/flight/mixer.c @@ -7,20 +7,20 @@ #include "common/axis.h" #include "common/maths.h" -#include "drivers/gpio_common.h" -#include "drivers/timer_common.h" +#include "drivers/gpio.h" +#include "drivers/timer.h" #include "drivers/pwm_output.h" -#include "gimbal.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rx_common.h" +#include "io/gimbal.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "rx/rx.h" -#include "flight_mixer.h" -#include "flight_common.h" +#include "flight/mixer.h" +#include "flight/flight.h" -#include "runtime_config.h" -#include "config.h" +#include "config/runtime_config.h" +#include "config/config.h" static uint8_t numberMotor = 0; diff --git a/src/flight_mixer.h b/src/main/flight/mixer.h similarity index 100% rename from src/flight_mixer.h rename to src/main/flight/mixer.h diff --git a/src/battery.c b/src/main/io/battery.c similarity index 93% rename from src/battery.c rename to src/main/io/battery.c index f34dd72841..f51abb6446 100644 --- a/src/battery.c +++ b/src/main/io/battery.c @@ -1,10 +1,10 @@ #include "stdbool.h" #include "stdint.h" -#include "drivers/adc_common.h" -#include "drivers/system_common.h" +#include "drivers/adc.h" +#include "drivers/system.h" -#include "battery.h" +#include "io/battery.h" // Battery monitoring stuff uint8_t batteryCellCount = 3; // cell count diff --git a/src/battery.h b/src/main/io/battery.h similarity index 100% rename from src/battery.h rename to src/main/io/battery.h diff --git a/src/buzzer.c b/src/main/io/buzzer.c similarity index 93% rename from src/buzzer.c rename to src/main/io/buzzer.c index 3956a447ff..60ca417e22 100644 --- a/src/buzzer.c +++ b/src/main/io/buzzer.c @@ -3,13 +3,13 @@ #include "platform.h" #include "drivers/sound_beeper.h" -#include "drivers/system_common.h" -#include "failsafe.h" -#include "sensors_common.h" -#include "runtime_config.h" -#include "config.h" +#include "drivers/system.h" +#include "flight/failsafe.h" +#include "sensors/sensors.h" +#include "config/runtime_config.h" +#include "config/config.h" -#include "buzzer.h" +#include "io/buzzer.h" #define DOUBLE_PAUSE_DURATION_MILLIS (LONG_PAUSE_DURATION_MILLIS * 2) #define LONG_PAUSE_DURATION_MILLIS 400 diff --git a/src/buzzer.h b/src/main/io/buzzer.h similarity index 100% rename from src/buzzer.h rename to src/main/io/buzzer.h diff --git a/src/escservo.h b/src/main/io/escservo.h similarity index 100% rename from src/escservo.h rename to src/main/io/escservo.h diff --git a/src/gimbal.h b/src/main/io/gimbal.h similarity index 100% rename from src/gimbal.h rename to src/main/io/gimbal.h diff --git a/src/gps_common.c b/src/main/io/gps.c similarity index 96% rename from src/gps_common.c rename to src/main/io/gps.c index 3b63e7725c..b13c634411 100644 --- a/src/gps_common.c +++ b/src/main/io/gps.c @@ -8,25 +8,25 @@ #include "common/maths.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "drivers/serial_uart_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/serial_uart.h" +#include "io/serial.h" -#include "drivers/gpio_common.h" +#include "drivers/gpio.h" #include "drivers/light_led.h" #include "common/axis.h" -#include "flight_common.h" +#include "flight/flight.h" -#include "sensors_common.h" +#include "sensors/sensors.h" -#include "config.h" -#include "runtime_config.h" +#include "config/config.h" +#include "config/runtime_config.h" #include "gps_conversion.h" -#include "gps_common.h" +#include "io/gps.h" extern int16_t debug[4]; diff --git a/src/gps_common.h b/src/main/io/gps.h similarity index 100% rename from src/gps_common.h rename to src/main/io/gps.h diff --git a/src/gps_conversion.c b/src/main/io/gps_conversion.c similarity index 100% rename from src/gps_conversion.c rename to src/main/io/gps_conversion.c diff --git a/src/gps_conversion.h b/src/main/io/gps_conversion.h similarity index 100% rename from src/gps_conversion.h rename to src/main/io/gps_conversion.h diff --git a/src/rc_controls.c b/src/main/io/rc_controls.c similarity index 88% rename from src/rc_controls.c rename to src/main/io/rc_controls.c index 813581877a..6041aab67e 100644 --- a/src/rc_controls.c +++ b/src/main/io/rc_controls.c @@ -5,7 +5,7 @@ #include "common/maths.h" -#include "rc_controls.h" +#include "io/rc_controls.h" int16_t rcCommand[4]; // interval [1000;2000] for THROTTLE and [-500;+500] for ROLL/PITCH/YAW diff --git a/src/rc_controls.h b/src/main/io/rc_controls.h similarity index 100% rename from src/rc_controls.h rename to src/main/io/rc_controls.h diff --git a/src/rc_curves.c b/src/main/io/rc_curves.c similarity index 91% rename from src/rc_curves.c rename to src/main/io/rc_curves.c index dbe3d6cf9a..4a44beef48 100644 --- a/src/rc_curves.c +++ b/src/main/io/rc_curves.c @@ -1,10 +1,10 @@ #include #include -#include "rc_controls.h" -#include "escservo.h" +#include "io/rc_controls.h" +#include "io/escservo.h" -#include "rc_curves.h" +#include "io/rc_curves.h" int16_t lookupPitchRollRC[PITCH_LOOKUP_LENGTH]; // lookup table for expo & RC rate PITCH+ROLL int16_t lookupThrottleRC[THROTTLE_LOOKUP_LENGTH]; // lookup table for expo & mid THROTTLE diff --git a/src/rc_curves.h b/src/main/io/rc_curves.h similarity index 100% rename from src/rc_curves.h rename to src/main/io/rc_curves.h diff --git a/src/serial_common.c b/src/main/io/serial.c similarity index 96% rename from src/serial_common.c rename to src/main/io/serial.c index 6896303dce..84beaedc1f 100644 --- a/src/serial_common.c +++ b/src/main/io/serial.c @@ -5,18 +5,18 @@ #include "platform.h" -#include "drivers/system_common.h" -#include "drivers/gpio_common.h" -#include "drivers/timer_common.h" -#include "drivers/serial_common.h" +#include "drivers/system.h" +#include "drivers/gpio.h" +#include "drivers/timer.h" +#include "drivers/serial.h" #include "drivers/serial_softserial.h" -#include "drivers/serial_uart_common.h" +#include "drivers/serial_uart.h" #include "serial_cli.h" #include "serial_msp.h" -#include "serial_common.h" -#include "config.h" +#include "io/serial.h" +#include "config/config.h" uint32_t getTelemetryProviderBaudRate(void); void updateSerialRxFunctionConstraint(functionConstraint_t *functionConstraintToUpdate); diff --git a/src/serial_common.h b/src/main/io/serial.h similarity index 100% rename from src/serial_common.h rename to src/main/io/serial.h diff --git a/src/serial_cli.c b/src/main/io/serial_cli.c similarity index 95% rename from src/serial_cli.c rename to src/main/io/serial_cli.c index a900b49f51..cad1bc3797 100644 --- a/src/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -11,31 +11,31 @@ #include "common/axis.h" #include "common/typeconversion.h" -#include "drivers/system_common.h" -#include "drivers/accgyro_common.h" -#include "drivers/serial_common.h" +#include "drivers/system.h" +#include "drivers/accgyro.h" +#include "drivers/serial.h" #include "drivers/bus_i2c.h" -#include "serial_common.h" -#include "flight_common.h" -#include "flight_mixer.h" -#include "escservo.h" -#include "rc_controls.h" -#include "boardalignment.h" -#include "telemetry_common.h" -#include "gps_common.h" -#include "rx_common.h" -#include "battery.h" -#include "gimbal.h" -#include "sensors_common.h" -#include "sensors_acceleration.h" -#include "sensors_gyro.h" -#include "sensors_barometer.h" -#include "failsafe.h" +#include "io/serial.h" +#include "flight/flight.h" +#include "flight/mixer.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "sensors/boardalignment.h" +#include "telemetry/telemetry.h" +#include "io/gps.h" +#include "rx/rx.h" +#include "io/battery.h" +#include "io/gimbal.h" +#include "sensors/sensors.h" +#include "sensors/acceleration.h" +#include "sensors/gyro.h" +#include "sensors/barometer.h" +#include "flight/failsafe.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" #include "common/printf.h" diff --git a/src/serial_cli.h b/src/main/io/serial_cli.h similarity index 100% rename from src/serial_cli.h rename to src/main/io/serial_cli.h diff --git a/src/serial_msp.c b/src/main/io/serial_msp.c similarity index 95% rename from src/serial_msp.c rename to src/main/io/serial_msp.c index 7c8cbab2ed..9403d4a921 100755 --- a/src/serial_msp.c +++ b/src/main/io/serial_msp.c @@ -10,34 +10,34 @@ #include "common/maths.h" #include "common/axis.h" -#include "drivers/system_common.h" -#include "drivers/accgyro_common.h" -#include "drivers/serial_common.h" +#include "drivers/system.h" +#include "drivers/accgyro.h" +#include "drivers/serial.h" #include "drivers/bus_i2c.h" -#include "serial_common.h" -#include "flight_common.h" -#include "flight_mixer.h" -#include "escservo.h" -#include "rc_controls.h" -#include "boardalignment.h" -#include "gps_common.h" -#include "rx_common.h" -#include "rx_msp.h" -#include "battery.h" -#include "gimbal.h" -#include "telemetry_common.h" -#include "sensors_common.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" -#include "sensors_compass.h" -#include "sensors_gyro.h" -#include "failsafe.h" +#include "io/serial.h" +#include "flight/flight.h" +#include "flight/mixer.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "sensors/boardalignment.h" +#include "io/gps.h" +#include "rx/rx.h" +#include "rx/msp.h" +#include "io/battery.h" +#include "io/gimbal.h" +#include "telemetry/telemetry.h" +#include "sensors/sensors.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" +#include "sensors/compass.h" +#include "sensors/gyro.h" +#include "flight/failsafe.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" #include "version.h" @@ -483,7 +483,7 @@ static void evaluateCommand(void) break; case MSP_IDENT: headSerialReply(7); - serialize8(VERSION); // multiwii version + serialize8(MW_VERSION); serialize8(masterConfig.mixerConfiguration); // type of multicopter serialize8(MSP_VERSION); // MultiWii Serial Protocol Version serialize32(CAP_PLATFORM_32BIT | CAP_DYNBALANCE | (masterConfig.airplaneConfig.flaps_speed ? CAP_FLAPS : 0) | CAP_CHANNEL_FORWARDING); // "capability" diff --git a/src/serial_msp.h b/src/main/io/serial_msp.h similarity index 100% rename from src/serial_msp.h rename to src/main/io/serial_msp.h diff --git a/src/statusindicator.c b/src/main/io/statusindicator.c similarity index 83% rename from src/statusindicator.c rename to src/main/io/statusindicator.c index c643fdd109..846c7be42c 100644 --- a/src/statusindicator.c +++ b/src/main/io/statusindicator.c @@ -4,8 +4,8 @@ #include "platform.h" -#include "drivers/system_common.h" -#include "drivers/gpio_common.h" +#include "drivers/system.h" +#include "drivers/gpio.h" #include "drivers/light_led.h" #include "drivers/sound_beeper.h" diff --git a/src/statusindicator.h b/src/main/io/statusindicator.h similarity index 100% rename from src/statusindicator.h rename to src/main/io/statusindicator.h diff --git a/src/main.c b/src/main/main.c similarity index 85% rename from src/main.c rename to src/main/main.c index c09c8ce169..e13d8136ce 100755 --- a/src/main.c +++ b/src/main/main.c @@ -6,41 +6,41 @@ #include "common/axis.h" -#include "drivers/system_common.h" -#include "drivers/gpio_common.h" +#include "drivers/system.h" +#include "drivers/gpio.h" #include "drivers/light_led.h" #include "drivers/sound_beeper.h" -#include "drivers/timer_common.h" -#include "drivers/serial_common.h" +#include "drivers/timer.h" +#include "drivers/serial.h" #include "drivers/serial_softserial.h" -#include "drivers/serial_uart_common.h" -#include "drivers/accgyro_common.h" +#include "drivers/serial_uart.h" +#include "drivers/accgyro.h" #include "drivers/pwm_mapping.h" -#include "drivers/adc_common.h" +#include "drivers/adc.h" -#include "flight_common.h" -#include "flight_mixer.h" +#include "flight/flight.h" +#include "flight/mixer.h" -#include "serial_common.h" -#include "failsafe.h" +#include "io/serial.h" +#include "flight/failsafe.h" -#include "gps_common.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rx_common.h" -#include "gimbal.h" -#include "sensors_common.h" -#include "sensors_sonar.h" -#include "sensors_barometer.h" -#include "sensors_acceleration.h" -#include "sensors_gyro.h" -#include "telemetry_common.h" -#include "battery.h" -#include "boardalignment.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "io/gps.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "rx/rx.h" +#include "io/gimbal.h" +#include "sensors/sensors.h" +#include "sensors/sonar.h" +#include "sensors/barometer.h" +#include "sensors/acceleration.h" +#include "sensors/gyro.h" +#include "telemetry/telemetry.h" +#include "io/battery.h" +#include "sensors/boardalignment.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" #include "build_config.h" diff --git a/src/mw.c b/src/main/mw.c similarity index 93% rename from src/mw.c rename to src/main/mw.c index f5a7e82b61..9685e5522e 100755 --- a/src/mw.c +++ b/src/main/mw.c @@ -8,43 +8,43 @@ #include "common/maths.h" #include "common/axis.h" -#include "drivers/accgyro_common.h" +#include "drivers/accgyro.h" #include "drivers/light_ledring.h" #include "drivers/light_led.h" -#include "drivers/gpio_common.h" -#include "drivers/system_common.h" -#include "drivers/serial_common.h" +#include "drivers/gpio.h" +#include "drivers/system.h" +#include "drivers/serial.h" -#include "boardalignment.h" -#include "battery.h" -#include "buzzer.h" -#include "escservo.h" -#include "failsafe.h" -#include "flight_imu.h" -#include "flight_common.h" -#include "flight_autotune.h" -#include "flight_mixer.h" -#include "gimbal.h" -#include "gps_common.h" -#include "sensors_common.h" -#include "sensors_sonar.h" -#include "sensors_compass.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" -#include "sensors_gyro.h" -#include "serial_cli.h" -#include "serial_common.h" -#include "statusindicator.h" -#include "rc_controls.h" -#include "rc_curves.h" -#include "rx_common.h" -#include "rx_msp.h" -#include "telemetry_common.h" +#include "sensors/boardalignment.h" +#include "io/battery.h" +#include "io/buzzer.h" +#include "io/escservo.h" +#include "flight/failsafe.h" +#include "flight/imu.h" +#include "flight/flight.h" +#include "flight/autotune.h" +#include "flight/mixer.h" +#include "io/gimbal.h" +#include "io/gps.h" +#include "sensors/sensors.h" +#include "sensors/sonar.h" +#include "sensors/compass.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" +#include "sensors/gyro.h" +#include "io/serial_cli.h" +#include "io/serial.h" +#include "io/statusindicator.h" +#include "io/rc_controls.h" +#include "io/rc_curves.h" +#include "rx/rx.h" +#include "rx/msp.h" +#include "telemetry/telemetry.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" // June 2013 V2.2-dev diff --git a/src/platform.h b/src/main/platform.h similarity index 100% rename from src/platform.h rename to src/main/platform.h diff --git a/src/rx_msp.c b/src/main/rx/msp.c similarity index 78% rename from src/rx_msp.c rename to src/main/rx/msp.c index a7746cce11..82225cb19c 100644 --- a/src/rx_msp.c +++ b/src/main/rx/msp.c @@ -3,14 +3,14 @@ #include "platform.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "drivers/serial_uart_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/serial_uart.h" +#include "io/serial.h" -#include "rx_common.h" -#include "rx_msp.h" +#include "rx/rx.h" +#include "rx/msp.h" static bool rxMspFrameDone = false; diff --git a/src/rx_msp.h b/src/main/rx/msp.h similarity index 100% rename from src/rx_msp.h rename to src/main/rx/msp.h diff --git a/src/rx_pwm.c b/src/main/rx/pwm.c similarity index 88% rename from src/rx_pwm.c rename to src/main/rx/pwm.c index abad0b3db5..d54906d8ef 100644 --- a/src/rx_pwm.c +++ b/src/main/rx/pwm.c @@ -8,10 +8,10 @@ #include "drivers/pwm_rx.h" -#include "config.h" +#include "config/config.h" -#include "rx_common.h" -#include "rx_pwm.h" +#include "rx/rx.h" +#include "rx/pwm.h" static uint16_t pwmReadRawRC(rxRuntimeConfig_t *rxRuntimeConfig, uint8_t chan) { diff --git a/src/rx_pwm.h b/src/main/rx/pwm.h similarity index 100% rename from src/rx_pwm.h rename to src/main/rx/pwm.h diff --git a/src/rx_common.c b/src/main/rx/rx.c similarity index 93% rename from src/rx_common.c rename to src/main/rx/rx.c index ef2b4a37e5..540f913238 100644 --- a/src/rx_common.c +++ b/src/main/rx/rx.c @@ -8,22 +8,22 @@ #include "common/maths.h" -#include "config.h" +#include "config/config.h" -#include "drivers/serial_common.h" -#include "drivers/adc_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/adc.h" +#include "io/serial.h" -#include "failsafe.h" +#include "flight/failsafe.h" #include "drivers/pwm_rx.h" -#include "rx_pwm.h" -#include "rx_sbus.h" -#include "rx_spektrum.h" -#include "rx_sumd.h" -#include "rx_msp.h" +#include "rx/pwm.h" +#include "rx/sbus.h" +#include "rx/spektrum.h" +#include "rx/sumd.h" +#include "rx/msp.h" -#include "rx_common.h" +#include "rx/rx.h" extern int16_t debug[4]; diff --git a/src/rx_common.h b/src/main/rx/rx.h similarity index 100% rename from src/rx_common.h rename to src/main/rx/rx.h diff --git a/src/rx_sbus.c b/src/main/rx/sbus.c similarity index 91% rename from src/rx_sbus.c rename to src/main/rx/sbus.c index 69f58bea54..754dcd8e53 100644 --- a/src/rx_sbus.c +++ b/src/main/rx/sbus.c @@ -4,14 +4,14 @@ #include "platform.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "drivers/serial_uart_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/serial_uart.h" +#include "io/serial.h" -#include "rx_common.h" -#include "rx_sbus.h" +#include "rx/rx.h" +#include "rx/sbus.h" #define SBUS_MAX_CHANNEL 12 #define SBUS_FRAME_SIZE 25 diff --git a/src/rx_sbus.h b/src/main/rx/sbus.h similarity index 100% rename from src/rx_sbus.h rename to src/main/rx/sbus.h diff --git a/src/rx_spektrum.c b/src/main/rx/spektrum.c similarity index 91% rename from src/rx_spektrum.c rename to src/main/rx/spektrum.c index 21375188e7..1d16549de2 100644 --- a/src/rx_spektrum.c +++ b/src/main/rx/spektrum.c @@ -4,14 +4,14 @@ #include "platform.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "drivers/serial_uart_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/serial_uart.h" +#include "io/serial.h" -#include "rx_common.h" -#include "rx_spektrum.h" +#include "rx/rx.h" +#include "rx/spektrum.h" // driver for spektrum satellite receiver / sbus diff --git a/src/rx_spektrum.h b/src/main/rx/spektrum.h similarity index 100% rename from src/rx_spektrum.h rename to src/main/rx/spektrum.h diff --git a/src/rx_sumd.c b/src/main/rx/sumd.c similarity index 90% rename from src/rx_sumd.c rename to src/main/rx/sumd.c index 47d18bfa6a..00692eb967 100644 --- a/src/rx_sumd.c +++ b/src/main/rx/sumd.c @@ -4,14 +4,14 @@ #include "platform.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "drivers/serial_uart_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "drivers/serial_uart.h" +#include "io/serial.h" -#include "rx_common.h" -#include "rx_sumd.h" +#include "rx/rx.h" +#include "rx/sumd.h" // driver for SUMD receiver using UART2 diff --git a/src/rx_sumd.h b/src/main/rx/sumd.h similarity index 100% rename from src/rx_sumd.h rename to src/main/rx/sumd.h diff --git a/src/sensors_acceleration.c b/src/main/sensors/acceleration.c similarity index 93% rename from src/sensors_acceleration.c rename to src/main/sensors/acceleration.c index 421b4df10c..874bd3ca4f 100644 --- a/src/sensors_acceleration.c +++ b/src/main/sensors/acceleration.c @@ -5,15 +5,15 @@ #include "common/axis.h" -#include "drivers/accgyro_common.h" -#include "flight_common.h" -#include "sensors_common.h" -#include "buzzer.h" -#include "boardalignment.h" -#include "runtime_config.h" -#include "config.h" +#include "drivers/accgyro.h" +#include "flight/flight.h" +#include "sensors/sensors.h" +#include "io/buzzer.h" +#include "sensors/boardalignment.h" +#include "config/runtime_config.h" +#include "config/config.h" -#include "sensors_acceleration.h" +#include "sensors/acceleration.h" acc_t acc; // acc access functions uint8_t accHardware = ACC_DEFAULT; // which accel chip is used/detected diff --git a/src/sensors_acceleration.h b/src/main/sensors/acceleration.h similarity index 100% rename from src/sensors_acceleration.h rename to src/main/sensors/acceleration.h diff --git a/src/sensors_barometer.c b/src/main/sensors/barometer.c similarity index 94% rename from src/sensors_barometer.c rename to src/main/sensors/barometer.c index 58b1f97cd9..8c345dbae6 100644 --- a/src/sensors_barometer.c +++ b/src/main/sensors/barometer.c @@ -4,10 +4,10 @@ #include "platform.h" -#include "drivers/barometer_common.h" -#include "config.h" +#include "drivers/barometer.h" +#include "config/config.h" -#include "sensors_barometer.h" +#include "sensors/barometer.h" baro_t baro; // barometer access functions uint16_t calibratingB = 0; // baro calibration = get new ground pressure value diff --git a/src/sensors_barometer.h b/src/main/sensors/barometer.h similarity index 100% rename from src/sensors_barometer.h rename to src/main/sensors/barometer.h diff --git a/src/boardalignment.c b/src/main/sensors/boardalignment.c similarity index 95% rename from src/boardalignment.c rename to src/main/sensors/boardalignment.c index ccfddcf70e..5ec3126b9a 100644 --- a/src/boardalignment.c +++ b/src/main/sensors/boardalignment.c @@ -6,7 +6,7 @@ #include "common/maths.h" #include "common/axis.h" -#include "sensors_common.h" +#include "sensors.h" #include "boardalignment.h" diff --git a/src/boardalignment.h b/src/main/sensors/boardalignment.h similarity index 100% rename from src/boardalignment.h rename to src/main/sensors/boardalignment.h diff --git a/src/sensors_compass.c b/src/main/sensors/compass.c similarity index 88% rename from src/sensors_compass.c rename to src/main/sensors/compass.c index 9b639b776e..6bf744da2e 100644 --- a/src/sensors_compass.c +++ b/src/main/sensors/compass.c @@ -6,16 +6,16 @@ #include "common/axis.h" #include "drivers/compass_hmc5883l.h" -#include "drivers/gpio_common.h" +#include "drivers/gpio.h" #include "drivers/light_led.h" -#include "flight_common.h" -#include "boardalignment.h" -#include "runtime_config.h" -#include "config.h" +#include "flight/flight.h" +#include "sensors/boardalignment.h" +#include "config/runtime_config.h" +#include "config/config.h" -#include "sensors_common.h" -#include "sensors_compass.h" +#include "sensors/sensors.h" +#include "sensors/compass.h" extern uint32_t currentTime; // FIXME dependency on global variable, pass it in instead. diff --git a/src/sensors_compass.h b/src/main/sensors/compass.h similarity index 100% rename from src/sensors_compass.h rename to src/main/sensors/compass.h diff --git a/src/sensors_gyro.c b/src/main/sensors/gyro.c similarity index 89% rename from src/sensors_gyro.c rename to src/main/sensors/gyro.c index 94cc7098d2..2e99a89765 100644 --- a/src/sensors_gyro.c +++ b/src/main/sensors/gyro.c @@ -6,13 +6,13 @@ #include "common/axis.h" #include "common/maths.h" -#include "drivers/accgyro_common.h" -#include "flight_common.h" -#include "sensors_common.h" -#include "statusindicator.h" -#include "boardalignment.h" +#include "drivers/accgyro.h" +#include "flight/flight.h" +#include "sensors/sensors.h" +#include "io/statusindicator.h" +#include "sensors/boardalignment.h" -#include "sensors_gyro.h" +#include "sensors/gyro.h" uint16_t calibratingG = 0; diff --git a/src/sensors_gyro.h b/src/main/sensors/gyro.h similarity index 100% rename from src/sensors_gyro.h rename to src/main/sensors/gyro.h diff --git a/src/sensors_initialisation.c b/src/main/sensors/initialisation.c similarity index 92% rename from src/sensors_initialisation.c rename to src/main/sensors/initialisation.c index 4ae4d3c6f7..c4b03020c9 100755 --- a/src/sensors_initialisation.c +++ b/src/main/sensors/initialisation.c @@ -5,7 +5,7 @@ #include "platform.h" #include "common/axis.h" -#include "drivers/accgyro_common.h" +#include "drivers/accgyro.h" #include "drivers/accgyro_adxl345.h" #include "drivers/accgyro_bma280.h" @@ -18,22 +18,22 @@ #include "drivers/accgyro_lsm303dlhc.h" #endif -#include "drivers/barometer_common.h" +#include "drivers/barometer.h" #include "drivers/barometer_bmp085.h" #include "drivers/barometer_ms5611.h" #include "drivers/compass_hmc5883l.h" #include "drivers/sonar_hcsr04.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "flight_common.h" -#include "runtime_config.h" +#include "flight/flight.h" +#include "config/runtime_config.h" -#include "sensors_common.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" -#include "sensors_gyro.h" -#include "sensors_compass.h" -#include "sensors_sonar.h" +#include "sensors/sensors.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" +#include "sensors/gyro.h" +#include "sensors/compass.h" +#include "sensors/sonar.h" // Use these to help with porting to new boards //#define USE_FAKE_GYRO diff --git a/src/sensors_common.h b/src/main/sensors/sensors.h similarity index 100% rename from src/sensors_common.h rename to src/main/sensors/sensors.h diff --git a/src/sensors_sonar.c b/src/main/sensors/sonar.c similarity index 74% rename from src/sensors_sonar.c rename to src/main/sensors/sonar.c index 6e6d481bcf..4dbf4eb2cd 100644 --- a/src/sensors_sonar.c +++ b/src/main/sensors/sonar.c @@ -4,10 +4,10 @@ #include "platform.h" #include "drivers/sonar_hcsr04.h" -#include "runtime_config.h" +#include "config/runtime_config.h" -#include "sensors_common.h" -#include "sensors_sonar.h" +#include "sensors/sensors.h" +#include "sensors/sonar.h" int32_t sonarAlt; // to think about the unit diff --git a/src/sensors_sonar.h b/src/main/sensors/sonar.h similarity index 100% rename from src/sensors_sonar.h rename to src/main/sensors/sonar.h diff --git a/src/startup/startup_stm32f10x_md.s b/src/main/startup/startup_stm32f10x_md.s similarity index 100% rename from src/startup/startup_stm32f10x_md.s rename to src/main/startup/startup_stm32f10x_md.s diff --git a/src/startup/startup_stm32f10x_md_gcc.S b/src/main/startup/startup_stm32f10x_md_gcc.S similarity index 100% rename from src/startup/startup_stm32f10x_md_gcc.S rename to src/main/startup/startup_stm32f10x_md_gcc.S diff --git a/src/startup/startup_stm32f30x_md_gcc.S b/src/main/startup/startup_stm32f30x_md_gcc.S similarity index 100% rename from src/startup/startup_stm32f30x_md_gcc.S rename to src/main/startup/startup_stm32f30x_md_gcc.S diff --git a/src/telemetry_frsky.c b/src/main/telemetry/frsky.c similarity index 90% rename from src/telemetry_frsky.c rename to src/main/telemetry/frsky.c index e22439b8ed..204c6bc7a3 100644 --- a/src/telemetry_frsky.c +++ b/src/main/telemetry/frsky.c @@ -10,25 +10,25 @@ #include "common/maths.h" #include "common/axis.h" -#include "drivers/system_common.h" -#include "drivers/accgyro_common.h" -#include "drivers/gpio_common.h" -#include "drivers/timer_common.h" -#include "drivers/serial_common.h" -#include "serial_common.h" +#include "drivers/system.h" +#include "drivers/accgyro.h" +#include "drivers/gpio.h" +#include "drivers/timer.h" +#include "drivers/serial.h" +#include "io/serial.h" -#include "runtime_config.h" -#include "config.h" +#include "config/runtime_config.h" +#include "config/config.h" -#include "sensors_common.h" -#include "sensors_gyro.h" -#include "sensors_barometer.h" -#include "flight_common.h" -#include "gps_common.h" -#include "battery.h" +#include "sensors/sensors.h" +#include "sensors/gyro.h" +#include "sensors/barometer.h" +#include "flight/flight.h" +#include "io/gps.h" +#include "io/battery.h" -#include "telemetry_common.h" -#include "telemetry_frsky.h" +#include "telemetry/telemetry.h" +#include "telemetry/frsky.h" static serialPort_t *frskyPort; #define FRSKY_BAUDRATE 9600 diff --git a/src/telemetry_frsky.h b/src/main/telemetry/frsky.h similarity index 100% rename from src/telemetry_frsky.h rename to src/main/telemetry/frsky.h diff --git a/src/telemetry_hott.c b/src/main/telemetry/hott.c similarity index 94% rename from src/telemetry_hott.c rename to src/main/telemetry/hott.c index 7603c44785..61b60d919d 100644 --- a/src/telemetry_hott.c +++ b/src/main/telemetry/hott.c @@ -43,21 +43,21 @@ #include "common/axis.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "io/serial.h" -#include "runtime_config.h" +#include "config/runtime_config.h" -#include "sensors_common.h" +#include "sensors/sensors.h" -#include "flight_common.h" -#include "gps_common.h" -#include "battery.h" +#include "flight/flight.h" +#include "io/gps.h" +#include "io/battery.h" -#include "telemetry_common.h" -#include "telemetry_hott.h" +#include "telemetry/telemetry.h" +#include "telemetry/hott.h" extern int16_t debug[4]; diff --git a/src/telemetry_hott.h b/src/main/telemetry/hott.h similarity index 100% rename from src/telemetry_hott.h rename to src/main/telemetry/hott.h diff --git a/src/telemetry_msp.c b/src/main/telemetry/msp.c similarity index 71% rename from src/telemetry_msp.c rename to src/main/telemetry/msp.c index 953c1d76fe..e822dcb1f2 100644 --- a/src/telemetry_msp.c +++ b/src/main/telemetry/msp.c @@ -8,9 +8,9 @@ #include #include -#include "drivers/serial_common.h" -#include "telemetry_common.h" -#include "serial_msp.h" +#include "drivers/serial.h" +#include "telemetry/telemetry.h" +#include "io/serial_msp.h" void initMSPTelemetry(telemetryConfig_t *initialTelemetryConfig) { diff --git a/src/telemetry_msp.h b/src/main/telemetry/msp.h similarity index 100% rename from src/telemetry_msp.h rename to src/main/telemetry/msp.h diff --git a/src/telemetry_common.c b/src/main/telemetry/telemetry.c similarity index 87% rename from src/telemetry_common.c rename to src/main/telemetry/telemetry.c index 1fd8b1cfda..43b40549fa 100644 --- a/src/telemetry_common.c +++ b/src/main/telemetry/telemetry.c @@ -4,19 +4,19 @@ #include "platform.h" -#include "drivers/gpio_common.h" -#include "drivers/timer_common.h" -#include "drivers/serial_common.h" +#include "drivers/gpio.h" +#include "drivers/timer.h" +#include "drivers/serial.h" #include "drivers/serial_softserial.h" -#include "serial_common.h" +#include "io/serial.h" -#include "runtime_config.h" -#include "config.h" +#include "config/runtime_config.h" +#include "config/config.h" -#include "telemetry_common.h" -#include "telemetry_frsky.h" -#include "telemetry_hott.h" -#include "telemetry_msp.h" +#include "telemetry/telemetry.h" +#include "telemetry/frsky.h" +#include "telemetry/hott.h" +#include "telemetry/msp.h" static bool isTelemetryConfigurationValid = false; // flag used to avoid repeated configuration checks diff --git a/src/telemetry_common.h b/src/main/telemetry/telemetry.h similarity index 94% rename from src/telemetry_common.h rename to src/main/telemetry/telemetry.h index 7e604385c3..03aec1aa4c 100644 --- a/src/telemetry_common.h +++ b/src/main/telemetry/telemetry.h @@ -1,5 +1,5 @@ /* - * telemetry_common.h + * telemetry.h * * Created on: 6 Apr 2014 * Author: Hydra diff --git a/src/main/version.h b/src/main/version.h new file mode 100644 index 0000000000..131e8eca4b --- /dev/null +++ b/src/main/version.h @@ -0,0 +1,2 @@ +#define MW_VERSION 230 + diff --git a/src/test/Makefile b/src/test/Makefile new file mode 100644 index 0000000000..0f599e554c --- /dev/null +++ b/src/test/Makefile @@ -0,0 +1,139 @@ +# A sample Makefile for building Google Test and using it in user +# tests. Please tweak it to suit your environment and project. You +# may want to move it to your project's root directory. +# +# SYNOPSIS: +# +# make [all] - makes everything. +# make TARGET - makes the given target. +# make clean - removes all files generated by make. + +# Please tweak the following variable definitions as needed by your +# project, except GTEST_HEADERS, which you can use in your own targets +# but shouldn't modify. + +# Points to the root of Google Test, relative to where this file is. +# Remember to tweak this if you move this file. +GTEST_DIR = ../../lib/test/gtest + +# Where to find user code. +USER_DIR = ../main +TEST_DIR = unit +USER_INCLUDE_DIR = $(USER_DIR) + +OBJECT_DIR = ../../obj/test + +# Flags passed to the preprocessor. +# Set Google Test's header directory as a system directory, such that +# the compiler doesn't generate warnings in Google Test headers. +CPPFLAGS += -isystem $(GTEST_DIR)/inc + +# Flags passed to the C++ compiler. +CXXFLAGS += -g -Wall -Wextra -pthread -ggdb -O0 + +# All tests produced by this Makefile. Remember to add new tests you +# created to the list. +TESTS = battery_unittest flight_imu_unittest gps_conversion_unittest telemetry_hott_unittest + +# All Google Test headers. Usually you shouldn't change this +# definition. +GTEST_HEADERS = $(GTEST_DIR)/inc/gtest/*.h + +# House-keeping build targets. + +all : $(TESTS) + +clean : + rm -rf $(TESTS) $(OBJECT_DIR) + +# Builds gtest.a and gtest_main.a. + +# Usually you shouldn't tweak such internal variables, indicated by a +# trailing _. +GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/inc/gtest/*.h $(GTEST_HEADERS) + +# For simplicity and to avoid depending on Google Test's +# implementation details, the dependencies specified below are +# conservative and not optimized. This is fine as Google Test +# compiles fast and for ordinary users its source rarely changes. +$(OBJECT_DIR)/gtest-all.o : $(GTEST_SRCS_) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ + $(GTEST_DIR)/src/gtest-all.cc -o $@ + +$(OBJECT_DIR)/gtest_main.o : $(GTEST_SRCS_) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ + $(GTEST_DIR)/src/gtest_main.cc -o $@ + +$(OBJECT_DIR)/gtest.a : $(OBJECT_DIR)/gtest-all.o + $(AR) $(ARFLAGS) $@ $^ + +$(OBJECT_DIR)/gtest_main.a : $(OBJECT_DIR)/gtest-all.o $(OBJECT_DIR)/gtest_main.o + $(AR) $(ARFLAGS) $@ $^ + +# Builds a sample test. A test should link with either gtest.a or +# gtest_main.a, depending on whether it defines its own main() +# function. + +# includes in test dir must override includes in user dir +TEST_INCLUDE_DIRS := $(TEST_DIR) \ + $(USER_INCLUDE_DIR) + + +TEST_CFLAGS = $(addprefix -I,$(TEST_INCLUDE_DIRS)) + + +$(OBJECT_DIR)/io/battery.o : $(USER_DIR)/io/battery.c $(USER_DIR)/io/battery.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/io/battery.c -o $@ + +$(OBJECT_DIR)/battery_unittest.o : $(TEST_DIR)/battery_unittest.cc \ + $(USER_DIR)/io/battery.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/battery_unittest.cc -o $@ + +battery_unittest : $(OBJECT_DIR)/io/battery.o $(OBJECT_DIR)/battery_unittest.o $(OBJECT_DIR)/gtest_main.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $(OBJECT_DIR)/$@ + + + + +$(OBJECT_DIR)/flight/imu.o : $(USER_DIR)/flight/imu.c $(USER_DIR)/flight/imu.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/imu.c -o $@ + +$(OBJECT_DIR)/flight_imu_unittest.o : $(TEST_DIR)/flight_imu_unittest.cc \ + $(USER_DIR)/flight/imu.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/flight_imu_unittest.cc -o $@ + +flight_imu_unittest : $(OBJECT_DIR)/flight/imu.o $(OBJECT_DIR)/flight_imu_unittest.o $(OBJECT_DIR)/gtest_main.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $(OBJECT_DIR)/$@ + + +$(OBJECT_DIR)/io/gps_conversion.o : $(USER_DIR)/io/gps_conversion.c $(USER_DIR)/io/gps_conversion.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/io/gps_conversion.c -o $@ + +$(OBJECT_DIR)/gps_conversion_unittest.o : $(TEST_DIR)/gps_conversion_unittest.cc \ + $(USER_DIR)/io/gps_conversion.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/gps_conversion_unittest.cc -o $@ + +gps_conversion_unittest : $(OBJECT_DIR)/io/gps_conversion.o $(OBJECT_DIR)/gps_conversion_unittest.o $(OBJECT_DIR)/gtest_main.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $(OBJECT_DIR)/$@ + + + +$(OBJECT_DIR)/telemetry/hott.o : $(USER_DIR)/telemetry/hott.c $(USER_DIR)/telemetry/hott.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/telemetry/hott.c -o $@ + +$(OBJECT_DIR)/telemetry_hott_unittest.o : $(TEST_DIR)/telemetry_hott_unittest.cc \ + $(USER_DIR)/telemetry/hott.h $(GTEST_HEADERS) + @mkdir -p $(dir $@) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/telemetry_hott_unittest.cc -o $@ + +telemetry_hott_unittest :$(OBJECT_DIR)/telemetry/hott.o $(OBJECT_DIR)/telemetry_hott_unittest.o $(OBJECT_DIR)/io/gps_conversion.o $(OBJECT_DIR)/gtest_main.a + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $(OBJECT_DIR)/$@ diff --git a/test/battery_unittest.cc b/src/test/unit/battery_unittest.cc similarity index 98% rename from test/battery_unittest.cc rename to src/test/unit/battery_unittest.cc index 5fb27f1f80..f9f25ed285 100644 --- a/test/battery_unittest.cc +++ b/src/test/unit/battery_unittest.cc @@ -1,7 +1,7 @@ #include #include -#include "battery.h" +#include "io/battery.h" #include "unittest_macros.h" #include "gtest/gtest.h" diff --git a/test/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc similarity index 75% rename from test/flight_imu_unittest.cc rename to src/test/unit/flight_imu_unittest.cc index 5329878d0d..80d3109044 100644 --- a/test/flight_imu_unittest.cc +++ b/src/test/unit/flight_imu_unittest.cc @@ -9,37 +9,37 @@ // FIXME this giant list of includes (below) and stubs (bottom) indicates there is too much going on in flight_imu.c and that it needs decoupling and breaking up. #include "common/axis.h" -#include "flight_common.h" +#include "flight/flight.h" -#include "sensors_common.h" -#include "drivers/accgyro_common.h" -#include "sensors_gyro.h" -#include "sensors_compass.h" -#include "sensors_acceleration.h" -#include "sensors_barometer.h" +#include "sensors/sensors.h" +#include "drivers/accgyro.h" +#include "sensors/gyro.h" +#include "sensors/compass.h" +#include "sensors/acceleration.h" +#include "sensors/barometer.h" -#include "gps_common.h" +#include "io/gps.h" -#include "gimbal.h" -#include "flight_mixer.h" +#include "io/gimbal.h" +#include "flight/mixer.h" // FIXME remove dependency on config.h -#include "boardalignment.h" -#include "battery.h" -#include "escservo.h" -#include "rc_controls.h" -#include "rx_common.h" -#include "drivers/serial_common.h" -#include "serial_common.h" -#include "telemetry_common.h" -#include "failsafe.h" -#include "runtime_config.h" -#include "config.h" -#include "config_profile.h" -#include "config_master.h" +#include "sensors/boardalignment.h" +#include "io/battery.h" +#include "io/escservo.h" +#include "io/rc_controls.h" +#include "rx/rx.h" +#include "drivers/serial.h" +#include "io/serial.h" +#include "telemetry/telemetry.h" +#include "flight/failsafe.h" +#include "config/runtime_config.h" +#include "config/config.h" +#include "config/config_profile.h" +#include "config/config_master.h" -#include "flight_imu.h" +#include "flight/imu.h" #include "unittest_macros.h" #include "gtest/gtest.h" diff --git a/test/gps_conversion_unittest.cc b/src/test/unit/gps_conversion_unittest.cc similarity index 97% rename from test/gps_conversion_unittest.cc rename to src/test/unit/gps_conversion_unittest.cc index dceb881b8d..3064ec580e 100644 --- a/test/gps_conversion_unittest.cc +++ b/src/test/unit/gps_conversion_unittest.cc @@ -1,7 +1,7 @@ #include #include -#include "gps_conversion.h" +#include "io/gps_conversion.h" #include "unittest_macros.h" #include "gtest/gtest.h" diff --git a/test/platform.h b/src/test/unit/platform.h similarity index 100% rename from test/platform.h rename to src/test/unit/platform.h diff --git a/test/telemetry_hott_unittest.cc b/src/test/unit/telemetry_hott_unittest.cc similarity index 94% rename from test/telemetry_hott_unittest.cc rename to src/test/unit/telemetry_hott_unittest.cc index 875c382baa..f0ec9bce00 100644 --- a/test/telemetry_hott_unittest.cc +++ b/src/test/unit/telemetry_hott_unittest.cc @@ -8,23 +8,23 @@ #include "common/axis.h" -#include "drivers/system_common.h" +#include "drivers/system.h" -#include "drivers/serial_common.h" -#include "serial_common.h" +#include "drivers/serial.h" +#include "io/serial.h" -#include "runtime_config.h" +#include "config/runtime_config.h" -#include "sensors_common.h" +#include "sensors/sensors.h" -#include "flight_common.h" -#include "gps_common.h" -#include "battery.h" +#include "flight/flight.h" +#include "io/gps.h" +#include "io/battery.h" -#include "telemetry_common.h" -#include "telemetry_hott.h" +#include "telemetry/telemetry.h" +#include "telemetry/hott.h" -#include "gps_conversion.h" +#include "io/gps_conversion.h" #include "unittest_macros.h" diff --git a/test/unittest_macros.h b/src/test/unit/unittest_macros.h similarity index 100% rename from test/unittest_macros.h rename to src/test/unit/unittest_macros.h diff --git a/src/version.h b/src/version.h deleted file mode 100644 index fd0c523240..0000000000 --- a/src/version.h +++ /dev/null @@ -1,2 +0,0 @@ -#define VERSION 230 - diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index b8083575f5..0000000000 --- a/test/Makefile +++ /dev/null @@ -1,120 +0,0 @@ -# A sample Makefile for building Google Test and using it in user -# tests. Please tweak it to suit your environment and project. You -# may want to move it to your project's root directory. -# -# SYNOPSIS: -# -# make [all] - makes everything. -# make TARGET - makes the given target. -# make clean - removes all files generated by make. - -# Please tweak the following variable definitions as needed by your -# project, except GTEST_HEADERS, which you can use in your own targets -# but shouldn't modify. - -# Points to the root of Google Test, relative to where this file is. -# Remember to tweak this if you move this file. -GTEST_DIR = ../lib/gtest - -# Where to find user code. -USER_DIR = ../src -TEST_DIR = . - -# Flags passed to the preprocessor. -# Set Google Test's header directory as a system directory, such that -# the compiler doesn't generate warnings in Google Test headers. -CPPFLAGS += -isystem $(GTEST_DIR)/inc - -# Flags passed to the C++ compiler. -CXXFLAGS += -g -Wall -Wextra -pthread -ggdb -O0 - -# All tests produced by this Makefile. Remember to add new tests you -# created to the list. -TESTS = battery_unittest flight_imu_unittest gps_conversion_unittest telemetry_hott_unittest - -# All Google Test headers. Usually you shouldn't change this -# definition. -GTEST_HEADERS = $(GTEST_DIR)/inc/gtest/*.h - -# House-keeping build targets. - -all : $(TESTS) - -clean : - rm -f $(TESTS) gtest.a gtest_main.a *.o - -# Builds gtest.a and gtest_main.a. - -# Usually you shouldn't tweak such internal variables, indicated by a -# trailing _. -GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/inc/gtest/*.h $(GTEST_HEADERS) - -# For simplicity and to avoid depending on Google Test's -# implementation details, the dependencies specified below are -# conservative and not optimized. This is fine as Google Test -# compiles fast and for ordinary users its source rarely changes. -gtest-all.o : $(GTEST_SRCS_) - $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ - $(GTEST_DIR)/src/gtest-all.cc - -gtest_main.o : $(GTEST_SRCS_) - $(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \ - $(GTEST_DIR)/src/gtest_main.cc - -gtest.a : gtest-all.o - $(AR) $(ARFLAGS) $@ $^ - -gtest_main.a : gtest-all.o gtest_main.o - $(AR) $(ARFLAGS) $@ $^ - -# Builds a sample test. A test should link with either gtest.a or -# gtest_main.a, depending on whether it defines its own main() -# function. - - - -battery.o : $(USER_DIR)/battery.c $(USER_DIR)/battery.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/battery.c - -battery_unittest.o : $(TEST_DIR)/battery_unittest.cc \ - $(USER_DIR)/battery.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/battery_unittest.cc -I$(USER_DIR) - -battery_unittest : battery.o battery_unittest.o gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@ - - - - -flight_imu.o : $(USER_DIR)/flight_imu.c $(USER_DIR)/flight_imu.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/flight_imu.c -I$(TEST_DIR) - -flight_imu_unittest.o : $(TEST_DIR)/flight_imu_unittest.cc \ - $(USER_DIR)/flight_imu.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/flight_imu_unittest.cc -I$(USER_DIR) - -flight_imu_unittest : flight_imu.o flight_imu_unittest.o gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@ - - -gps_conversion.o : $(USER_DIR)/gps_conversion.c $(USER_DIR)/gps_conversion.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/gps_conversion.c -I$(TEST_DIR) - -gps_conversion_unittest.o : $(TEST_DIR)/gps_conversion_unittest.cc \ - $(USER_DIR)/gps_conversion.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/gps_conversion_unittest.cc -I$(USER_DIR) - -gps_conversion_unittest : gps_conversion.o gps_conversion_unittest.o gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@ - - - -telemetry_hott.o : $(USER_DIR)/telemetry_hott.c $(USER_DIR)/telemetry_hott.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/telemetry_hott.c -I$(TEST_DIR) - -telemetry_hott_unittest.o : $(TEST_DIR)/telemetry_hott_unittest.cc \ - $(USER_DIR)/telemetry_hott.h $(GTEST_HEADERS) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/telemetry_hott_unittest.cc -I$(USER_DIR) - -telemetry_hott_unittest : telemetry_hott.o telemetry_hott_unittest.o gps_conversion.o gtest_main.a - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@