Merge branch 'main' into webui

Author: SumolX

.github/workflows/build_and_release.yml …b/workflows/build_and_release_boxpro.yml.github/workflows/build_and_release.yml renamed to .github/workflows/build_and_release_boxpro.yml .github/workflows/build_and_release.yml renamed to .github/workflows/build_and_release_boxpro.yml

@@ -1,4 +1,4 @@
-name: Build Firmware
+name: Build BoxPro Firmware
 
 on: [push, pull_request]
 
@@ -14,27 +14,27 @@ jobs:
       - name: Build Firmware
         run: |
           bash setup.sh
-          make -C build
+          make -C build_boxpro
 
       - name: Get Firmware Name
         id: vars
-        run: echo "firmware_name=$(basename out/*bin)" >> $GITHUB_ENV
+        run: echo "firmware_name=$(basename build_boxpro/out/*bin)" >> $GITHUB_ENV
 
       - name: Upload Firmware Package
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.firmware_name }}
-          path: out/${{ env.firmware_name }}
+          path: build_boxpro/out/${{ env.firmware_name }}
 
       - name: Upload Firmware Binary
         uses: actions/upload-artifact@v4
         with:
           name: HDZGOGGLE
-          path: out/HDZGOGGLE
+          path: build_boxpro/out/HDZGOGGLE
 
       - name: Create Release
         uses: softprops/action-gh-release@v0.1.15
         if: startsWith(github.ref, 'refs/tags/v')
         with:
-          files: out/${{ env.firmware_name }}
+          files: build_boxpro/out/${{ env.firmware_name }}
           draft: true

.github/workflows/build_and_release_goggle.yml

@@ -0,0 +1,40 @@
+name: Build Google Firmware
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Build Firmware
+        run: |
+          bash setup.sh
+          make -C build_goggle
+
+      - name: Get Firmware Name
+        id: vars
+        run: echo "firmware_name=$(basename build_goggle/out/*bin)" >> $GITHUB_ENV
+
+      - name: Upload Firmware Package
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.firmware_name }}
+          path: build_goggle/out/${{ env.firmware_name }}
+
+      - name: Upload Firmware Binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: HDZGOGGLE
+          path: build_goggle/out/HDZGOGGLE
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v0.1.15
+        if: startsWith(github.ref, 'refs/tags/v')
+        with:
+          files: build_goggle/out/${{ env.firmware_name }}
+          draft: true

.gitignore

@@ -1,5 +1,7 @@
 /build
 /build_emu
+build_goggle
+build_boxpro
 linux-4.9
 /media
 toolchain

.vscode/settings.json

@@ -1,18 +1,19 @@
 {
     "editor.formatOnSave": true,
     "files.associations": {
-        "ui_main_menu.h": "c",
-        "typeindex": "c",
-        "typeinfo": "c",
-        "page_wifi.h": "c",
-        "record_definitions.h": "c",
-        "sdcard.h": "c",
-        "system.h": "c",
-        "page_storage.h": "c",
-        "chrono": "c",
         "self_test.h": "c",
+        "hardware.h": "c",
+        "rtc6715.h": "c",
+        "random": "cpp",
+        "common.hh": "c",
+        "ui_statusbar.h": "c",
         "page_common.h": "c",
-        "stdatomic.h": "c",
-        "common.hh": "c"
+        "settings.h": "c",
+        "page_headtracker.h": "c",
+        "page_imagesettings.h": "c",
+        "page_record.h": "c",
+        "typeindex": "c",
+        "typeinfo": "c",
+        "targets.h": "c"
     }
 }

CMakeLists.txt

@@ -11,6 +11,17 @@ if(NOT EMULATOR_BUILD)
 	set(COMMON_COMPILER_FLAGS "${COMMON_COMPILER_FLAGS} -mfpu=neon -mfloat-abi=hard")
 endif()
 
+option(HDZ_GOGGLE "Target Goggles" OFF)
+if (HDZ_GOGGLE)
+	set(COMMON_COMPILER_FLAGS "${COMMON_COMPILER_FLAGS} -DHDZGOGGLE=1")
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/mkapp/app/platform "HDZGOGGLE")
+endif()
+
+option(HDZ_BOXPRO "Target BoxPRO" OFF)
+if (HDZ_BOXPRO)
+	set(COMMON_COMPILER_FLAGS "${COMMON_COMPILER_FLAGS} -DHDZBOXPRO=1")
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/mkapp/app/platform "HDZBOXPRO")
+endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_COMPILER_FLAGS}")
@@ -21,8 +32,8 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_C_FLAGS_RELEASE "-Werror -O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-Werror -O3 -DNDEBUG")
 
-set(OS_APP_PATH ${PROJECT_SOURCE_DIR}/mkapp/app/app)
-set(RECORD_APP_PATH ${PROJECT_SOURCE_DIR}/mkapp/app/app/record)
+set(OS_APP_PATH ${CMAKE_CURRENT_BINARY_DIR}/mkapp/app/app)
+set(RECORD_APP_PATH ${CMAKE_CURRENT_BINARY_DIR}/mkapp/app/app/record)
 
 # common build settings
 set(STANDARD_LIBRARIES
@@ -40,6 +51,7 @@ add_definitions(
 	-D_GNU_SOURCE 
 	-DUSE_LOG_LIB_GLOG
 )
+
 if(EMULATOR_BUILD)
 	add_definitions(
 		-DEMULATOR_BUILD
@@ -52,26 +64,31 @@ add_subdirectory(lib/minIni)
 add_subdirectory(lib/log)
 add_subdirectory(lib/esp-loader)
 add_subdirectory(lib/softwinner)
+
 if(EMULATOR_BUILD)
 	find_package(SDL2 REQUIRED)
 else()
 	add_subdirectory(lib/ffmpeg)
 	add_subdirectory(lib/live)
 endif()
 
-
 # main application
 file(GLOB SRC_FILES_CORE   "src/core/*.c" "src/core/*.h")
 file(GLOB SRC_FILES_DRIVER "src/driver/*.c" "src/driver/*.h")
 file(GLOB SRC_FILES_FONTS  "src/fonts/*.c" "src/fonts/*.h")
-file(GLOB SRC_FILES_IMAGE  "src/image/*.c" "src/image/*.h")
 file(GLOB SRC_FILES_UI   "src/ui/*.c" "src/ui/*.h")
 file(GLOB SRC_FILES_BMI   "src/bmi270/*.c" "src/bmi270/*.h")
 file(GLOB SRC_FILES_UTIL "src/util/*.c" "src/util/*.h")
 file(GLOB SRC_FILES_PLAYER "src/player/*.c" "src/player/*.h")
 file(GLOB SRC_FILES_EMULATOR "src/emulator/*.c" "src/emulator/*.h")
 file(GLOB SRC_FILES_LANG "src/lang/*.c" "src/lang/*.h")
 
+if(HDZ_GOGGLE)
+	file(GLOB SRC_FILES_IMAGE  "src/image/goggle/*.c" "src/image/goggle/*.h")
+elseif(HDZ_BOXPRO)
+	file(GLOB SRC_FILES_IMAGE  "src/image/boxpro/*.c" "src/image/boxpro/*.h")
+endif()
+
 set(SRC_FILES
 	${SRC_FILES_CORE}
 	${SRC_FILES_DRIVER}
@@ -82,11 +99,13 @@ set(SRC_FILES
 	${SRC_FILES_UTIL}
 	${SRC_FILES_LANG}
 )
+
 if(EMULATOR_BUILD)
 	list(APPEND SRC_FILES ${SRC_FILES_EMULATOR})
 else()
 	list(APPEND SRC_FILES ${SRC_FILES_PLAYER})
 endif()
+
 add_executable(${PROJECT_NAME} ${SRC_FILES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE 
@@ -109,13 +128,14 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
 	esp-loader
 	softwinner
 )
+
 if(EMULATOR_BUILD)
 	target_link_libraries(${PROJECT_NAME} PRIVATE ${SDL2_LIBRARIES})
 endif()
 
 if(NOT EMULATOR_BUILD)
 	# record application
-	file(GLOB SRC_FILES_RECORD   "src/record/*.c" "src/record/*.h")
+	file(GLOB SRC_FILES_RECORD "src/record/*.c" "src/record/*.h")
 
 	add_executable(record
 		${SRC_FILES_RECORD}
@@ -166,20 +186,23 @@ if(NOT EMULATOR_BUILD)
 	)
 
 	# image build
+	add_custom_target(MKAPP ALL
+		COMMAND rsync -r ${PROJECT_SOURCE_DIR}/mkapp ${CMAKE_CURRENT_BINARY_DIR}/
+	)
 	add_custom_command(
-		OUTPUT ${PROJECT_SOURCE_DIR}/out/${PROJECT_NAME}
+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/out/${PROJECT_NAME}
 		COMMAND size -A ${PROJECT_NAME}
-		COMMAND mkdir -p ${PROJECT_SOURCE_DIR}/out/
-		COMMAND cp ${PROJECT_NAME} ${PROJECT_SOURCE_DIR}/out/
-		COMMAND cp record ${PROJECT_SOURCE_DIR}/out/
-		COMMAND cp rtspLive ${PROJECT_SOURCE_DIR}/out/
+		COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/out/
+		COMMAND cp ${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/out/
+		COMMAND cp record ${CMAKE_CURRENT_BINARY_DIR}/out/
+		COMMAND cp rtspLive ${CMAKE_CURRENT_BINARY_DIR}/out/
 		COMMAND cp ${PROJECT_NAME} ${OS_APP_PATH}
 		COMMAND cp record ${RECORD_APP_PATH}
 		COMMAND cp rtspLive ${RECORD_APP_PATH}
-		COMMAND cd ${PROJECT_SOURCE_DIR} && ./mkapp/mkapp_ota.sh
-		DEPENDS ${PROJECT_NAME} record rtspLive
+		COMMAND cd ${CMAKE_CURRENT_BINARY_DIR} && ./mkapp/mkapp_ota.sh
+		DEPENDS MKAPP ${PROJECT_NAME} record rtspLive
 	)
 	add_custom_target(${PROJECT_NAME}-OTA ALL
-		DEPENDS ${PROJECT_SOURCE_DIR}/out/${PROJECT_NAME}
+		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/out/${PROJECT_NAME}
 	)
 endif()

README.md

@@ -1,4 +1,4 @@
-# HDZero Goggle Firmware
+# HDZero Goggle/BoxPro Firmware
 
 ## Environment Setup
 
@@ -21,17 +21,27 @@ A bash script is supplied to take care of the bootstrap process:
 ~/hdzero-goggle$ ./setup.sh
 ```
 
-## Building the Firmware
+## Building Firmware
 
 In either of the above scenarios the firmware can be built via make.
 An appropiate vscode build task ships with this repository as well.
 
+Compiling HDZero Goggles:
 ```
-~/hdzero-goggle$ cd build
-~/hdzero-goggle/build$ make clean all -j $(nproc)
+~/hdzero-goggle$ cd build_goggle
+~/hdzero-goggle/build_goggle$ make clean all -j $(nproc)
 ```
 
-The firmware is generated as hdzero-goggle/out/HDZERO_GOGGLE-x.x.x.bin
+The firmware is generated as hdzero-goggle/build_goggle/out/HDZERO_GOGGLE-x.x.x.bin
+Where x.x.x is the OTA_VER.RX_VER.VA_VER
+
+Compiling HDZero BoxPro:
+```
+~/hdzero-goggle$ cd build_boxpro
+~/hdzero-goggle/build_boxpro$ make clean all -j $(nproc)
+```
+
+The firmware is generated as hdzero-goggle/build_boxpro/out/HDZERO_BOXPRO-x.x.x.bin
 Where x.x.x is the OTA_VER.RX_VER.VA_VER
 
 ### Building the firmware using nix
@@ -91,10 +101,12 @@ sudo apt-get install build-essential libsdl2-dev
 
 ### Build and Run
 
+Emulator support for both Goggle and BoxPro is supported by setting the appropriate compilation switches.
+
 ```
 ~/hdzero-goggle$ mkdir build_emu
 ~/hdzero-goggle$ cd build_emu
-~/hdzero-goggle/build_emu$ cmake .. -DEMULATOR_BUILD=ON -DCMAKE_BUILD_TYPE=Debug
+~/hdzero-goggle/build_emu$ cmake .. -DEMULATOR_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DHDZ_GOGGLE=ON -DHDZ_BOXPRO=OFF
 ~/hdzero-goggle/build_emu$ make -j $(nproc)
 ~/hdzero-goggle/build_emu$ ./HDZGOGGLE
 ```

conf/targets.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    TARGET_UNKNOWN = 0,
+    TARGET_GOGGLE,
+    TARGET_BOXPRO,
+} TARGET_TYPES;
+
+#if HDZGOGGLE
+
+#define TARGET_DPI_DEFAULT  130
+#define TARGET_FONT_DEFAULT &lv_font_montserrat_26
+
+static inline TARGET_TYPES getTargetType() { return TARGET_GOGGLE; }
+
+#elif HDZBOXPRO
+
+#define TARGET_DPI_DEFAULT  70
+#define TARGET_FONT_DEFAULT &lv_font_montserrat_16
+
+static inline TARGET_TYPES getTargetType() { return TARGET_BOXPRO; }
+
+#else
+
+#error "Platform not defined"
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif