Add gsmenu

.github/workflows/build.yml

@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Build
         run: |
@@ -56,7 +58,7 @@ jobs:
           rm -r /boot/* #save space
           apt-get update
           apt clean
-          apt-get install -y cmake g++ git pkg-config librockchip-mpp-dev libcairo-dev libdrm-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libspdlog-dev nlohmann-json3-dev libmsgpack-dev
+          apt-get install -y cmake g++ git pkg-config librockchip-mpp-dev libcairo-dev libdrm-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libspdlog-dev nlohmann-json3-dev libmsgpack-dev libgpiod-dev libyaml-cpp-dev
           apt clean
 
           cmake -B build
@@ -69,7 +71,7 @@ jobs:
           EOL
 
           chmod 755 build.sh run.sh
-          sudo cp -r build.sh run.sh CMakeLists.txt pixelpilot_config.h.in src $output/home
+          sudo cp -r build.sh run.sh CMakeLists.txt pixelpilot_config.h.in src lvgl lv_conf.h $output/home
           sudo rm $output/etc/resolv.conf
           echo nameserver 1.1.1.1 | sudo tee -a $output/etc/resolv.conf
           sudo chroot $output /home/build.sh

.gitignore

@@ -60,3 +60,4 @@ pixelpilot_config.h
 
 .vscode/
 build/
+build_sim/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lvgl"]
+	path = lvgl
+	url = https://github.com/lvgl/lvgl.git

CMakeLists.txt

@@ -1,15 +1,107 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(pixelpilot VERSION 1.2.0)
+find_package(PkgConfig REQUIRED)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# LVGL setup
+set(LV_USE_LINUX_DRM ON)
+set(LV_CONF_BUILD_DISABLE_DEMOS 1)
+set(LV_CONF_BUILD_DISABLE_EXAMPLES 1)
+add_subdirectory(lvgl)
+target_include_directories(lvgl PUBLIC 
+    ${PROJECT_SOURCE_DIR}
+    /usr/include/libdrm
+    /usr/include/drm
+)
+set(CMAKE_C_STANDARD 99) # LVGL officially supports C99 and above
+set(CMAKE_CXX_STANDARD 17) #C17
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Simulator
+set(SIMULATOR_SOURCES
+        src/simulator.c
+        src/gsmenu/executor.h
+        src/gsmenu/executor.c
+        src/gsmenu/air_presets.h
+        src/gsmenu/air_presets.c
+        src/gsmenu/air_telemetry.h
+        src/gsmenu/air_telemetry.c
+        src/gsmenu/air_camera.h
+        src/gsmenu/air_camera.c
+        src/gsmenu/air_actions.h
+        src/gsmenu/air_actions.c
+        src/gsmenu/gs_wifi.h
+        src/gsmenu/gs_wifi.c
+        src/gsmenu/ui.h
+        src/gsmenu/helper.h
+        src/gsmenu/helper.c
+        src/gsmenu/gs_main.c
+        src/gsmenu/gs_main.h
+        src/gsmenu/gs_wfbng.h
+        src/gsmenu/gs_wfbng.c
+        src/gsmenu/gs_system.h
+        src/gsmenu/gs_system.c
+        src/gsmenu/gs_actions.h
+        src/gsmenu/gs_actions.c        
+        src/gsmenu/air_wfbng.h
+        src/gsmenu/air_wfbng.c
+        src/gsmenu/ui.c
+        src/gsmenu/images.h
+        src/gsmenu/images.c
+        src/gsmenu/styles.h
+        src/gsmenu/styles.c
+        src/lvosd.h
+        src/lvosd.c
+        src/menu.h
+        src/menu.c
+        src/input.h
+        src/input.cpp
+)
+# LVGL setup
+
 add_compile_options("-Wno-address-of-packed-member")
 
 set(SOURCE_FILES 
         src/drm.h
         src/drm.c
+        src/gsmenu/executor.h
+        src/gsmenu/executor.c
+        src/gsmenu/air_presets.h
+        src/gsmenu/air_presets.c
+        src/gsmenu/air_telemetry.c
+        src/gsmenu/air_camera.h
+        src/gsmenu/air_camera.c
+        src/gsmenu/air_actions.h
+        src/gsmenu/air_actions.c
+        src/gsmenu/gs_wifi.h
+        src/gsmenu/gs_wifi.c
+        src/gsmenu/ui.h
+        src/gsmenu/helper.h
+        src/gsmenu/helper.c
+        src/gsmenu/gs_main.c
+        src/gsmenu/gs_main.h
+        src/gsmenu/gs_wfbng.h
+        src/gsmenu/gs_wfbng.c
+        src/gsmenu/gs_system.h
+        src/gsmenu/gs_system.c
+        src/gsmenu/air_wfbng.h
+        src/gsmenu/air_wfbng.c
+        src/gsmenu/gs_actions.h
+        src/gsmenu/gs_actions.c        
+        src/gsmenu/images.h
+        src/gsmenu/images.c        
+        src/gsmenu/styles.h
+        src/gsmenu/styles.c
+        src/gsmenu/ui.c 
+        src/lvosd.h
+        src/lvosd.c
+        src/menu.h
+        src/menu.c
+        src/input.h
+        src/input.cpp
         src/osd.h
         src/osd.hpp
         src/osd.cpp
@@ -31,21 +123,32 @@ include_directories("/usr/include/libdrm" "/usr/include/cairo" "/usr/include/spd
 
 configure_file("${PROJECT_NAME}_config.h.in" "${PROJECT_NAME}_config.h")
 
-find_package(spdlog REQUIRED)
-find_package(nlohmann_json 3 REQUIRED)
+# Option to control wmenu simulator build
+option(USE_SIMULATOR "Build the simulator version of the application" OFF)
 
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-target_link_libraries(${PROJECT_NAME} rockchip_mpp pthread drm m cairo spdlog::spdlog nlohmann_json::nlohmann_json rt)
-
-# Embed gstreamer
-find_package(PkgConfig REQUIRED)
-pkg_search_module(GST REQUIRED
-        gstreamer-1.0>=1.4
-        gstreamer-app-1.0>=1.4
-)
-pkg_search_module(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0>=1.4)
-pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
-target_link_libraries(${PROJECT_NAME} PkgConfig::gstreamer PkgConfig::gstreamer-app)
+if(USE_SIMULATOR)
+  add_definitions(-DUSE_SIMULATOR)
+  target_compile_definitions(lvgl PRIVATE USE_SIMULATOR)
+  pkg_check_modules(LIBSDL REQUIRED sdl2)
+  add_executable(${PROJECT_NAME} ${SIMULATOR_SOURCES} lvgl)
+  target_link_libraries(${PROJECT_NAME} lvgl ${LIBSDL_LIBRARIES})
+else()
+  find_package(spdlog REQUIRED)
+  find_package(nlohmann_json 3 REQUIRED)
+  find_package(yaml-cpp REQUIRED)
+  pkg_check_modules(LIBGPIOD REQUIRED libgpiod)
+  add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+  target_link_libraries(${PROJECT_NAME} rockchip_mpp pthread drm m cairo spdlog::spdlog nlohmann_json::nlohmann_json yaml-cpp rt lvgl ${LIBGPIOD_LIBRARIES})
+  # Embed gstreamer
+  find_package(PkgConfig REQUIRED)
+  pkg_search_module(GST REQUIRED
+          gstreamer-1.0>=1.4
+          gstreamer-app-1.0>=1.4
+  )
+  pkg_search_module(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0>=1.4)
+  pkg_search_module(gstreamer-app REQUIRED IMPORTED_TARGET gstreamer-app-1.0>=1.4)
+  target_link_libraries(${PROJECT_NAME} PkgConfig::gstreamer PkgConfig::gstreamer-app)  
+endif()
 
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
   add_compile_definitions(SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)

README.md

@@ -22,7 +22,7 @@ Build on the Rockchip linux system directly.
 - drm, cairo, mpp, logging, json, msgpack
 
 ```
-sudo apt install libdrm-dev libcairo-dev librockchip-mpp-dev libspdlog-dev nlohmann-json3-dev libmsgpack-dev
+sudo apt install libdrm-dev libcairo-dev librockchip-mpp-dev libspdlog-dev nlohmann-json3-dev libmsgpack-dev libgpiod-dev
 ```
 
 - gstreamer
@@ -178,6 +178,23 @@ Specific widgets expect quite concrete facts as input:
 * `GPSWidget` - displays GPS fix type (no fix / 2D fix / 3D fix etc) and GPS coordinates.
   Uses `mavlink.gps_raw.fix_type`, `mavlink.gps_raw.lat` and `mavlink.gps_raw.lon` facts
 
+## Menu
+
+The menu provides options to modify air and ground settings.
+Navigation is controlled via a GPIO button, adhering to Ruby wiring conventions.
+PixelPilot_rk will take ownership of the needed gpios.
+The provided gsmenu.sh script needs
+  - https://github.com/openipc/yaml-cli/
+  - https://github.com/mikefarah/yq/
+  - drm_info:  `sudo apt install drm-info`
+
+### Navigation
+Up/Down – Cycles through menu items (wraps around at the top and bottom of the page/sections).
+Left/Right/Ok (Back/Menu/QA1 in Ruby terms) – Adjusts selected values.
+Ok becomes Rec/QA1 when menu is not shown.
+
+When not in menu any navigation key will open the menu.
+
 ## Known issues
 
 1. Video is cropped when the fpv feed resolution is bigger than the screen mode.