Shifted codebase naming to make it less confusing for the legacy bree…

…zy build
pryre · Aug 14, 2019 · 2ca439f · 2ca439f
1 parent 47341d5
commit 2ca439f
Show file tree

Hide file tree

Showing 30 changed files with 27 additions and 27 deletions.
diff --git 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 → ...drivers/breezy_naze32_common/drv_bmp280.h b/include/drivers/naze32_common/drv_bmp280.h → ...drivers/breezy_naze32_common/drv_bmp280.h
diff --git a/include/drivers/naze32_common/drv_hmc5883l.h → ...ivers/breezy_naze32_common/drv_hmc5883l.h b/include/drivers/naze32_common/drv_hmc5883l.h → ...ivers/breezy_naze32_common/drv_hmc5883l.h
diff --git a/include/drivers/naze32_common/drv_mpu.h → ...de/drivers/breezy_naze32_common/drv_mpu.h b/include/drivers/naze32_common/drv_mpu.h → ...de/drivers/breezy_naze32_common/drv_mpu.h
diff --git a/makefiles/naze32_rev5/Makefile → makefiles/breezy_naze32_rev5/Makefile b/makefiles/naze32_rev5/Makefile → 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 → makefiles/breezy_naze32_rev5/robin b/makefiles/naze32_rev5/robin → makefiles/breezy_naze32_rev5/robin
diff --git a/makefiles/naze32_rev6/Makefile → makefiles/breezy_naze32_rev6/Makefile b/makefiles/naze32_rev6/Makefile → 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 → makefiles/breezy_naze32_rev6/robin b/makefiles/naze32_rev6/robin → makefiles/breezy_naze32_rev6/robin
diff --git a/makefiles/common/makefile.naze32_common → ...iles/common/makefile.breezy_naze32_common b/makefiles/common/makefile.naze32_common → ...iles/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/...ivers/naze32_common/drv_battery_voltage.c → ...reezy_naze32_common/drv_battery_voltage.c b/...ivers/naze32_common/drv_battery_voltage.c → ...reezy_naze32_common/drv_battery_voltage.c
diff --git a/src/drivers/naze32_common/drv_bmp280.c → ...drivers/breezy_naze32_common/drv_bmp280.c b/src/drivers/naze32_common/drv_bmp280.c → ...drivers/breezy_naze32_common/drv_bmp280.c
@@ -5,7 +5,7 @@
 */
 
 #include <breezystm32.h>
-#include <drivers/naze32_common/drv_bmp280.h>
+#include <drivers/breezy_naze32_common/drv_bmp280.h>
 
 #include <math.h>
 

diff --git a/src/drivers/naze32_common/drv_comms.c → src/drivers/breezy_naze32_common/drv_comms.c b/src/drivers/naze32_common/drv_comms.c → src/drivers/breezy_naze32_common/drv_comms.c
diff --git a/src/drivers/naze32_common/drv_flash.c → src/drivers/breezy_naze32_common/drv_flash.c b/src/drivers/naze32_common/drv_flash.c → src/drivers/breezy_naze32_common/drv_flash.c
diff --git a/src/drivers/naze32_common/drv_hmc5883l.c → ...ivers/breezy_naze32_common/drv_hmc5883l.c b/src/drivers/naze32_common/drv_hmc5883l.c → ...ivers/breezy_naze32_common/drv_hmc5883l.c
@@ -21,7 +21,7 @@
  */
 
 #include <breezystm32.h>
-#include <drivers/naze32_common/drv_hmc5883l.h>
+#include <drivers/breezy_naze32_common/drv_hmc5883l.h>
 
 #include <math.h>
 

diff --git a/src/drivers/naze32_common/drv_i2c.c → src/drivers/breezy_naze32_common/drv_i2c.c b/src/drivers/naze32_common/drv_i2c.c → 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 → src/drivers/breezy_naze32_common/drv_mpu.c b/src/drivers/naze32_common/drv_mpu.c → src/drivers/breezy_naze32_common/drv_mpu.c
@@ -20,7 +20,7 @@
  */
 
 #include <breezystm32.h>
-#include <drivers/naze32_common/drv_mpu.h>
+#include <drivers/breezy_naze32_common/drv_mpu.h>
 
 #include <math.h>
 

diff --git a/src/drivers/naze32_common/drv_mpu6050.c → ...rivers/breezy_naze32_common/drv_mpu6050.c b/src/drivers/naze32_common/drv_mpu6050.c → ...rivers/breezy_naze32_common/drv_mpu6050.c
@@ -19,7 +19,7 @@
    along with BreezySTM32.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "drivers/naze32_common/drv_mpu.h"
+#include "drivers/breezy_naze32_common/drv_mpu.h"
 #include "breezystm32.h"
 
 #include <math.h>

diff --git a/src/drivers/naze32_common/drv_mpu6500.c → ...rivers/breezy_naze32_common/drv_mpu6500.c b/src/drivers/naze32_common/drv_mpu6500.c → ...rivers/breezy_naze32_common/drv_mpu6500.c
@@ -19,7 +19,7 @@
    along with BreezySTM32.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "drivers/naze32_common/drv_mpu.h"
+#include "drivers/breezy_naze32_common/drv_mpu.h"
 #include "breezystm32.h"
 
 #include <math.h>

diff --git a/src/drivers/naze32_common/drv_pwm.c → src/drivers/breezy_naze32_common/drv_pwm.c b/src/drivers/naze32_common/drv_pwm.c → src/drivers/breezy_naze32_common/drv_pwm.c
diff --git a/src/drivers/naze32_common/drv_rc_input.c → ...ivers/breezy_naze32_common/drv_rc_input.c b/src/drivers/naze32_common/drv_rc_input.c → ...ivers/breezy_naze32_common/drv_rc_input.c
diff --git a/...drivers/naze32_common/drv_safety_button.c → .../breezy_naze32_common/drv_safety_button.c b/...drivers/naze32_common/drv_safety_button.c → .../breezy_naze32_common/drv_safety_button.c
diff --git a/src/drivers/naze32_common/drv_status_io.c → ...vers/breezy_naze32_common/drv_status_io.c b/src/drivers/naze32_common/drv_status_io.c → ...vers/breezy_naze32_common/drv_status_io.c
diff --git a/src/drivers/naze32_common/drv_system.c → ...drivers/breezy_naze32_common/drv_system.c b/src/drivers/naze32_common/drv_system.c → ...drivers/breezy_naze32_common/drv_system.c
diff --git a/src/drivers/naze32_common/main.c → src/drivers/breezy_naze32_common/main.c b/src/drivers/naze32_common/main.c → src/drivers/breezy_naze32_common/main.c
diff --git a/src/drivers/naze32_rev5/drv_baro.c → src/drivers/breezy_naze32_rev5/drv_baro.c b/src/drivers/naze32_rev5/drv_baro.c → 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 → src/drivers/breezy_naze32_rev5/drv_imu.c b/src/drivers/naze32_rev5/drv_imu.c → 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 → src/drivers/breezy_naze32_rev5/drv_mag.c b/src/drivers/naze32_rev5/drv_mag.c → 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 → src/drivers/breezy_naze32_rev6/drv_baro.c b/src/drivers/naze32_rev6/drv_baro.c → 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 → src/drivers/breezy_naze32_rev6/drv_imu.c b/src/drivers/naze32_rev6/drv_imu.c → 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 → src/drivers/breezy_naze32_rev6/drv_mag.c b/src/drivers/naze32_rev6/drv_mag.c → 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 ) {