From 2ca439f7ed834ad5a6d72dff1446c7539256a245 Mon Sep 17 00:00:00 2001 From: Kye Morton Date: Wed, 14 Aug 2019 21:29:14 +1000 Subject: [PATCH] Shifted codebase naming to make it less confusing for the legacy breezy build --- Makefile | 16 ++++++++-------- .../drv_bmp280.h | 0 .../drv_hmc5883l.h | 0 .../drv_mpu.h | 0 .../{naze32_rev5 => breezy_naze32_rev5}/Makefile | 4 ++-- .../{naze32_rev5 => breezy_naze32_rev5}/robin | 0 .../{naze32_rev6 => breezy_naze32_rev6}/Makefile | 4 ++-- .../{naze32_rev6 => breezy_naze32_rev6}/robin | 0 ...ze32_common => makefile.breezy_naze32_common} | 2 +- .../drv_battery_voltage.c | 0 .../drv_bmp280.c | 2 +- .../drv_comms.c | 0 .../drv_flash.c | 0 .../drv_hmc5883l.c | 2 +- .../drv_i2c.c | 6 +++--- .../drv_mpu.c | 2 +- .../drv_mpu6050.c | 2 +- .../drv_mpu6500.c | 2 +- .../drv_pwm.c | 0 .../drv_rc_input.c | 0 .../drv_safety_button.c | 0 .../drv_status_io.c | 0 .../drv_system.c | 0 .../main.c | 0 .../drv_baro.c | 2 +- .../drv_imu.c | 2 +- .../drv_mag.c | 2 +- .../drv_baro.c | 2 +- .../drv_imu.c | 2 +- .../drv_mag.c | 2 +- 30 files changed, 27 insertions(+), 27 deletions(-) rename include/drivers/{naze32_common => breezy_naze32_common}/drv_bmp280.h (100%) rename include/drivers/{naze32_common => breezy_naze32_common}/drv_hmc5883l.h (100%) rename include/drivers/{naze32_common => breezy_naze32_common}/drv_mpu.h (100%) rename makefiles/{naze32_rev5 => breezy_naze32_rev5}/Makefile (86%) rename makefiles/{naze32_rev5 => breezy_naze32_rev5}/robin (100%) rename makefiles/{naze32_rev6 => breezy_naze32_rev6}/Makefile (86%) rename makefiles/{naze32_rev6 => breezy_naze32_rev6}/robin (100%) rename makefiles/common/{makefile.naze32_common => makefile.breezy_naze32_common} (92%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_battery_voltage.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_bmp280.c (99%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_comms.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_flash.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_hmc5883l.c (99%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_i2c.c (98%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_mpu.c (99%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_mpu6050.c (98%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_mpu6500.c (97%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_pwm.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_rc_input.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_safety_button.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_status_io.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/drv_system.c (100%) rename src/drivers/{naze32_common => breezy_naze32_common}/main.c (100%) rename src/drivers/{naze32_rev5 => breezy_naze32_rev5}/drv_baro.c (72%) rename src/drivers/{naze32_rev5 => breezy_naze32_rev5}/drv_imu.c (93%) rename src/drivers/{naze32_rev5 => breezy_naze32_rev5}/drv_mag.c (72%) rename src/drivers/{naze32_rev6 => breezy_naze32_rev6}/drv_baro.c (72%) rename src/drivers/{naze32_rev6 => breezy_naze32_rev6}/drv_imu.c (93%) rename src/drivers/{naze32_rev6 => breezy_naze32_rev6}/drv_mag.c (72%) diff --git a/Makefile b/Makefile index 4c9170b..30501cb 100644 --- a/Makefile +++ b/Makefile @@ -77,22 +77,22 @@ posix_serial_run: posix_serial @exec ./lib/scripts/sitl_serial_run.sh $(SERIAL_DEVICE) $(SERIAL_DEVICE_2) # Naze32 Rev.5 (Breezy) -naze32_rev5: param_gen +breezy_naze32_rev5: param_gen $(MAKE) -C makefiles/$@ PROJECT_NAME=$(PROJECT_NAME) -naze32_rev5_flash: naze32_rev5 - stm32flash -w build/robin_naze32_rev5.hex -v -g 0x0 -b $(SERIAL_BAUD) $(SERIAL_DEVICE) +breezy_naze32_rev5_flash: breezy_naze32_rev5 + stm32flash -w build/robin_breezy_naze32_rev5.hex -v -g 0x0 -b $(SERIAL_BAUD) $(SERIAL_DEVICE) -naze32_rev5_reflash: naze32_rev5 mavlink_bootloader sleep naze32_rev5_flash +breezy_naze32_rev5_reflash: breezy_naze32_rev5 mavlink_bootloader sleep breezy_naze32_rev5_flash # Naze32 Rev.6 (Breezy) -naze32_rev6: param_gen +breezy_naze32_rev6: param_gen $(MAKE) -C makefiles/$@ PROJECT_NAME=$(PROJECT_NAME) -naze32_rev6_flash: naze32_rev6 - stm32flash -w build/robin_naze32_rev6.hex -v -g 0x0 -b $(SERIAL_BAUD) $(SERIAL_DEVICE) +breezy_naze32_rev6_flash: breezy_naze32_rev6 + stm32flash -w build/robin_breezy_naze32_rev6.hex -v -g 0x0 -b $(SERIAL_BAUD) $(SERIAL_DEVICE) -naze32_rev6_reflash: naze32_rev6 mavlink_bootloader sleep naze32_rev6_flash +breezy_naze32_rev6_reflash: breezy_naze32_rev6 mavlink_bootloader sleep breezy_naze32_rev6_flash # Naze32 Rev.5 (LibOpenCM3) opencm3_naze32_rev5: param_gen diff --git a/include/drivers/naze32_common/drv_bmp280.h b/include/drivers/breezy_naze32_common/drv_bmp280.h similarity index 100% rename from include/drivers/naze32_common/drv_bmp280.h rename to include/drivers/breezy_naze32_common/drv_bmp280.h diff --git a/include/drivers/naze32_common/drv_hmc5883l.h b/include/drivers/breezy_naze32_common/drv_hmc5883l.h similarity index 100% rename from include/drivers/naze32_common/drv_hmc5883l.h rename to include/drivers/breezy_naze32_common/drv_hmc5883l.h diff --git a/include/drivers/naze32_common/drv_mpu.h b/include/drivers/breezy_naze32_common/drv_mpu.h similarity index 100% rename from include/drivers/naze32_common/drv_mpu.h rename to include/drivers/breezy_naze32_common/drv_mpu.h diff --git a/makefiles/naze32_rev5/Makefile b/makefiles/breezy_naze32_rev5/Makefile similarity index 86% rename from makefiles/naze32_rev5/Makefile rename to makefiles/breezy_naze32_rev5/Makefile index 43caa6c..6a8b185 100644 --- a/makefiles/naze32_rev5/Makefile +++ b/makefiles/breezy_naze32_rev5/Makefile @@ -1,13 +1,13 @@ ############################################################################### -PROJECT_BUILD_TYPE = naze32_rev5 +PROJECT_BUILD_TYPE = breezy_naze32_rev5 ############################################################################### include ../common/makefile.project_common # Naze32 rev5 specific drivers -include ../common/makefile.naze32_common +include ../common/makefile.breezy_naze32_common PROJECT_SRC_FILES += $(wildcard $(ROOT)/src/drivers/$(PROJECT_BUILD_TYPE)/*.c) include ../common/makefile.build_common diff --git a/makefiles/naze32_rev5/robin b/makefiles/breezy_naze32_rev5/robin similarity index 100% rename from makefiles/naze32_rev5/robin rename to makefiles/breezy_naze32_rev5/robin diff --git a/makefiles/naze32_rev6/Makefile b/makefiles/breezy_naze32_rev6/Makefile similarity index 86% rename from makefiles/naze32_rev6/Makefile rename to makefiles/breezy_naze32_rev6/Makefile index 0cdb03c..c04ef26 100644 --- a/makefiles/naze32_rev6/Makefile +++ b/makefiles/breezy_naze32_rev6/Makefile @@ -1,13 +1,13 @@ ############################################################################### -PROJECT_BUILD_TYPE = naze32_rev6 +PROJECT_BUILD_TYPE = breezy_naze32_rev6 ############################################################################### include ../common/makefile.project_common # Naze32 rev5 specific drivers -include ../common/makefile.naze32_common +include ../common/makefile.breezy_naze32_common PROJECT_SRC_FILES += $(wildcard $(ROOT)/src/drivers/$(PROJECT_BUILD_TYPE)/*.c) include ../common/makefile.build_common diff --git a/makefiles/naze32_rev6/robin b/makefiles/breezy_naze32_rev6/robin similarity index 100% rename from makefiles/naze32_rev6/robin rename to makefiles/breezy_naze32_rev6/robin diff --git a/makefiles/common/makefile.naze32_common b/makefiles/common/makefile.breezy_naze32_common similarity index 92% rename from makefiles/common/makefile.naze32_common rename to makefiles/common/makefile.breezy_naze32_common index 30184f8..9efd999 100644 --- a/makefiles/common/makefile.naze32_common +++ b/makefiles/common/makefile.breezy_naze32_common @@ -6,7 +6,7 @@ DEVICE_BUILD_OBJCOPY = arm-none-eabi-objcopy ############################################################################### # Naze32 specific drivers -PROJECT_SRC_FILES += $(wildcard $(ROOT)/src/drivers/naze32_common/*.c) +PROJECT_SRC_FILES += $(wildcard $(ROOT)/src/drivers/breezy_naze32_common/*.c) # Change this to wherever you put BreezySTM32 BREEZY_DIR := $(ROOT)/lib/BreezySTM32 diff --git a/src/drivers/naze32_common/drv_battery_voltage.c b/src/drivers/breezy_naze32_common/drv_battery_voltage.c similarity index 100% rename from src/drivers/naze32_common/drv_battery_voltage.c rename to src/drivers/breezy_naze32_common/drv_battery_voltage.c diff --git a/src/drivers/naze32_common/drv_bmp280.c b/src/drivers/breezy_naze32_common/drv_bmp280.c similarity index 99% rename from src/drivers/naze32_common/drv_bmp280.c rename to src/drivers/breezy_naze32_common/drv_bmp280.c index ac756b3..d6e012a 100644 --- a/src/drivers/naze32_common/drv_bmp280.c +++ b/src/drivers/breezy_naze32_common/drv_bmp280.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include diff --git a/src/drivers/naze32_common/drv_comms.c b/src/drivers/breezy_naze32_common/drv_comms.c similarity index 100% rename from src/drivers/naze32_common/drv_comms.c rename to src/drivers/breezy_naze32_common/drv_comms.c diff --git a/src/drivers/naze32_common/drv_flash.c b/src/drivers/breezy_naze32_common/drv_flash.c similarity index 100% rename from src/drivers/naze32_common/drv_flash.c rename to src/drivers/breezy_naze32_common/drv_flash.c diff --git a/src/drivers/naze32_common/drv_hmc5883l.c b/src/drivers/breezy_naze32_common/drv_hmc5883l.c similarity index 99% rename from src/drivers/naze32_common/drv_hmc5883l.c rename to src/drivers/breezy_naze32_common/drv_hmc5883l.c index 77f2703..1e13f55 100644 --- a/src/drivers/naze32_common/drv_hmc5883l.c +++ b/src/drivers/breezy_naze32_common/drv_hmc5883l.c @@ -21,7 +21,7 @@ */ #include -#include +#include #include diff --git a/src/drivers/naze32_common/drv_i2c.c b/src/drivers/breezy_naze32_common/drv_i2c.c similarity index 98% rename from src/drivers/naze32_common/drv_i2c.c rename to src/drivers/breezy_naze32_common/drv_i2c.c index 9da8667..3c13938 100644 --- a/src/drivers/naze32_common/drv_i2c.c +++ b/src/drivers/breezy_naze32_common/drv_i2c.c @@ -2,9 +2,9 @@ #include "drivers/drv_sensors.h" #include "drivers/drv_system.h" -#include "drivers/naze32_common/drv_bmp280.h" -#include "drivers/naze32_common/drv_hmc5883l.h" -#include "drivers/naze32_common/drv_mpu.h" +#include "drivers/breezy_naze32_common/drv_bmp280.h" +#include "drivers/breezy_naze32_common/drv_hmc5883l.h" +#include "drivers/breezy_naze32_common/drv_mpu.h" #include "calibration.h" #include "params.h" diff --git a/src/drivers/naze32_common/drv_mpu.c b/src/drivers/breezy_naze32_common/drv_mpu.c similarity index 99% rename from src/drivers/naze32_common/drv_mpu.c rename to src/drivers/breezy_naze32_common/drv_mpu.c index 7d2a40b..139c449 100644 --- a/src/drivers/naze32_common/drv_mpu.c +++ b/src/drivers/breezy_naze32_common/drv_mpu.c @@ -20,7 +20,7 @@ */ #include -#include +#include #include diff --git a/src/drivers/naze32_common/drv_mpu6050.c b/src/drivers/breezy_naze32_common/drv_mpu6050.c similarity index 98% rename from src/drivers/naze32_common/drv_mpu6050.c rename to src/drivers/breezy_naze32_common/drv_mpu6050.c index 375bf5f..f05af3a 100644 --- a/src/drivers/naze32_common/drv_mpu6050.c +++ b/src/drivers/breezy_naze32_common/drv_mpu6050.c @@ -19,7 +19,7 @@ along with BreezySTM32. If not, see . */ -#include "drivers/naze32_common/drv_mpu.h" +#include "drivers/breezy_naze32_common/drv_mpu.h" #include "breezystm32.h" #include diff --git a/src/drivers/naze32_common/drv_mpu6500.c b/src/drivers/breezy_naze32_common/drv_mpu6500.c similarity index 97% rename from src/drivers/naze32_common/drv_mpu6500.c rename to src/drivers/breezy_naze32_common/drv_mpu6500.c index 49e3895..d43583f 100644 --- a/src/drivers/naze32_common/drv_mpu6500.c +++ b/src/drivers/breezy_naze32_common/drv_mpu6500.c @@ -19,7 +19,7 @@ along with BreezySTM32. If not, see . */ -#include "drivers/naze32_common/drv_mpu.h" +#include "drivers/breezy_naze32_common/drv_mpu.h" #include "breezystm32.h" #include diff --git a/src/drivers/naze32_common/drv_pwm.c b/src/drivers/breezy_naze32_common/drv_pwm.c similarity index 100% rename from src/drivers/naze32_common/drv_pwm.c rename to src/drivers/breezy_naze32_common/drv_pwm.c diff --git a/src/drivers/naze32_common/drv_rc_input.c b/src/drivers/breezy_naze32_common/drv_rc_input.c similarity index 100% rename from src/drivers/naze32_common/drv_rc_input.c rename to src/drivers/breezy_naze32_common/drv_rc_input.c diff --git a/src/drivers/naze32_common/drv_safety_button.c b/src/drivers/breezy_naze32_common/drv_safety_button.c similarity index 100% rename from src/drivers/naze32_common/drv_safety_button.c rename to src/drivers/breezy_naze32_common/drv_safety_button.c diff --git a/src/drivers/naze32_common/drv_status_io.c b/src/drivers/breezy_naze32_common/drv_status_io.c similarity index 100% rename from src/drivers/naze32_common/drv_status_io.c rename to src/drivers/breezy_naze32_common/drv_status_io.c diff --git a/src/drivers/naze32_common/drv_system.c b/src/drivers/breezy_naze32_common/drv_system.c similarity index 100% rename from src/drivers/naze32_common/drv_system.c rename to src/drivers/breezy_naze32_common/drv_system.c diff --git a/src/drivers/naze32_common/main.c b/src/drivers/breezy_naze32_common/main.c similarity index 100% rename from src/drivers/naze32_common/main.c rename to src/drivers/breezy_naze32_common/main.c diff --git a/src/drivers/naze32_rev5/drv_baro.c b/src/drivers/breezy_naze32_rev5/drv_baro.c similarity index 72% rename from src/drivers/naze32_rev5/drv_baro.c rename to src/drivers/breezy_naze32_rev5/drv_baro.c index a664cc8..85d678f 100644 --- a/src/drivers/naze32_rev5/drv_baro.c +++ b/src/drivers/breezy_naze32_rev5/drv_baro.c @@ -1,5 +1,5 @@ #include "drivers/drv_sensors.h" -#include "drivers/naze32_common/drv_bmp280.h" +#include "drivers/breezy_naze32_common/drv_bmp280.h" #include "sensors.h" bool drv_sensors_baro_init( uint32_t i2c ) { diff --git a/src/drivers/naze32_rev5/drv_imu.c b/src/drivers/breezy_naze32_rev5/drv_imu.c similarity index 93% rename from src/drivers/naze32_rev5/drv_imu.c rename to src/drivers/breezy_naze32_rev5/drv_imu.c index 9df93a0..8f3c7aa 100644 --- a/src/drivers/naze32_rev5/drv_imu.c +++ b/src/drivers/breezy_naze32_rev5/drv_imu.c @@ -1,6 +1,6 @@ #include "drivers/drv_sensors.h" #include "drivers/drv_system.h" -#include "drivers/naze32_common/drv_mpu.h" +#include "drivers/breezy_naze32_common/drv_mpu.h" #include "sensors.h" #include "fix16.h" diff --git a/src/drivers/naze32_rev5/drv_mag.c b/src/drivers/breezy_naze32_rev5/drv_mag.c similarity index 72% rename from src/drivers/naze32_rev5/drv_mag.c rename to src/drivers/breezy_naze32_rev5/drv_mag.c index da4e125..bce1bc8 100644 --- a/src/drivers/naze32_rev5/drv_mag.c +++ b/src/drivers/breezy_naze32_rev5/drv_mag.c @@ -1,5 +1,5 @@ #include "drivers/drv_sensors.h" -#include "drivers/naze32_common/drv_hmc5883l.h" +#include "drivers/breezy_naze32_common/drv_hmc5883l.h" #include "sensors.h" bool drv_sensors_mag_init( uint32_t i2c ) { diff --git a/src/drivers/naze32_rev6/drv_baro.c b/src/drivers/breezy_naze32_rev6/drv_baro.c similarity index 72% rename from src/drivers/naze32_rev6/drv_baro.c rename to src/drivers/breezy_naze32_rev6/drv_baro.c index bc5bbc4..ac9a12f 100644 --- a/src/drivers/naze32_rev6/drv_baro.c +++ b/src/drivers/breezy_naze32_rev6/drv_baro.c @@ -1,5 +1,5 @@ #include "drivers/drv_sensors.h" -#include "drivers/naze32_common/drv_bmp280.h" +#include "drivers/breezy_naze32_common/drv_bmp280.h" #include "sensors.h" bool drv_sensors_baro_init( uint32_t i2c ) { diff --git a/src/drivers/naze32_rev6/drv_imu.c b/src/drivers/breezy_naze32_rev6/drv_imu.c similarity index 93% rename from src/drivers/naze32_rev6/drv_imu.c rename to src/drivers/breezy_naze32_rev6/drv_imu.c index 98304bb..e900ec9 100644 --- a/src/drivers/naze32_rev6/drv_imu.c +++ b/src/drivers/breezy_naze32_rev6/drv_imu.c @@ -1,6 +1,6 @@ #include "drivers/drv_sensors.h" #include "drivers/drv_system.h" -#include "drivers/naze32_common/drv_mpu.h" +#include "drivers/breezy_naze32_common/drv_mpu.h" #include "sensors.h" #include "fix16.h" diff --git a/src/drivers/naze32_rev6/drv_mag.c b/src/drivers/breezy_naze32_rev6/drv_mag.c similarity index 72% rename from src/drivers/naze32_rev6/drv_mag.c rename to src/drivers/breezy_naze32_rev6/drv_mag.c index e5743e7..b691898 100644 --- a/src/drivers/naze32_rev6/drv_mag.c +++ b/src/drivers/breezy_naze32_rev6/drv_mag.c @@ -1,5 +1,5 @@ #include "drivers/drv_sensors.h" -#include "drivers/naze32_common/drv_hmc5883l.h" +#include "drivers/breezy_naze32_common/drv_hmc5883l.h" #include "sensors.h" bool drv_sensors_mag_init( uint32_t i2c ) {