Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Merge pull request #2239 from martinbudden/bf_gps_conversion_rename

Browse source 
Moved gps_conversion to common/ directory
This commit is contained in:
Martin Budden 2017-01-28 08:43:58 +00:00 • committed by GitHub
commit 36e1cf67ec
8 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -649,6 +649,7 @@ HIGHEND_SRC = \
cms/cms_menu_osd.c \
cms/cms_menu_vtx.c \
common/colorconversion.c \
common/gps_conversion.c \
drivers/display_ug2864hsweg01.c \
drivers/light_ws2811strip.c \
drivers/serial_escserial.c \
@ -656,7 +657,6 @@ HIGHEND_SRC = \
drivers/sonar_hcsr04.c \
drivers/vtx_common.c \
flight/navigation.c \
flight/gps_conversion.c \
io/dashboard.c \
io/displayport_max7456.c \
io/displayport_msp.c \

0
src/main/flight/gps_conversion.c → src/main/common/gps_conversion.c
View file

0
src/main/flight/gps_conversion.h → src/main/common/gps_conversion.h
View file

16
src/main/flight/navigation.c
View file

@ -27,6 +27,7 @@
#include "build/debug.h"
#include "common/axis.h"
#include "common/gps_conversion.h"
#include "common/maths.h"
#include "common/time.h"
@ -36,21 +37,20 @@
#include "fc/rc_controls.h"
#include "fc/runtime_config.h"
#include "sensors/sensors.h"
#include "sensors/boardalignment.h"
#include "sensors/acceleration.h"
#include "flight/imu.h"
#include "flight/navigation.h"
#include "flight/pid.h"
#include "io/beeper.h"
#include "io/serial.h"
#include "io/gps.h"
#include "flight/pid.h"
#include "flight/navigation.h"
#include "flight/gps_conversion.h"
#include "flight/imu.h"
#include "rx/rx.h"
#include "sensors/acceleration.h"
#include "sensors/boardalignment.h"
#include "sensors/sensors.h"
extern int16_t magHold;

20
src/main/io/gps.c
View file

@ -29,27 +29,27 @@
#include "build/build_config.h"
#include "build/debug.h"
#include "common/maths.h"
#include "common/axis.h"
#include "common/gps_conversion.h"
#include "common/maths.h"
#include "common/utils.h"
#include "drivers/system.h"
#include "config/feature.h"
#include "drivers/light_led.h"
#include "drivers/system.h"
#include "sensors/sensors.h"
#include "io/serial.h"
#include "io/dashboard.h"
#include "io/gps.h"
#include "flight/gps_conversion.h"
#include "flight/pid.h"
#include "flight/navigation.h"
#include "io/serial.h"
#include "fc/config.h"
#include "fc/runtime_config.h"
#include "config/feature.h"
#include "flight/navigation.h"
#include "flight/pid.h"
#include "sensors/sensors.h"
#define LOG_ERROR '?'
#define LOG_IGNORED '!'

16
src/test/Makefile
View file

@ -256,24 +256,24 @@ $(OBJECT_DIR)/altitude_hold_unittest : \
$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
$(OBJECT_DIR)/flight/gps_conversion.o : \
$(USER_DIR)/flight/gps_conversion.c \
$(USER_DIR)/flight/gps_conversion.h \
$(OBJECT_DIR)/common/gps_conversion.o : \
$(USER_DIR)/common/gps_conversion.c \
$(USER_DIR)/common/gps_conversion.h \
$(GTEST_HEADERS)
@mkdir -p $(dir $@)
$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/flight/gps_conversion.c -o $@
$(CC) $(C_FLAGS) $(TEST_CFLAGS) -c $(USER_DIR)/common/gps_conversion.c -o $@
$(OBJECT_DIR)/gps_conversion_unittest.o : \
$(TEST_DIR)/gps_conversion_unittest.cc \
$(USER_DIR)/flight/gps_conversion.h \
$(USER_DIR)/common/gps_conversion.h \
$(GTEST_HEADERS)
@mkdir -p $(dir $@)
$(CXX) $(CXX_FLAGS) $(TEST_CFLAGS) -c $(TEST_DIR)/gps_conversion_unittest.cc -o $@
$(OBJECT_DIR)/gps_conversion_unittest : \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/gps_conversion_unittest.o \
$(OBJECT_DIR)/gtest_main.a
@ -359,7 +359,7 @@ $(OBJECT_DIR)/telemetry_hott_unittest.o : \
$(OBJECT_DIR)/telemetry_hott_unittest : \
$(OBJECT_DIR)/telemetry/hott.o \
$(OBJECT_DIR)/telemetry_hott_unittest.o \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/gtest_main.a
$(CXX) $(CXX_FLAGS) $^ -o $(OBJECT_DIR)/$@
@ -537,7 +537,7 @@ $(OBJECT_DIR)/telemetry_crsf_unittest : \
$(OBJECT_DIR)/telemetry_crsf_unittest.o \
$(OBJECT_DIR)/common/maths.o \
$(OBJECT_DIR)/common/streambuf.o \
$(OBJECT_DIR)/flight/gps_conversion.o \
$(OBJECT_DIR)/common/gps_conversion.o \
$(OBJECT_DIR)/fc/runtime_config.o \
$(OBJECT_DIR)/gtest_main.a

14
src/test/unit/telemetry_crsf_unittest.cc
View file

@ -28,30 +28,30 @@ extern "C" {
#include "common/axis.h"
#include "common/filter.h"
#include "common/gps_conversion.h"
#include "common/maths.h"
#include "config/parameter_group.h"
#include "config/parameter_group_ids.h"
#include "drivers/system.h"
#include "drivers/serial.h"
#include "drivers/system.h"
#include "fc/runtime_config.h"
#include "flight/pid.h"
#include "flight/imu.h"
#include "io/gps.h"
#include "io/serial.h"
#include "rx/crsf.h"
#include "sensors/sensors.h"
#include "sensors/battery.h"
#include "sensors/sensors.h"
#include "telemetry/telemetry.h"
#include "telemetry/crsf.h"
#include "flight/pid.h"
#include "flight/imu.h"
#include "flight/gps_conversion.h"
#include "telemetry/telemetry.h"
bool airMode;
uint16_t vbat;

20
src/test/unit/telemetry_hott_unittest.cc
View file

@ -27,24 +27,24 @@ extern "C" {
#include "build/debug.h"
#include "common/axis.h"
#include "common/gps_conversion.h"
#include "drivers/system.h"
#include "drivers/serial.h"
#include "drivers/system.h"
#include "sensors/sensors.h"
#include "sensors/battery.h"
#include "sensors/barometer.h"
#include "fc/runtime_config.h"
#include "flight/pid.h"
#include "io/serial.h"
#include "io/gps.h"
#include "io/serial.h"
#include "sensors/barometer.h"
#include "sensors/battery.h"
#include "sensors/sensors.h"
#include "telemetry/telemetry.h"
#include "telemetry/hott.h"
#include "flight/pid.h"
#include "flight/gps_conversion.h"
#include "fc/runtime_config.h"
}
#include "unittest_macros.h"