From 5d09349b9dc749638b0a6c31c80b880ebe0d90f2 Mon Sep 17 00:00:00 2001 From: openshwprojects <85486843+openshwprojects@users.noreply.github.com> Date: Sat, 19 Apr 2025 11:58:35 +0200 Subject: [PATCH] also add XR806 to online builds (it boots but there is some issue with WiFi?) * Update .gitmodules * w * Manually added submodule OpenXR * Update Makefile * Update Makefile * Update Makefile * Update OpenXR806 * Update OpenXR806 * Update OpenXR806 * Update hal_wifi_xr809.c --- .github/workflows/workflow.yaml | 2 ++ .gitmodules | 5 +++++ Makefile | 37 ++++++++++++++++++++++++++++++++- sdk/OpenXR806 | 1 + src/hal/xr809/hal_wifi_xr809.c | 8 +++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 160000 sdk/OpenXR806 diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 2dd8fc2e0..1a71460dd 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -120,6 +120,8 @@ jobs: variant: berry - platform: OpenXR809 variant: default + - platform: OpenXR806 + variant: default - platform: OpenXR872 variant: default - platform: OpenBL602 diff --git a/.gitmodules b/.gitmodules index 6db0dc52b..6060d544c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,3 +62,8 @@ path = sdk/OpenXR872 url = https://github.com/openshwprojects/OpenXR872 branch = main + +[submodule "sdk/OpenXR806"] + path = sdk/OpenXR806 + url = https://github.com/openshwprojects/OpenXR806 + branch = master diff --git a/Makefile b/Makefile index 1d63264dc..c6e41857d 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,10 @@ sdk/OpenXR809/project/oxr_sharedApp/shared: @echo Create symlink for $(APP_NAME) into sdk folder ln -s "$(shell pwd)/" "sdk/OpenXR809/project/oxr_sharedApp/shared" +sdk/OpenXR806/project/demo/sharedApp/shared: + @echo Create symlink for $(APP_NAME) into sdk folder + ln -s "$(shell pwd)/" "sdk/OpenXR806/project/demo/sharedApp/shared" + sdk/OpenXR872/project/demo/hello_demo/shared: @echo Create symlink for $(APP_NAME) into sdk folder ln -s "$(shell pwd)/" "sdk/OpenXR872/project/demo/hello_demo/shared" @@ -82,7 +86,7 @@ sdk/OpenLN882H/project/OpenBeken/app: ln -s "$(shell pwd)/" "sdk/OpenLN882H/project/OpenBeken/app" .PHONY: prebuild_OpenBK7231N prebuild_OpenBK7231T prebuild_OpenBL602 prebuild_OpenLN882H -.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260 +.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR806 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260 .PHONY: prebuild_OpenRTL87X0C prebuild_OpenBK7238 prebuild_OpenBK7231N_ALT prebuild_OpenBK7231N: @@ -148,6 +152,15 @@ prebuild_OpenXR809: else echo "prebuild for OpenXR809 not found ... "; \ fi +prebuild_OpenXR806: + git submodule update --init --recursive sdk/OpenXR806 + git submodule update --init --recursive libraries/berry + @if [ -e platforms/XR806/pre_build.sh ]; then \ + echo "prebuild found for OpenXR806"; \ + sh platforms/XR806/pre_build.sh; \ + else echo "prebuild for OpenXR806 not found ... "; \ + fi + prebuild_OpenXR872: git submodule update --init --recursive sdk/OpenXR872 @if [ -e platforms/XR872/pre_build.sh ]; then \ @@ -253,6 +266,9 @@ OpenBK7231N: prebuild_OpenBK7231N sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q2: cd sdk/OpenXR809/tools && wget -q "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" && tar -xf *.tar.bz2 && rm -f *.tar.bz2 +sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update: + cd sdk/OpenXR806/tools && wget -q "https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2" && tar -xf *.tar.bz2 && rm -f *.tar.bz2 + sdk/OpenXR872/tools/gcc-arm-none-eabi-4_9-2015q2: cd sdk/OpenXR872/tools && wget -q "https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q2-update/+download/gcc-arm-none-eabi-4_9-2015q2-20150609-linux.tar.bz2" && tar -xf *.tar.bz2 && rm -f *.tar.bz2 @@ -273,6 +289,23 @@ build-XR872: sdk/OpenXR872/project/demo/hello_demo/shared sdk/OpenXR872/tools/gc cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION).img + +.PHONY: OpenXR806 build-XR806 +# Retry OpenXR806 a few times to account for calibration file issues +RETRY = 3 +OpenXR806: prebuild_OpenXR806 + @for i in `seq 1 ${RETRY}`; do ($(MAKE) -k build-XR806; echo Prebuild attempt $$i/${RETRY}); done + @echo Running build final time to check output + $(MAKE) build-XR806; + +build-XR806: sdk/OpenXR806/project/demo/sharedApp/shared sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update + $(MAKE) -C sdk/OpenXR806/src CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin + $(MAKE) -C sdk/OpenXR806/src install CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin + $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin + $(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin + mkdir -p output/$(APP_VERSION) + cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION).img + .PHONY: OpenXR809 build-XR809 # Retry OpenXR809 a few times to account for calibration file issues RETRY = 3 @@ -466,6 +499,8 @@ clean: $(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean $(MAKE) -C sdk/OpenXR809/src clean $(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean + $(MAKE) -C sdk/OpenXR806/src clean + $(MAKE) -C sdk/OpenXR806/project/oxr_sharedApp/gcc clean $(MAKE) -C sdk/OpenXR872/src clean $(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc clean $(MAKE) -C sdk/OpenW800 clean diff --git a/sdk/OpenXR806 b/sdk/OpenXR806 new file mode 160000 index 000000000..aa812b1f4 --- /dev/null +++ b/sdk/OpenXR806 @@ -0,0 +1 @@ +Subproject commit aa812b1f4ccf0d575c394c145a6d5b4bc0cedf67 diff --git a/src/hal/xr809/hal_wifi_xr809.c b/src/hal/xr809/hal_wifi_xr809.c index 91a68fddb..0d4654e5d 100644 --- a/src/hal/xr809/hal_wifi_xr809.c +++ b/src/hal/xr809/hal_wifi_xr809.c @@ -46,6 +46,14 @@ void HAL_DisconnectFromWifi() { } +void HAL_DisableEnhancedFastConnect() +{ + +} +void HAL_FastConnectToWiFi(const char* oob_ssid, const char* connect_key, obkStaticIP_t* ip) +{ + HAL_ConnectToWiFi(oob_ssid, connect_key, ip); +} int HAL_SetupWiFiOpenAccessPoint(const char *ssid) { char ap_psk[8] = { 0 };