diff --git a/CMakePresets.json b/CMakePresets.json index 9a8e4caa..8dc7ca5a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -147,16 +147,6 @@ "TARGET": "f4hwn.fusion" } }, - { - "name": "Transfer", - "inherits": "Fusion", - "cacheVariables": { - "ENABLE_AIRCOPY": true, - "ENABLE_FEAT_F4HWN_BEAM": true, - "EDITION_STRING": "Transfer", - "TARGET": "f4hwn.transfer" - } - }, { "name": "Field", "inherits": "Fusion", @@ -168,7 +158,17 @@ } }, { - "name": "Extended", + "name": "Transfer", + "inherits": "Fusion", + "cacheVariables": { + "ENABLE_AIRCOPY": true, + "ENABLE_FEAT_F4HWN_BEAM": true, + "EDITION_STRING": "Transfer", + "TARGET": "f4hwn.transfer" + } + }, + { + "name": "Max", "inherits": "Fusion", "cacheVariables": { "ENABLE_AIRCOPY": true, @@ -176,8 +176,8 @@ "ENABLE_FEAT_F4HWN_RESCUE_OPS": true, "ENABLE_FEAT_F4HWN_BEAM": true, "ENABLE_FEAT_F4HWN_FOXHUNT": true, - "EDITION_STRING": "Extended", - "TARGET": "f4hwn.extended" + "EDITION_STRING": "Max", + "TARGET": "f4hwn.max" } } ], @@ -199,8 +199,8 @@ "configurePreset": "Field" }, { - "name": "Extended", - "configurePreset": "Extended" + "name": "Max", + "configurePreset": "Max" } ] } diff --git a/README.md b/README.md index 5847bb1f..bff5194e 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,6 @@ for everyday use and is the base inherited by the specialized editions. It inclu - broadcast FM radio and VOX, - [UV Studio](https://armel.github.io/uvstudio/) with integrated K5Viewer screen mirroring, screenshots and remote keyboard control, - advanced RX audio profiles and Audio Scope, -- the Breakout game, - automatic RX/TX activity logging with RF Log, - multiboot support. @@ -74,7 +73,9 @@ Specialized presets extend Fusion for specific uses: - **Transfer** adds AirCopy and BEAM wireless channel transfer. - **Field** adds first-responder controls, Fox Hunt and Morse Beacon support. -- **Extended** combines the Transfer and Field feature sets without claiming to include every optional feature. +- **Max** packs the broadest practical selection of features that fits safely within + the radio's Flash and RAM limits. It is not a strict superset of every other edition: + features may be exchanged between releases to preserve stability and memory headroom. - **Custom** remains a manually configured build based directly on the hidden technical default. ### Radio and signal handling @@ -359,8 +360,8 @@ The default preset is **Fusion**. Available presets are: - **Fusion** - **Transfer** - **Field** -- **Extended** -- **All** (Fusion, Transfer, Field and Extended) +- **Max** +- **All** (Fusion, Transfer, Field and Max) Examples: @@ -369,7 +370,7 @@ Examples: ./compile-with-docker.sh Fusion ./compile-with-docker.sh Transfer ./compile-with-docker.sh Field -./compile-with-docker.sh Extended +./compile-with-docker.sh Max ./compile-with-docker.sh All ``` @@ -381,8 +382,8 @@ These are forwarded directly to `cmake --preset` inside the container. Examples: ```bash -./compile-with-docker.sh Fusion -DENABLE_SPECTRUM=ON -./compile-with-docker.sh Fusion -DENABLE_FEAT_F4HWN_GAME=ON -DENABLE_NOAA=ON +./compile-with-docker.sh Field -DENABLE_VOX=OFF +./compile-with-docker.sh Fusion -DENABLE_FEAT_F4HWN_GAME=ON ./compile-with-docker.sh Fusion -DSQL_TONE=600 ``` diff --git a/compile-with-docker.sh b/compile-with-docker.sh index dde93b12..c1cacc9e 100755 --- a/compile-with-docker.sh +++ b/compile-with-docker.sh @@ -7,15 +7,16 @@ set -euo pipefail # Examples: # ./compile-with-docker.sh Fusion # ./compile-with-docker.sh Transfer -# ./compile-with-docker.sh Field -DENABLE_NOAA=ON -# ./compile-with-docker.sh Custom -DENABLE_SPECTRUM=ON +# ./compile-with-docker.sh Field +# ./compile-with-docker.sh Max # ./compile-with-docker.sh Fusion -DDEV=ON +# ./compile-with-docker.sh Field -DENABLE_VOX=OFF # ./compile-with-docker.sh All # Default preset: "Fusion" # --------------------------------------------- IMAGE=uvk1-uvk5v3 -RELEASE_PRESETS=(Fusion Transfer Field Extended) +RELEASE_PRESETS=(Fusion Transfer Field Max) FLASH_LIMIT=$((118 * 1024)) RAM_LIMIT=$((16 * 1024)) @@ -28,9 +29,9 @@ EXTRA_ARGS=("$@") # --------------------------------------------- # Validate preset name # --------------------------------------------- -if [[ ! "$PRESET" =~ ^(Custom|Fusion|Transfer|Field|Extended|All)$ ]]; then +if [[ ! "$PRESET" =~ ^(Custom|Fusion|Transfer|Field|Max|All)$ ]]; then echo "❌ Unknown preset: '$PRESET'" - echo "Valid presets are: Custom, Fusion, Transfer, Field, Extended, All" + echo "Valid presets are: Custom, Fusion, Transfer, Field, Max, All" exit 1 fi