Skip to content

Commit 059ada4

Browse files
authored
Filter comment line while try to get SYSTEM_HSE_MHZ value. (betaflight#14194)
* Filter comment line while try to get SYSTEM_HSE_MHZ value. * use sed to find correct SYSTEM_HSE_MHZ * get TARGET EXST_ADJUST_VMA value through sed and remove GYRO_DEFINE * improve get FC_VMA_ADDRESS regex to fit more condition
1 parent c12a57e commit 059ada4

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

mk/config.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,17 @@ CONFIG_REVISION := $(shell git -C $(CONFIG_DIR) log -1 --format="%h")
3434
CONFIG_REVISION_DEFINE := -D'__CONFIG_REVISION__="$(CONFIG_REVISION)"'
3535
endif
3636

37-
TARGET := $(shell grep " FC_TARGET_MCU" $(CONFIG_HEADER_FILE) | awk '{print $$3}' )
38-
HSE_VALUE_MHZ := $(shell grep " SYSTEM_HSE_MHZ" $(CONFIG_HEADER_FILE) | awk '{print $$3}' )
37+
HSE_VALUE_MHZ := $(shell sed -E -n "/^\s*#\s*define\s+SYSTEM_HSE_MHZ\s+([0-9]+).*/s//\1/p" $(CONFIG_HEADER_FILE))
3938
ifneq ($(HSE_VALUE_MHZ),)
4039
HSE_VALUE := $(shell echo $$(( $(HSE_VALUE_MHZ) * 1000000 )) )
4140
endif
4241

43-
GYRO_DEFINE := $(shell grep " USE_GYRO_" $(CONFIG_HEADER_FILE) | awk '{print $$2}' )
44-
42+
TARGET := $(shell sed -E -n "/^\s*#\s*define\s+FC_TARGET_MCU\s+(\w+).*/s//\1/p" $(CONFIG_HEADER_FILE))
4543
ifeq ($(TARGET),)
4644
$(error No TARGET identified. Is the $(CONFIG_HEADER_FILE) valid for $(CONFIG)?)
4745
endif
4846

49-
EXST_ADJUST_VMA := $(shell grep " FC_VMA_ADDRESS" $(CONFIG_HEADER_FILE) | awk '{print $$3}' )
47+
EXST_ADJUST_VMA := $(shell sed -E -n "/^\s*#\s*define\s+FC_VMA_ADDRESS\s+((0[xX])?[[:xdigit:]]+).*/s//\1/p" $(CONFIG_HEADER_FILE))
5048
ifneq ($(EXST_ADJUST_VMA),)
5149
EXST = yes
5250
endif

0 commit comments

Comments
 (0)