diff --git a/.gitmodules b/.gitmodules index 78189fad..12afdfff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "maia-sdr"] path = maia-sdr url = https://github.com/maia-sdr/maia-sdr.git +[submodule "IQEngine"] + path = IQEngine + url = https://github.com/IQEngine/IQEngine diff --git a/IQEngine b/IQEngine new file mode 160000 index 00000000..6bf550db --- /dev/null +++ b/IQEngine @@ -0,0 +1 @@ +Subproject commit 6bf550db25922ad3218e45d2d129081d3bd233a8 diff --git a/Makefile b/Makefile index f35950c6..15d31122 100644 --- a/Makefile +++ b/Makefile @@ -150,9 +150,28 @@ maia-wasm: buildroot/board/$(TARGET)/maia-wasm/pkg buildroot/board/$(TARGET)/mai .PHONY: maia-wasm +### IQEngine client ### +IQEngine/client/build: + cd IQEngine/client && npm ci && npm run build + +.PHONY: IQEngine/client/build + +# IQEngine assets are compressed with xz to save ramfs space +# maia-httpd uncompresses these on the fly for each request. +buildroot/board/$(TARGET)/iqengine: IQEngine/client/build + rm -rf $@ + mkdir $@ + cp $ $(CURDIR)/buildroot/board/$(TARGET)/VERSIONS @$(foreach dir,$(VSUBDIRS),echo $(dir) $(shell cd $(dir) && git describe --abbrev=4 --dirty --always --tags) >> $(CURDIR)/buildroot/board/$(TARGET)/VERSIONS;) make -C buildroot ARCH=arm zynq_$(TARGET)_defconfig @@ -229,6 +248,8 @@ clean: make -C maia-sdr/maia-hdl clean cd maia-sdr/maia-httpd; cargo clean cd maia-sdr/maia-wasm; cargo clean + rm -rf IQEngine/client/build + rm -rf IQEngine/client/node_modules rm -f $(notdir $(wildcard build/*)) rm -rf build/* diff --git a/buildroot b/buildroot index c22d37bd..d6840bf0 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit c22d37bda7f8ca37dabcc13798c88618c76010a3 +Subproject commit d6840bf03f785491608d72fd5a276b65fcad4a35 diff --git a/maia-sdr b/maia-sdr index f0044219..7ddbc80b 160000 --- a/maia-sdr +++ b/maia-sdr @@ -1 +1 @@ -Subproject commit f0044219aba16a8a6ca95aab683b5453af7d864d +Subproject commit 7ddbc80bcef690694a6fce5c49cd48dad9ab017b