diff --git a/.cursor/rules/bun-package-manager.mdc b/.cursor/rules/bun-package-manager.mdc index 9034e90..033edcc 100644 --- a/.cursor/rules/bun-package-manager.mdc +++ b/.cursor/rules/bun-package-manager.mdc @@ -14,4 +14,4 @@ This project uses **Bun** (`bun.lock`). Do **not** use `npm install`, `npm run`, If both `package-lock.json` and `bun.lock` appear, **remove `package-lock.json`** and standardize on Bun. -Vendor subprojects under `vendor/` may use their own package manager; do not change those unless the task is explicitly about them. +Sample vendored trees under `samples/projects/` may use their own package manager; do not change those unless the task is explicitly about them. diff --git a/.gitmodules b/.gitmodules index 491d113..6e12ace 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,30 +1,27 @@ -[submodule "vendor/meshcore-flasher"] - path = vendor/meshcore-flasher - url = git@github.com:meshcore-dev/flasher.meshcore.dev.git -[submodule "vendor/meshtastic-firmware"] - path = vendor/meshtastic-firmware +[submodule "samples/projects/meshtastic-firmware"] + path = samples/projects/meshtastic-firmware url = git@github.com:MeshEnvy/firmware.git -[submodule "vendor/meshcore-firmware"] - path = vendor/meshcore-firmware +[submodule "samples/projects/meshcore-firmware"] + path = samples/projects/meshcore-firmware url = git@github.com:MeshEnvy/MeshCore.git -[submodule "vendor/meshtastic-baymesh"] - path = vendor/meshtastic-baymesh +[submodule "samples/projects/meshtastic-baymesh"] + path = samples/projects/meshtastic-baymesh url = git@github.com:RCGV1/firmware-Fork.git -[submodule "vendor/TinyBBS"] - path = vendor/TinyBBS +[submodule "samples/projects/TinyBBS"] + path = samples/projects/TinyBBS url = git@github.com:MeshEnvy/TinyBBS.git -[submodule "vendor/meshtastic-python"] - path = vendor/meshtastic-python +[submodule "samples/reference/meshtastic-python"] + path = samples/reference/meshtastic-python url = git@github.com:MeshEnvy/meshtastic-python.git -[submodule "vendor/meshtastic-web"] - path = vendor/meshtastic-web +[submodule "samples/projects/meshtastic-web"] + path = samples/projects/meshtastic-web url = git@github.com:meshtastic/web.git -[submodule "vendor/microReticulum"] - path = vendor/microReticulum +[submodule "samples/projects/microReticulum"] + path = samples/projects/microReticulum url = git@github.com:Reticulum-Community/microReticulum.git -[submodule "vendor/microReticulum-Firmware"] - path = vendor/microReticulum-Firmware +[submodule "samples/projects/microReticulum-Firmware"] + path = samples/projects/microReticulum-Firmware url = git@github.com:Reticulum-Community/microReticulum_Firmware.git -[submodule "vendor/lotato"] - path = vendor/lotato +[submodule "samples/projects/lotato"] + path = samples/projects/lotato url = git@github.com:MeshEnvy/lotato.git diff --git a/vendor/TinyBBS b/samples/projects/TinyBBS similarity index 100% rename from vendor/TinyBBS rename to samples/projects/TinyBBS diff --git a/vendor/lotato b/samples/projects/lotato similarity index 100% rename from vendor/lotato rename to samples/projects/lotato diff --git a/samples/projects/meshcore-firmware b/samples/projects/meshcore-firmware new file mode 160000 index 0000000..dee3e26 --- /dev/null +++ b/samples/projects/meshcore-firmware @@ -0,0 +1 @@ +Subproject commit dee3e26ac081a5c668c69b66c16a6544a44ddc5b diff --git a/vendor/meshtastic-baymesh b/samples/projects/meshtastic-baymesh similarity index 100% rename from vendor/meshtastic-baymesh rename to samples/projects/meshtastic-baymesh diff --git a/vendor/meshtastic-firmware b/samples/projects/meshtastic-firmware similarity index 100% rename from vendor/meshtastic-firmware rename to samples/projects/meshtastic-firmware diff --git a/vendor/meshtastic-web b/samples/projects/meshtastic-web similarity index 100% rename from vendor/meshtastic-web rename to samples/projects/meshtastic-web diff --git a/vendor/microReticulum b/samples/projects/microReticulum similarity index 100% rename from vendor/microReticulum rename to samples/projects/microReticulum diff --git a/vendor/microReticulum-Firmware b/samples/projects/microReticulum-Firmware similarity index 100% rename from vendor/microReticulum-Firmware rename to samples/projects/microReticulum-Firmware diff --git a/vendor/meshtastic-python b/samples/reference/meshtastic-python similarity index 100% rename from vendor/meshtastic-python rename to samples/reference/meshtastic-python diff --git a/scripts/ci/common/download-meshtastic-ota.sh b/scripts/ci/common/download-meshtastic-ota.sh index 573c7d3..083e6d7 100755 --- a/scripts/ci/common/download-meshtastic-ota.sh +++ b/scripts/ci/common/download-meshtastic-ota.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Download BLE/unified OTA companion image into PlatformIO BUILD_DIR when Meshtastic *.mt.json is present. -# No-op for non-Meshtastic builds (no mt.json). Mirrors vendor/meshtastic-firmware/.github/workflows/build_firmware.yml. +# No-op for non-Meshtastic builds (no mt.json). Mirrors samples/projects/meshtastic-firmware/.github/workflows/build_firmware.yml. set -euo pipefail BUILD_DIR="${1:?usage: download-meshtastic-ota.sh BUILD_DIR}" diff --git a/scripts/ci/test/fw-pio-smoke-envs.json b/scripts/ci/test/fw-pio-smoke-envs.json index cced378..67198e0 100644 --- a/scripts/ci/test/fw-pio-smoke-envs.json +++ b/scripts/ci/test/fw-pio-smoke-envs.json @@ -2,22 +2,22 @@ "description": "PlatformIO environment names for Heltec WiFi LoRa 32 V3 and RAK WisBlock 4631, per vendored tree. Names taken from PIO UnknownEnvNamesError listings (pio run -e __invalid__).", "projects": [ { - "path": "vendor/microReticulum-Firmware", + "path": "samples/projects/microReticulum-Firmware", "heltec_v3": "heltec_wifi_lora_32_V3", "rak_4631": "wiscore_rak4631" }, { - "path": "vendor/meshtastic-firmware", + "path": "samples/projects/meshtastic-firmware", "heltec_v3": "heltec-v3", "rak_4631": "rak4631" }, { - "path": "vendor/meshtastic-baymesh", + "path": "samples/projects/meshtastic-baymesh", "heltec_v3": "heltec-v3", "rak_4631": "rak4631" }, { - "path": "vendor/meshcore-firmware", + "path": "samples/projects/meshcore-firmware", "heltec_v3": "Heltec_v3_companion_radio_ble", "rak_4631": "RAK_4631_companion_radio_ble" } diff --git a/src/index.css b/src/index.css index 01b7802..80ed334 100644 --- a/src/index.css +++ b/src/index.css @@ -1,4 +1,4 @@ -/* Disable auto scan of the whole repo root — `vendor/` alone is ~100k+ files and stalls the Oxide scanner. */ +/* Disable auto scan of the whole repo root — `samples/projects/` vendored trees are huge and stall the Oxide scanner. */ @import "tailwindcss" source(none); @plugin "@tailwindcss/typography"; diff --git a/vendor/meshcore-firmware b/vendor/meshcore-firmware deleted file mode 160000 index bfd4800..0000000 --- a/vendor/meshcore-firmware +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bfd4800f5985049be1cbb8785d129e7680b89771