From 344bb041cde960342aacfb25b3af17a825061c91 Mon Sep 17 00:00:00 2001 From: Kevin Schlosser Date: Thu, 12 Dec 2024 10:17:21 -0700 Subject: [PATCH 1/5] Removed submodule lvgl --- .gitmodules | 3 --- lib/lvgl | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/lvgl diff --git a/.gitmodules b/.gitmodules index fbb35d41..925713ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "lib/micropython"] path = lib/micropython url = https://github.com/micropython/micropython -[submodule "lib/lvgl"] - path = lib/lvgl - url = https://github.com/lvgl/lvgl [submodule "lib/esp-idf"] path = lib/esp-idf url = https://github.com/espressif/esp-idf diff --git a/lib/lvgl b/lib/lvgl deleted file mode 160000 index e1c0b21b..00000000 --- a/lib/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e1c0b21b2723d391b885de4b2ee5cc997eccca91 From 47bbe1d4c0fddf06a6c11e178c52ff35feaaa3bb Mon Sep 17 00:00:00 2001 From: Kevin Schlosser Date: Thu, 12 Dec 2024 10:20:10 -0700 Subject: [PATCH 2/5] Added submodule lvgl --- .gitmodules | 3 +++ lib/lvgl | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/lvgl diff --git a/.gitmodules b/.gitmodules index 925713ee..7bf07c58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "lib/esp-idf"] path = lib/esp-idf url = https://github.com/espressif/esp-idf +[submodule "lib/lvgl"] + path = lib/lvgl + url = https://github.com/lvgl/lvgl diff --git a/lib/lvgl b/lib/lvgl new file mode 160000 index 00000000..7f07a129 --- /dev/null +++ b/lib/lvgl @@ -0,0 +1 @@ +Subproject commit 7f07a129e8d77f4984fff8e623fd5be18ff42e74 From 3c722b88af61b565a9250a92cf85a89253540fa4 Mon Sep 17 00:00:00 2001 From: Kevin Schlosser Date: Thu, 12 Dec 2024 10:25:38 -0700 Subject: [PATCH 3/5] Let's see if this fixes the latest build error. --- gen/python_api_gen_mpy.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gen/python_api_gen_mpy.py b/gen/python_api_gen_mpy.py index 634ee8d8..47384e3d 100644 --- a/gen/python_api_gen_mpy.py +++ b/gen/python_api_gen_mpy.py @@ -7,6 +7,8 @@ # - Implement inheritance instead of embed base methods (how? seems it's not supported, see https://github.com/micropython/micropython/issues/1159) # - When converting mp to ptr (and vice versa), verify that types are compatible. Now all pointers are casted to void*. +from __future__ import print_function + import collections import copy import functools From 563297096795a5ff7f36b15113b3c92ba0c8e270 Mon Sep 17 00:00:00 2001 From: Kevin Schlosser Date: Thu, 12 Dec 2024 10:47:46 -0700 Subject: [PATCH 4/5] adds doxygen as a build requirement. --- .github/workflows/macOS.yml | 1 + .github/workflows/unix.yml | 2 +- gen/python_api_gen_mpy.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index ca3308ed..c067dddc 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -22,6 +22,7 @@ jobs: run: | brew install --force ninja brew install --force sdl2 + brew install --force doxygen git submodule update --init -- lib/pycparser git submodule update --init --jobs 4 -- lib/micropython git submodule update --init --jobs 4 -- lib/lvgl diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index ae514034..e1e9e6f2 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -24,7 +24,7 @@ jobs: - name: Install Deps run: | - sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev ccache + sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev doxygen ccache git submodule update --init -- lib/pycparser git submodule update --init --jobs 4 -- lib/micropython git submodule update --init --jobs 4 -- lib/lvgl diff --git a/gen/python_api_gen_mpy.py b/gen/python_api_gen_mpy.py index 47384e3d..ca9a4e94 100644 --- a/gen/python_api_gen_mpy.py +++ b/gen/python_api_gen_mpy.py @@ -7,7 +7,6 @@ # - Implement inheritance instead of embed base methods (how? seems it's not supported, see https://github.com/micropython/micropython/issues/1159) # - When converting mp to ptr (and vice versa), verify that types are compatible. Now all pointers are casted to void*. -from __future__ import print_function import collections import copy From a4ee6dffce72f54aa1dd7b732524ab9dc4cebe76 Mon Sep 17 00:00:00 2001 From: Kevin Schlosser Date: Thu, 12 Dec 2024 10:53:05 -0700 Subject: [PATCH 5/5] updates README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index d22ebaf6..f57469ed 100644 --- a/README.md +++ b/README.md @@ -164,12 +164,14 @@ To compile you will need Python >= 3.10 for for all build types. * ninja-build * python * libusb-1.0-0-dev + * doxygen * macOS * `xcode-select -–install` * `brew install cmake` * `brew install ninja` * `brew install python` + * `brew install doxygen` #### Compiling for RP2: @@ -181,6 +183,7 @@ To compile you will need Python >= 3.10 for for all build types. * python * gcc-arm-none-eabi * libnewlib-arm-none-eabi + * doxygen * macOS * `command xcode-select–install` @@ -189,6 +192,7 @@ To compile you will need Python >= 3.10 for for all build types. * `brew install ninja` * `brew install python` * `brew install armmbed/formulae/arm-none-eabi-gcc` + * `brew install doxygen` * Windows * Not yet supported @@ -202,6 +206,7 @@ To compile you will need Python >= 3.10 for for all build types. * build-essential * ninja-build * python + * doxygen * macOS * `command xcode-select–install` @@ -209,6 +214,7 @@ To compile you will need Python >= 3.10 for for all build types. * `brew install ninja` * `brew install python` * `brew install armmbed/formulae/arm-none-eabi-gcc` + * `brew install doxygen` * Windows * Not yet supported @@ -249,6 +255,7 @@ To compile you will need Python >= 3.10 for for all build types. * libpipewire-0.3-dev * libwayland-dev * libdecor-0-dev + * doxygen #### Compiling for macOS: @@ -258,6 +265,7 @@ To compile you will need Python >= 3.10 for for all build types. * `brew install ninja` * `brew install make` * `brew install SDL2` + * `brew install doxygen` #### Compiling for Windows: