Merge branch 'main' into develop

This commit is contained in:
Ben Allfree
2026-04-23 13:30:43 -07:00
24 changed files with 27 additions and 72 deletions
+1 -1
View File
@@ -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.
+18 -45
View File
@@ -1,54 +1,27 @@
[submodule "vendor/mpm"]
path = vendor/mpm
url = git@github.com:MeshEnvy/mpm.git
[submodule "vendor/lobbs"]
path = vendor/lobbs
url = git@github.com:MeshEnvy/lobbs.git
[submodule "vendor/lodb"]
path = vendor/lodb
url = git@github.com:MeshEnvy/lodb.git
[submodule "vendor/meshscript"]
path = vendor/meshscript
url = git@github.com:MeshEnvy/meshscript.git
[submodule "vendor/meshcore-flasher"]
path = vendor/meshcore-flasher
url = git@github.com:meshcore-dev/flasher.meshcore.dev.git
[submodule "vendor/lofs"]
path = vendor/lofs
url = git@github.com:MeshEnvy/lofs.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/meshcore-lotato"]
path = vendor/meshcore-lotato
url = git@github.com:MeshEnvy/MeshCore-lotato.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/lobbs-meshtastic-firmware"]
path = vendor/lobbs-meshtastic-firmware
url = git@github.com:benallfree/lobbs-meshtstic-firmware.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/potato-mesh"]
path = vendor/potato-mesh
url = git@github.com:l5yth/potato-mesh.git
[submodule "vendor/lotato"]
path = vendor/lotato
[submodule "samples/projects/lotato"]
path = samples/projects/lotato
url = git@github.com:MeshEnvy/lotato.git
+1 -1
View File
@@ -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}"
+4 -14
View File
@@ -2,34 +2,24 @@
"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/lobbs-meshtastic-firmware",
"path": "samples/projects/meshtastic-baymesh",
"heltec_v3": "heltec-v3",
"rak_4631": "rak4631"
},
{
"path": "vendor/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"
},
{
"path": "vendor/meshcore-lotato",
"heltec_v3": "Heltec_v3_repeater",
"rak_4631": "RAK_4631_repeater"
}
]
}
+1 -1
View File
@@ -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";
-1
Submodule vendor/lobbs deleted from ea1e8a19ab
Vendored
-1
Submodule vendor/lodb deleted from 927530ff77
Vendored
-1
Submodule vendor/lofs deleted from 5a065a90e2
-1
Submodule vendor/lotato deleted from e2a83c3661
Submodule vendor/meshscript deleted from ecd4331e66
Vendored
-1
Submodule vendor/mpm deleted from 6b79828eca
Submodule vendor/potato-mesh deleted from f866cf8837