Skip to content

Commit 228978d

Browse files
committedDec 22, 2018
Refactored code with git submodules
1 parent 92ac7cd commit 228978d

14 files changed

+30
-739
lines changed
 

‎.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "libraries/ble_services"]
2+
path = libraries/ble_services
3+
url = https://github.com/vincent290587/ble_services.git
4+
[submodule "libraries/ant_profiles"]
5+
path = libraries/ant_profiles
6+
url = https://github.com/vincent290587/ant_profiles.git

‎CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ include_directories(
4343
libraries/AltiBaro
4444
libraries/GlobalTop
4545
libraries/utils
46-
libraries/ble_komoot_c
46+
libraries/komoot
4747
libraries/TinyGPSPlus
4848
rf
4949
source
@@ -79,6 +79,7 @@ set(SRCS
7979
libraries/AdafruitGFX/Print.cpp
8080
libraries/AltiBaro/AltiBaro.cpp
8181
libraries/utils/utils.c
82+
libraries/komoot/komoot_nav.c
8283
libraries/GlobalTop/EPONmeaPacket.cpp
8384
libraries/TinyGPSPlus/TinyGPS++.cpp
8485
source/display/SegmentManager.cpp

‎Makefile.files

+1-6
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ INC_FOLDERS += \
103103
$(PROJ_DIR)/libraries/GlobalTop \
104104
$(PROJ_DIR)/libraries/jscope \
105105
$(PROJ_DIR)/libraries/sysview \
106+
$(PROJ_DIR)/libraries/komoot \
106107
$(PROJ_DIR)/libraries/TinyGPSPlus \
107108
$(PROJ_DIR)/libraries/VParser \
108109
$(PROJ_DIR)/libraries/utils \
@@ -167,16 +168,10 @@ INC_FOLDERS += \
167168
$(SDK_ROOT)/external/fatfs/port \
168169
$(SDK_ROOT)/external/protothreads \
169170
$(SDK_ROOT)/external/protothreads/pt-1.4 \
170-
$(SDK_ROOT)/components/ble/ble_services/ble_lns_c \
171-
$(SDK_ROOT)/components/ant/ant_profiles/ant_glasses \
172171
$(SDK_ROOT)/components/ant/ant_profiles/ant_common \
173172
$(SDK_ROOT)/components/ant/ant_profiles/ant_common/pages \
174-
$(SDK_ROOT)/components/ant/ant_profiles/ant_fec \
175-
$(SDK_ROOT)/components/ant/ant_profiles/ant_fec/pages \
176-
$(SDK_ROOT)/components/ant/ant_profiles/ant_fec/utils \
177173
$(SDK_ROOT)/components/ant/ant_profiles/ant_hrm \
178174
$(SDK_ROOT)/components/ant/ant_profiles/ant_hrm/utils \
179-
$(SDK_ROOT)/components/ant/ant_profiles/ant_hrm/simulator \
180175
$(SDK_ROOT)/components/ant/ant_state_indicator \
181176
$(SDK_ROOT)/components/ant/ant_key_manager \
182177
$(SDK_ROOT)/components/ant/ant_key_manager/config \

‎ble.files

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11

2-
32
# Source files common to all targets
43
SRC_FILES += \
4+
$(wildcard $(PROJ_DIR)/libraries/ble_services/ble_lns_c/*.c) \
5+
$(wildcard $(PROJ_DIR)/libraries/ble_services/ble_komoot_c/*.c) \
6+
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_ancs_c/*.c) \
7+
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_bas_c/*.c) \
8+
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_nus_c/*.c) \
59
$(SDK_ROOT)/components/libraries/fstorage/nrf_fstorage_sd.c \
610
$(SDK_ROOT)/components/ble/common/ble_advdata.c \
711
$(SDK_ROOT)/components/ble/ble_advertising/ble_advertising.c \
@@ -23,15 +27,11 @@ SRC_FILES += \
2327
$(SDK_ROOT)/components/ble/peer_manager/security_dispatcher.c \
2428
$(SDK_ROOT)/components/ble/peer_manager/security_manager.c \
2529
$(SDK_ROOT)/components/ble/ble_radio_notification/ble_radio_notification.c \
26-
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_ancs_c/*.c) \
27-
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_bas_c/*.c) \
28-
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_lns_c/*.c) \
29-
$(wildcard $(SDK_ROOT)/components/ble/ble_services/ble_nus_c/*.c) \
30-
$(PROJ_DIR)/libraries/ble_komoot_c/ble_komoot_c.c \
3130
$(SDK_ROOT)/components/ble/ble_services/experimental_gatts_c/nrf_ble_gatts_c.c \
3231
$(SDK_ROOT)/components/softdevice/common/nrf_sdh.c \
3332
$(SDK_ROOT)/components/softdevice/common/nrf_sdh_ble.c \
3433
$(SDK_ROOT)/components/softdevice/common/nrf_sdh_soc.c
3534

3635
INC_FOLDERS += \
37-
$(PROJ_DIR)/libraries/ble_komoot_c
36+
$(PROJ_DIR)/libraries/ble_services/ble_lns_c \
37+
$(PROJ_DIR)/libraries/ble_services/ble_komoot_c

‎libraries/ant_profiles

Submodule ant_profiles added at 36f58b0

0 commit comments

Comments
 (0)
Please sign in to comment.