From 52a56f6eb2ce4fd8c0286604509704f4baaed42b Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Fri, 31 Oct 2025 22:04:05 +0100 Subject: [PATCH] Add new preset: Fusion --- CMakePresets.json | 26 ++++++++++++++++++++++---- compile-with-docker.sh | 6 +++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c836396c..99689be6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -95,7 +95,6 @@ "ENABLE_FEAT_F4HWN_GAME": false, "ENABLE_FEAT_F4HWN_PMR": true, "ENABLE_FEAT_F4HWN_GMRS_FRS_MURS": true, - "ENABLE_NOAA": false, "ENABLE_FEAT_F4HWN_RESCUE_OPS": false, "EDITION_STRING": "Bandscope", "TARGET": "f4hwn.bandscope" @@ -113,7 +112,6 @@ "ENABLE_FEAT_F4HWN_GAME": false, "ENABLE_FEAT_F4HWN_PMR": true, "ENABLE_FEAT_F4HWN_GMRS_FRS_MURS": true, - "ENABLE_NOAA": false, "ENABLE_FEAT_F4HWN_RESCUE_OPS": false, "EDITION_STRING": "Broadcast", "TARGET": "f4hwn.broadcast" @@ -132,7 +130,6 @@ "ENABLE_FEAT_F4HWN_SPECTRUM": false, "ENABLE_FEAT_F4HWN_PMR": true, "ENABLE_FEAT_F4HWN_GMRS_FRS_MURS": true, - "ENABLE_NOAA": false, "ENABLE_AUDIO_BAR": false, "ENABLE_FEAT_F4HWN_RESUME_STATE": false, "ENABLE_FEAT_F4HWN_CHARGING_C": false, @@ -174,11 +171,28 @@ "ENABLE_FEAT_F4HWN_GAME": true, "ENABLE_FEAT_F4HWN_PMR": true, "ENABLE_FEAT_F4HWN_GMRS_FRS_MURS": true, - "ENABLE_NOAA": false, "ENABLE_FEAT_F4HWN_RESCUE_OPS": false, "EDITION_STRING": "Game", "TARGET": "f4hwn.game" } + }, + { + "name": "Fusion", + "inherits": "default", + "cacheVariables": { + "ENABLE_SPECTRUM": true, + "ENABLE_FMRADIO": true, + "ENABLE_VOX": true, + "ENABLE_AIRCOPY": true, + "ENABLE_FEAT_F4HWN_SCREENSHOT": true, + "ENABLE_FEAT_F4HWN_GAME": true, + "ENABLE_FEAT_F4HWN_PMR": true, + "ENABLE_FEAT_F4HWN_GMRS_FRS_MURS": true, + "ENABLE_FEAT_F4HWN_RESCUE_OPS": true, + "ENABLE_SWD": true, + "EDITION_STRING": "Fusion", + "TARGET": "f4hwn.fusion" + } } ], "buildPresets": [ @@ -205,6 +219,10 @@ { "name": "Game", "configurePreset": "Game" + }, + { + "name": "Fusion", + "configurePreset": "Fusion" } ] } \ No newline at end of file diff --git a/compile-with-docker.sh b/compile-with-docker.sh index 3a6d0eef..eff26ccb 100755 --- a/compile-with-docker.sh +++ b/compile-with-docker.sh @@ -22,9 +22,9 @@ EXTRA_ARGS=("$@") # --------------------------------------------- # Validate preset name # --------------------------------------------- -if [[ ! "$PRESET" =~ ^(Custom|Bandscope|Broadcast|Basic|RescueOps|Game|All)$ ]]; then +if [[ ! "$PRESET" =~ ^(Custom|Bandscope|Broadcast|Basic|RescueOps|Game|Fusion|All)$ ]]; then echo "❌ Unknown preset: '$PRESET'" - echo "Valid presets are: Custom, Bandscope, Broadcast, Basic, RescueOps, Game, All" + echo "Valid presets are: Custom, Bandscope, Broadcast, Basic, RescueOps, Game, Fusion, All" exit 1 fi @@ -57,7 +57,7 @@ build_preset() { # Handle 'All' preset # --------------------------------------------- if [[ "$PRESET" == "All" ]]; then - PRESETS=(Bandscope Broadcast Basic RescueOps Game) + PRESETS=(Bandscope Broadcast Basic RescueOps Game Fusion) for p in "${PRESETS[@]}"; do build_preset "$p" done