diff --git a/README.md b/README.md index b95814b..c9dbce8 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ The VTX Administrator widget (`ExpressLRS VTX Admin`) is a shortcut for editing | Radio type | Firmware | ExpressLRS | |------------|----------|------------| -| Black & white LCD | EdgeTX 2.11.6+, 2.12.1+, or 3.0+ | v3.5.4+ | -| Color LCD | EdgeTX 2.11.6+, 2.12.1+, or 3.0+ | v3.5.4+ | +| Black & white LCD | EdgeTX 2.12.1+ or 3.0+ | v3.5.4+ | +| Color LCD | EdgeTX 2.12.1+ or 3.0+ | v3.5.4+ | The bind phrase manager additionally requires **ExpressLRS 4.1+** diff --git a/docs/development.md b/docs/development.md index eb0b0f2..50e9333 100644 --- a/docs/development.md +++ b/docs/development.md @@ -96,7 +96,7 @@ The tools build on the shared `SCRIPTS/ELRS/` library, which the widgets use too | `SCRIPTS/ELRS/ui/lcd/dialogs.lua` | BW full-screen dialogs (MIDSIZE title, body lines, optional bottom action labels), redrawn every frame: `draw` plus the version gate and the missing-module notice. Loaded by both tools' BW UIs | | `SCRIPTS/ELRS/ui/lvgl/dialogs.lua` | Color-LCD dialogs: `showConfirm`/`showMessage` over the firmware popups, plus the version gate and the missing-module notice a tool raises before it has a page. Those two are terminal, so each takes the caller's `onExit` for the close box and the Exit button. Loaded by both tools' LVGL UIs; the widgets' full-screen pages reuse `noModuleChecklist` | | `SCRIPTS/ELRS/loader.lua` | The tools' GC-guarded script loader: a full collection before each `loadScript` keeps fresh-install compile peaks from stacking. The one part consumers bootstrap with a bare `loadScript` | -| `SCRIPTS/ELRS/edgetx_version.lua` | The one home of the minimum EdgeTX requirement (2.11.6 / 2.12.1 / 3.0). Each tool's `main.lua` checks it once and hands `deps.versionOk` and the `REQUIRED_VERSIONS` dialog lines (`deps.requiredVersions`) to its UI chunk, whose `preCheck` owns the presentation. Keep `min_edgetx_version` in `edgetx.yml` in step | +| `SCRIPTS/ELRS/edgetx_version.lua` | The one home of the minimum EdgeTX requirement (2.12.1 / 3.0). Each tool's `main.lua` checks it once and hands `deps.versionOk` and the `REQUIRED_VERSIONS` dialog lines (`deps.requiredVersions`) to its UI chunk, whose `preCheck` owns the presentation. Keep `min_edgetx_version` in `edgetx.yml` in step | | `SCRIPTS/ELRS/sensors.lua` | Generic EdgeTX telemetry reader (`getSensorValue` with a cached name-to-ID lookup), not CRSF-specific. Loaded by `crsf.lua`, which exposes it to every consumer as `crsf.getSensorValue`. A cached ID addresses a slot in the model that was loaded when it was resolved, so a consumer that survives a model change must call `crsf.resetSensorCache()` on that edge | | `SCRIPTS/ELRS/file_storage.lua` | Generic key=value file persistence (`read`/`write`), schema-free. Loaded by the VTX Admin widget and the bind tool | | `SCRIPTS/ELRS/shim.lua` | `table.concat` polyfill for BW radios | diff --git a/edgetx.yml b/edgetx.yml index 0420184..53fc8a5 100644 --- a/edgetx.yml +++ b/edgetx.yml @@ -24,7 +24,7 @@ package: - telemetry license: GPL-3.0-only source_dir: src - min_edgetx_version: "2.11.6" + min_edgetx_version: "2.12.1" libraries: - name: ELRS diff --git a/src/SCRIPTS/ELRS/edgetx_version.lua b/src/SCRIPTS/ELRS/edgetx_version.lua index d7fddce..a54a93a 100644 --- a/src/SCRIPTS/ELRS/edgetx_version.lua +++ b/src/SCRIPTS/ELRS/edgetx_version.lua @@ -5,7 +5,6 @@ -- Keep in step with isSupported local REQUIRED_VERSIONS = { - "- 2.11.6 or later", "- 2.12.1 or later", "- 3.0 or later", } @@ -17,8 +16,6 @@ local function isSupported() return true elseif maj == 2 and minor == 12 and rev >= 1 then return true - elseif maj == 2 and minor == 11 and rev >= 6 then - return true end return false diff --git a/src/SCRIPTS/TOOLS/ExpressLRS/main.lua b/src/SCRIPTS/TOOLS/ExpressLRS/main.lua index 93795cf..06d6ca7 100644 --- a/src/SCRIPTS/TOOLS/ExpressLRS/main.lua +++ b/src/SCRIPTS/TOOLS/ExpressLRS/main.lua @@ -5,7 +5,7 @@ ---- # # ---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html # ---- # # ----- # Unified tool for BW and color LCD radios (EdgeTX 2.11.6+/2.12.1+) # +---- # Unified tool for BW and color LCD radios (EdgeTX 2.12.1+) # ---- ######################################################################### local useLvgl = (lvgl ~= nil)