kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update per review

This commit is contained in:
hathach 2021-04-18 01:50:16 +07:00
parent 38cc459c93
commit 803b755554
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -189,12 +189,14 @@ jobs:
matrix: matrix:
board: board:
# Alphabetical order # Alphabetical order
# ESP32-S2
- 'adafruit_feather_esp32s2' - 'adafruit_feather_esp32s2'
- 'adafruit_magtag_29gray' - 'adafruit_magtag_29gray'
- 'adafruit_metro_esp32s2' - 'adafruit_metro_esp32s2'
# - 'espressif_addax_1' # temporarily remove the board from test while espressif MR is not merged
- 'espressif_kaluga_1' - 'espressif_kaluga_1'
- 'espressif_saola_1' - 'espressif_saola_1'
# ESP32-S3
# - 'espressif_addax_1' # temporarily remove the board from test while espressif MR is not merged
steps: steps:
- name: Setup Python - name: Setup Python

2
examples/device/board_test/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(TOP "../../..")
get_filename_component(TOP "${TOP}" REALPATH) get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY MATCHES "^(esp32s[2-3])*") if(FAMILY MATCHES "^esp32s[2-3]")
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)

2
examples/device/cdc_msc_freertos/CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(TOP "../../..")
get_filename_component(TOP "${TOP}" REALPATH) get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY MATCHES "^(esp32s[2-3])*") if(FAMILY MATCHES "^esp32s[2-3]")
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
project(${PROJECT}) project(${PROJECT})

2
examples/device/hid_composite_freertos/CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(TOP "../../..")
get_filename_component(TOP "${TOP}" REALPATH) get_filename_component(TOP "${TOP}" REALPATH)
# Check for -DFAMILY= # Check for -DFAMILY=
if(FAMILY MATCHES "^(esp32s[2-3])*") if(FAMILY MATCHES "^esp32s[2-3]")
include(${TOP}/hw/bsp/${FAMILY}/family.cmake) include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
project(${PROJECT}) project(${PROJECT})
else() else()

3
examples/make.mk
View File

@ -27,9 +27,6 @@ endif
# Board within family # Board within family
ifeq ($(BOARD_PATH),) ifeq ($(BOARD_PATH),)
BOARD_PATH := $(subst $(TOP)/,,$(wildcard $(TOP)/hw/bsp/*/boards/$(BOARD))) BOARD_PATH := $(subst $(TOP)/,,$(wildcard $(TOP)/hw/bsp/*/boards/$(BOARD)))
ifneq ($(wildcard $(TOP)/hw/bsp/*/boards/$(BOARD)/board.mk),)
include $(TOP)/hw/bsp/*/boards/$(BOARD)/board.mk
endif
FAMILY := $(word 3, $(subst /, ,$(BOARD_PATH))) FAMILY := $(word 3, $(subst /, ,$(BOARD_PATH)))
FAMILY_PATH = hw/bsp/$(FAMILY) FAMILY_PATH = hw/bsp/$(FAMILY)
endif endif