From 3a60851a9e8ce52a4d612bc56e0f0d2bc376c0f4 Mon Sep 17 00:00:00 2001 From: Devsur11 <156891301+Devsur11@users.noreply.github.com> Date: Sat, 9 May 2026 13:21:49 +0200 Subject: [PATCH 1/2] Submodules update and readme changes --- .gitmodules | 4 ++-- README.md | 4 ++-- apps/nc2000 | 2 +- emulator | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 041f829..a15e00f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "emulator"] path = emulator - url = git@github.com:eggfly/M5CardputerZero-Emulator.git + url = https://github.com/eggfly/M5CardputerZero-Emulator branch = main [submodule "apps/nc2000"] path = apps/nc2000 - url = git@github.com:eggfly/CardputerZero-NC2000.git + url = https://github.com/eggfly/CardputerZero-NC2000 branch = ci-cd diff --git a/README.md b/README.md index e4ef123..d61099c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ cargo run -p czdev --release -- run apps/applaunch/ ### Hello CardputerZero (Example App) ```bash -cargo run -p czdev --release -- run examples/key_echo +cargo run -p czdev --release -- run examples/hello_cz ``` ![Hello Example](docs/emu-hello.png) @@ -59,7 +59,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ### 2. Clone with submodules ```bash -git clone --recursive git@github.com:m5stack/CardputerZero-AppBuilder.git +git clone --recursive https://github.com/m5stack/CardputerZero-AppBuilder cd CardputerZero-AppBuilder ``` diff --git a/apps/nc2000 b/apps/nc2000 index e79f18a..4ce1aad 160000 --- a/apps/nc2000 +++ b/apps/nc2000 @@ -1 +1 @@ -Subproject commit e79f18a3caa03ad60a0233da93b6d442f0791452 +Subproject commit 4ce1aadaad45dfd8b1fb3d1877e327a3331e62cf diff --git a/emulator b/emulator index ee05edf..442875a 160000 --- a/emulator +++ b/emulator @@ -1 +1 @@ -Subproject commit ee05edf5d3aca6ec9af7b22b17ffe0c483b3bd52 +Subproject commit 442875ae232e039e37a7acb996acc2c626b4ca5d From 7961ba8d25513a63bb846e39fa9bf25a80201bab Mon Sep 17 00:00:00 2001 From: Devsur11 <156891301+Devsur11@users.noreply.github.com> Date: Sat, 9 May 2026 13:44:00 +0200 Subject: [PATCH 2/2] Readme changes and MD standarization --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d61099c..6ee5268 100644 --- a/README.md +++ b/README.md @@ -39,19 +39,28 @@ Get a 320x170 LVGL app running on your Mac or Linux machine in ~3 minutes — no ### 1. Prerequisites **macOS:** + ```bash brew install cmake pkg-config sdl2 sdl2_image sdl2_mixer freetype ``` **Linux (Debian/Ubuntu):** + ```bash sudo apt install -y build-essential cmake pkg-config \ - libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libfreetype-dev + libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libfreetype-dev libinput-dev +``` + +**Linux (Fedora/Red hat):** + +```bash +sudo dnf install -y @development-libs @development-tools && sudo dnf install -y cmake pkgconf-pkg-config SDL2-devel SDL2_image-devel SDL2_mixer-devel freetype-devel libinput-devel ``` **Windows:** MSYS2 MINGW64 shell. See [DESKTOP_DEV.md §4](docs/DESKTOP_DEV.md#4-windows-lvgl--emulator--known-issues-and-plan) for Windows-specific notes. You also need a recent Rust toolchain (for `czdev`): + ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ``` @@ -64,6 +73,7 @@ cd CardputerZero-AppBuilder ``` If you already cloned without `--recursive`: + ```bash git submodule update --init --recursive ``` @@ -83,6 +93,7 @@ cargo run -p czdev --release -- run examples/hello_cz ``` On first run this will: + 1. Build the emulator (once, cached in `emulator/build/`). 2. Build the app into `.czdev/build/`. 3. Stage the resulting shared library into the emulator's `apps/` directory. @@ -202,7 +213,7 @@ ssh pi@ "sudo dpkg -i /tmp/_arm64.deb" The CI pipeline runs on x86_64 and **cross-compiles** to ARM64 (aarch64) using the `aarch64-linux-gnu-` toolchain — the same approach used by the [M5Stack_Linux_Libs](https://github.com/m5stack/M5Stack_Linux_Libs) SDK. -``` +```text User Input (repo URL) │ ▼ @@ -220,7 +231,7 @@ User Input (repo URL) Generated packages follow the [APPLaunch packaging conventions](https://github.com/dianjixz/M5CardputerZero-UserDemo/blob/main/doc/APPLaunch-App-%E6%89%93%E5%8C%85%E6%8C%87%E5%8D%97.md): -``` +```text .deb ├── DEBIAN/ │ ├── control