Skip to content

Commit 5d09349

Browse files
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
1 parent 379f7cb commit 5d09349

File tree

5 files changed

+52
-1
lines changed

5 files changed

+52
-1
lines changed

.github/workflows/workflow.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ jobs:
120120
variant: berry
121121
- platform: OpenXR809
122122
variant: default
123+
- platform: OpenXR806
124+
variant: default
123125
- platform: OpenXR872
124126
variant: default
125127
- platform: OpenBL602

.gitmodules

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,8 @@
6262
path = sdk/OpenXR872
6363
url = https://github.com/openshwprojects/OpenXR872
6464
branch = main
65+
66+
[submodule "sdk/OpenXR806"]
67+
path = sdk/OpenXR806
68+
url = https://github.com/openshwprojects/OpenXR806
69+
branch = master

Makefile

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ sdk/OpenXR809/project/oxr_sharedApp/shared:
5858
@echo Create symlink for $(APP_NAME) into sdk folder
5959
ln -s "$(shell pwd)/" "sdk/OpenXR809/project/oxr_sharedApp/shared"
6060

61+
sdk/OpenXR806/project/demo/sharedApp/shared:
62+
@echo Create symlink for $(APP_NAME) into sdk folder
63+
ln -s "$(shell pwd)/" "sdk/OpenXR806/project/demo/sharedApp/shared"
64+
6165
sdk/OpenXR872/project/demo/hello_demo/shared:
6266
@echo Create symlink for $(APP_NAME) into sdk folder
6367
ln -s "$(shell pwd)/" "sdk/OpenXR872/project/demo/hello_demo/shared"
@@ -82,7 +86,7 @@ sdk/OpenLN882H/project/OpenBeken/app:
8286
ln -s "$(shell pwd)/" "sdk/OpenLN882H/project/OpenBeken/app"
8387

8488
.PHONY: prebuild_OpenBK7231N prebuild_OpenBK7231T prebuild_OpenBL602 prebuild_OpenLN882H
85-
.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260
89+
.PHONY: prebuild_OpenW600 prebuild_OpenW800 prebuild_OpenXR809 prebuild_OpenXR806 prebuild_OpenXR872 prebuild_ESPIDF prebuild_OpenTR6260
8690
.PHONY: prebuild_OpenRTL87X0C prebuild_OpenBK7238 prebuild_OpenBK7231N_ALT
8791

8892
prebuild_OpenBK7231N:
@@ -148,6 +152,15 @@ prebuild_OpenXR809:
148152
else echo "prebuild for OpenXR809 not found ... "; \
149153
fi
150154

155+
prebuild_OpenXR806:
156+
git submodule update --init --recursive sdk/OpenXR806
157+
git submodule update --init --recursive libraries/berry
158+
@if [ -e platforms/XR806/pre_build.sh ]; then \
159+
echo "prebuild found for OpenXR806"; \
160+
sh platforms/XR806/pre_build.sh; \
161+
else echo "prebuild for OpenXR806 not found ... "; \
162+
fi
163+
151164
prebuild_OpenXR872:
152165
git submodule update --init --recursive sdk/OpenXR872
153166
@if [ -e platforms/XR872/pre_build.sh ]; then \
@@ -253,6 +266,9 @@ OpenBK7231N: prebuild_OpenBK7231N
253266
sdk/OpenXR809/tools/gcc-arm-none-eabi-4_9-2015q2:
254267
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
255268

269+
sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update:
270+
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
271+
256272
sdk/OpenXR872/tools/gcc-arm-none-eabi-4_9-2015q2:
257273
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
258274

@@ -273,6 +289,23 @@ build-XR872: sdk/OpenXR872/project/demo/hello_demo/shared sdk/OpenXR872/tools/gc
273289
cp sdk/OpenXR872/project/demo/hello_demo/image/xr872/xr_system.img output/$(APP_VERSION)/OpenXR872_$(APP_VERSION).img
274290

275291

292+
293+
.PHONY: OpenXR806 build-XR806
294+
# Retry OpenXR806 a few times to account for calibration file issues
295+
RETRY = 3
296+
OpenXR806: prebuild_OpenXR806
297+
@for i in `seq 1 ${RETRY}`; do ($(MAKE) -k build-XR806; echo Prebuild attempt $$i/${RETRY}); done
298+
@echo Running build final time to check output
299+
$(MAKE) build-XR806;
300+
301+
build-XR806: sdk/OpenXR806/project/demo/sharedApp/shared sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update
302+
$(MAKE) -C sdk/OpenXR806/src CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin
303+
$(MAKE) -C sdk/OpenXR806/src install CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin
304+
$(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin
305+
$(MAKE) -C sdk/OpenXR806/project/demo/sharedApp/gcc image CC_DIR=$(PWD)/sdk/OpenXR806/tools/gcc-arm-none-eabi-8-2019-q3-update/bin
306+
mkdir -p output/$(APP_VERSION)
307+
cp sdk/OpenXR806/project/demo/sharedApp/image/xr806/xr_system.img output/$(APP_VERSION)/OpenXR806_$(APP_VERSION).img
308+
276309
.PHONY: OpenXR809 build-XR809
277310
# Retry OpenXR809 a few times to account for calibration file issues
278311
RETRY = 3
@@ -466,6 +499,8 @@ clean:
466499
$(MAKE) -C sdk/OpenBK7231N/platforms/bk7231n/bk7231n_os APP_BIN_NAME=$(APP_NAME) USER_SW_VER=$(APP_VERSION) clean
467500
$(MAKE) -C sdk/OpenXR809/src clean
468501
$(MAKE) -C sdk/OpenXR809/project/oxr_sharedApp/gcc clean
502+
$(MAKE) -C sdk/OpenXR806/src clean
503+
$(MAKE) -C sdk/OpenXR806/project/oxr_sharedApp/gcc clean
469504
$(MAKE) -C sdk/OpenXR872/src clean
470505
$(MAKE) -C sdk/OpenXR872/project/demo/hello_demo/gcc clean
471506
$(MAKE) -C sdk/OpenW800 clean

sdk/OpenXR806

Submodule OpenXR806 added at aa812b1

src/hal/xr809/hal_wifi_xr809.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ void HAL_DisconnectFromWifi()
4646
{
4747

4848
}
49+
void HAL_DisableEnhancedFastConnect()
50+
{
51+
52+
}
53+
void HAL_FastConnectToWiFi(const char* oob_ssid, const char* connect_key, obkStaticIP_t* ip)
54+
{
55+
HAL_ConnectToWiFi(oob_ssid, connect_key, ip);
56+
}
4957

5058
int HAL_SetupWiFiOpenAccessPoint(const char *ssid) {
5159
char ap_psk[8] = { 0 };

0 commit comments

Comments
 (0)