Skip to content

Commit c2f7236

Browse files
divadiowdivadiow
authored
Merge branch 'openshwprojects:main' into tuyamcu
2 parents 680f149 + 42729cf commit c2f7236

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2386
-59
lines changed

‎.github/workflows/workflow.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,20 @@ jobs:
264264
- platform: OpenBK7238
265265
variant: battery
266266
gcc: apt
267+
268+
# bt proxy
269+
- platform: OpenBK7238
270+
variant: btproxy
271+
gcc: apt
272+
- platform: OpenBK7231N_ALT
273+
variant: btproxy
274+
gcc: apt
275+
- platform: OpenRTL87X0C
276+
variant: btproxy
277+
gcc: apt
278+
- platform: OpenLN882H
279+
variant: btproxy
280+
gcc: 10.3-2021.10
267281
steps:
268282
- name: Source checkout
269283
uses: actions/checkout@v4

‎Makefile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ else ifeq ($(VARIANT),hlw8112)
3131
OBK_VARIANT = 6
3232
else ifeq ($(VARIANT),battery)
3333
OBK_VARIANT = 7
34+
else ifeq ($(VARIANT),btproxy)
35+
OBK_VARIANT = 8
3436
else ifeq ($(VARIANT),2M)
3537
OBK_VARIANT = 1
3638
ESP_FSIZE = 2MB
@@ -637,7 +639,17 @@ OpenRTL8720E: prebuild_OpenRTL8720E
637639

638640
.PHONY: OpenBK7238
639641
OpenBK7238: prebuild_OpenBK7238
642+
ifeq ($(OBK_VARIANT), 8)
643+
cd sdk/beken_freertos_sdk && \
644+
cp -f beken378/app/config/sys_config_bk7238.h beken378/app/config/sys_config_bk7238.h.bak && \
645+
sed -i 's/#if 0\/\/BTPROXY/#if 1/' beken378/app/config/sys_config_bk7238.h && \
646+
OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7238 $(APP_VERSION); \
647+
rc=$$?; \
648+
mv -f beken378/app/config/sys_config_bk7238.h.bak beken378/app/config/sys_config_bk7238.h; \
649+
exit $$rc
650+
else
640651
cd sdk/beken_freertos_sdk && OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7238 $(APP_VERSION)
652+
endif
641653
mkdir -p output/$(APP_VERSION)
642654
cp sdk/beken_freertos_sdk/out/bk7238.bin output/$(APP_VERSION)/OpenBK7238_${APP_VERSION}.bin
643655
cp sdk/beken_freertos_sdk/out/bk7238_QIO.bin output/$(APP_VERSION)/OpenBK7238_QIO_${APP_VERSION}.bin
@@ -677,7 +689,17 @@ OpenBK7252N: prebuild_OpenBK7252N
677689

678690
.PHONY: OpenBK7231N_ALT
679691
OpenBK7231N_ALT: prebuild_OpenBK7231N_ALT
692+
ifeq ($(OBK_VARIANT), 8)
693+
cd sdk/beken_freertos_sdk && \
694+
cp -f beken378/app/config/sys_config_bk7231n.h beken378/app/config/sys_config_bk7231n.h.bak && \
695+
sed -i 's/#if 0\/\/BTPROXY/#if 1/' beken378/app/config/sys_config_bk7231n.h && \
696+
OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7231n $(APP_VERSION)_ALT; \
697+
rc=$$?; \
698+
mv -f beken378/app/config/sys_config_bk7231n.h.bak beken378/app/config/sys_config_bk7231n.h; \
699+
exit $$rc
700+
else
680701
cd sdk/beken_freertos_sdk && OBK_VARIANT=$(OBK_VARIANT) sh build.sh bk7231n $(APP_VERSION)_ALT
702+
endif
681703
mkdir -p output/$(APP_VERSION)
682704
cp sdk/beken_freertos_sdk/out/bk7231n_QIO.bin output/$(APP_VERSION)/OpenBK7231N_ALT_QIO_${APP_VERSION}.bin
683705
cp sdk/beken_freertos_sdk/out/bk7231n.bin output/$(APP_VERSION)/OpenBK7231N_ALT_${APP_VERSION}.bin

‎platforms/BK723x/OpenBeken.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ APP_C += $(OBK_DIR)/hal/bk7231/hal_pins_bk7231.c
3636
APP_C += $(OBK_DIR)/hal/bk7231/hal_wifi_bk7231.c
3737
APP_C += $(OBK_DIR)/hal/bk7231/hal_uart_bk7231.c
3838
APP_C += $(OBK_DIR)/hal/bk7231/hal_ota_bk7231.c
39+
APP_C += $(OBK_DIR)/hal/bk7231/hal_bt_proxy_bk7231.c
3940

4041
OBK_SRCS = $(OBK_DIR)/
4142
include $(OBK_DIR)/../platforms/obk_main.mk

‎platforms/ESP-IDF/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.16.0)
22
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
33
add_compile_definitions(PLATFORM_ESPIDF=1)
44
add_compile_definitions(LWIP_NOASSERT=1)
5-
add_definitions( -DUSER_SW_VER="$ENV{APP_VERSION}" )
6-
add_definitions( -DOBK_VARIANT=$ENV{OBK_VARIANT} )
5+
#add_definitions( -DUSER_SW_VER="$ENV{APP_VERSION}" )
6+
#add_definitions( -DOBK_VARIANT=$ENV{OBK_VARIANT} )
77
include_directories("$ENV{IDF_PATH}/../../libraries/berry/src")
88
include_directories("$ENV{IDF_PATH}/../../include")
99

10-
set(PROJECT_VER "$ENV{APP_VERSION}")
10+
#set(PROJECT_VER "$ENV{APP_VERSION}")
1111
project(OpenBeken)
1212
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=format-truncation" APPEND)
1313
idf_build_set_property(COMPILE_OPTIONS "-Wno-error=incompatible-pointer-types" APPEND)

‎platforms/ESP-IDF/main/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set(PROJ_ALL_SRC
1212
${OBK_SRCS}hal/espidf/hal_generic_espidf.c
1313
${OBK_SRCS}hal/espidf/hal_hwtimer_espidf.c
1414
${OBK_SRCS}hal/espidf/hal_main_espidf.c
15+
${OBK_SRCS}hal/espidf/hal_bt_proxy_espidf.c
1516
${OBK_SRCS}hal/espidf/hal_pins_espidf.c
1617
${OBK_SRCS}hal/espidf/hal_wifi_espidf.c
1718
${OBK_SRCS}hal/espidf/hal_uart_espidf.c
@@ -22,3 +23,6 @@ set(PROJ_ALL_SRC
2223
)
2324
idf_component_register(SRCS ${PROJ_ALL_SRC} WHOLE_ARCHIVE
2425
PRIV_REQUIRES mqtt lwip esp_wifi nvs_flash esp_driver_tsens esp_driver_gpio esp_pm esp_partition app_update esp_adc esp_driver_uart esp_driver_ledc spi_flash esp_driver_spi esp_driver_gptimer)
26+
27+
target_compile_definitions(${COMPONENT_LIB} PRIVATE USER_SW_VER="$ENV{APP_VERSION}")
28+
target_compile_definitions(${COMPONENT_LIB} PRIVATE OBK_VARIANT=$ENV{OBK_VARIANT})

‎platforms/ESP-IDF/sdkconfig.defaults.esp32c3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONFIG_PM_ENABLE=y
22
CONFIG_PM_DFS_INIT_AUTO=y
3-
CONFIG_PARTITION_TABLE_CUSTOM=y
3+
CONFIG_PARTITION_TABLE_CUSTOM=y

‎platforms/LN882H/CMakeLists.txt‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ include(app/platforms/obk_main.cmake)
1111
set(BERRY_SRCPATH "app/libraries/berry/src")
1212
set(BERRY_MODULEPATH "${OBK_SRCS}berry/modules")
1313
include_directories(${BERRY_SRCPATH})
14+
include_directories(app/platforms/LN882H)
1415
include(app/libraries/berry.cmake)
1516

1617
set(PROJ_ALL_SRC
@@ -27,6 +28,7 @@ set(PROJ_ALL_SRC
2728
${OBK_SRCS}hal/ln882h/hal_wifi_ln882h.c
2829
${OBK_SRCS}hal/ln882h/hal_ota_ln882h.c
2930
${OBK_SRCS}hal/ln882h/hal_uart_ln882h.c
31+
${OBK_SRCS}hal/ln882h/hal_bt_proxy_ln882h.c
3032
main.c
3133
bsp/serial_hw.c
3234
startup/startup_${CHIP_SERIAL}_gcc.c
@@ -39,6 +41,58 @@ set(PROJ_ALL_SRC
3941
set(COMP_DHCPD_SUPPORT ON PARENT_SCOPE)
4042
set(COMP_LWIP_SUPPORT ON PARENT_SCOPE)
4143

44+
############################### BLE (export) #################################
45+
file(GLOB_RECURSE BLE_LIB_IMPORT_SRC ${COMP_BLE_DIR}/ble_lib_import/*.c)
46+
file(GLOB_RECURSE BLE_ARCH ${COMP_BLE_DIR}/ble_arch/*.c)
47+
file(GLOB_RECURSE BLE_PROFILE_COMMON ${COMP_BLE_DIR}/ble_profiles/prf_common/*.c)
48+
file(GLOB_RECURSE BLE_APP_COMP ${COMP_BLE_DIR}/ble_app/*.c)
49+
include_directories(${COMP_BLE_DIR})
50+
include_directories(${COMP_BLE_DIR}/ble_arch)
51+
include_directories(${COMP_BLE_DIR}/ble_profiles/prf_common)
52+
include_directories(${COMP_BLE_DIR}/ble_lib_import)
53+
54+
include_directories(${COMP_BLE_DIR}/ble_app/ble_common)
55+
include_directories(${COMP_BLE_DIR}/ble_app/ble_connection_manager)
56+
include_directories(${COMP_BLE_DIR}/ble_app/ble_device_manager)
57+
include_directories(${COMP_BLE_DIR}/ble_app/ble_event)
58+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gap/gap_advertising)
59+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gap/gap_misc)
60+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gap/gap_scan)
61+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gatt/gatt_client)
62+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gatt/gatt_common)
63+
include_directories(${COMP_BLE_DIR}/ble_app/ble_gatt/gatt_server)
64+
include_directories(${COMP_BLE_DIR}/ble_app/ble_import)
65+
include_directories(${COMP_BLE_DIR}/ble_app/ble_smp)
66+
include_directories(${COMP_BLE_DIR}/ble_app/ble_store)
67+
include_directories(${COMP_BLE_DIR}/ble_app/ble_test)
68+
69+
include_directories(${COMP_BLE_DIR}/mac/ble/hl/api)
70+
include_directories(${COMP_BLE_DIR}/mac/ble/hl/inc)
71+
include_directories(${COMP_BLE_DIR}/mac/ble/ll/api)
72+
include_directories(${COMP_BLE_DIR}/mac/ble/ll/import)
73+
include_directories(${COMP_BLE_DIR}/mac/ble/ll/src)
74+
include_directories(${COMP_BLE_DIR}/mac/ble/ll/src/llm)
75+
include_directories(${COMP_BLE_DIR}/mac/em/api)
76+
include_directories(${COMP_BLE_DIR}/mac/hci/api)
77+
include_directories(${COMP_BLE_DIR}/mac/sch/api)
78+
include_directories(${COMP_BLE_DIR}/mac/sch/import)
79+
include_directories(${COMP_BLE_DIR}/modules/aes/api)
80+
include_directories(${COMP_BLE_DIR}/modules/aes/api)
81+
include_directories(${COMP_BLE_DIR}/modules/common/api)
82+
include_directories(${COMP_BLE_DIR}/modules/dbg/api)
83+
include_directories(${COMP_BLE_DIR}/modules/ecc_p256/api)
84+
include_directories(${COMP_BLE_DIR}/modules/h4tl/api)
85+
include_directories(${COMP_BLE_DIR}/modules/ke/api)
86+
include_directories(${COMP_BLE_DIR}/modules/lib_ver/api)
87+
include_directories(${COMP_BLE_DIR}/modules/nvds/api)
88+
include_directories(${COMP_BLE_DIR}/modules/rf/api)
89+
include_directories(${COMP_BLE_DIR}/modules/rwip/api)
90+
91+
list(APPEND PROJ_ALL_SRC ${BLE_LIB_IMPORT_SRC})
92+
list(APPEND PROJ_ALL_SRC ${BLE_ARCH})
93+
list(APPEND PROJ_ALL_SRC ${BLE_PROFILE_COMMON})
94+
list(APPEND PROJ_ALL_SRC ${BLE_APP_COMP})
95+
4296
#---------------------------- project output elf ---------------------------
4397
set(TARGET_ELF_NAME ${USER_PROJECT})
4498
set(pro_executable_target ${TARGET_ELF_NAME}.elf)
@@ -49,6 +103,7 @@ target_link_libraries(${pro_executable_target}
49103
ln::dhcpd
50104
lwip
51105
${CHIP_SERIAL}_wifi
106+
${CHIP_SERIAL}_ble_full_stack
52107
-lc -lm -lnosys
53108

54109
PRIVATE

‎platforms/LN882H/ble_app_user_cfg.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#ifndef _BLE_APP_USER_CONFIG_H_
2+
#define _BLE_APP_USER_CONFIG_H_
3+
#define BLE_DEFAULT_ROLE BLE_ROLE_ALL
4+
#define BLE_DEFAULT_PUBLIC_ADDR {0x56, 0x34, 0x12, 0x02, 0xFF, 0x00}
5+
#define BLE_CONFIG_AUTO_ADV 0
6+
#define BLE_CONFIG_AUTO_SCAN 0
7+
#define BLE_DATA_TRANS_SERVER 0
8+
#define BLE_DATA_TRANS_CLIENT 0
9+
#endif /* _BLE_APP_USER_CONFIG_H_ */

‎platforms/RTL8720D/OpenBeken.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CSRC += $(PLDIR)/main.c
88
#CSRC += hal/realtek/rtl8720d/hal_main_rtl8710b.c
99
CSRC += hal/realtek/rtl8720d/hal_uart_rtl8720d.c
1010
CSRC += hal/realtek/rtl8720d/hal_pins_rtl8720d.c
11+
CSRC += hal/realtek/rtl8720d/hal_bt_proxy_rtl8720d.c
1112
CSRC += hal/realtek/hal_flashConfig_realtek.c
1213
CSRC += hal/realtek/hal_flashVars_realtek.c
1314
CSRC += hal/realtek/hal_generic_realtek.c

‎platforms/RTL87X0C/OpenBeken.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SRC_C += ../../../../../platforms/RTL87X0C/main.c
1010
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_main_rtl87x0c.c
1111
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_pins_rtl87x0c.c
1212
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_uart_rtl87x0c.c
13+
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8720d/hal_bt_proxy_rtl8720d.c
1314
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashConfig_realtek.c
1415
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashVars_realtek.c
1516
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_generic_realtek.c

0 commit comments

Comments
 (0)