Skip to content

fix(v12): shutdown icon sometimes doesn’t appear when using the two-button shutdown method - #7474

Merged
pfeerick merged 1 commit into
EdgeTX:hrs-v12-2.12from
helloradiosky:hrs-v12-2.12-1
Jul 14, 2026
Merged

fix(v12): shutdown icon sometimes doesn’t appear when using the two-button shutdown method#7474
pfeerick merged 1 commit into
EdgeTX:hrs-v12-2.12from
helloradiosky:hrs-v12-2.12-1

Conversation

@helloradiosky

Copy link
Copy Markdown
Contributor

Fixes #
Solves the issue where the shutdown icon doesn’t appear when using the two-button shutdown method

@coderabbitai

coderabbitai Bot commented Jun 20, 2026

Copy link
Copy Markdown

Important

Review skipped

Too many files!

This PR contains 299 files, which is 149 over the limit of 150.

To get a review, narrow the scope:
• coderabbit review --type committed # exclude uncommitted changes
• coderabbit review --dir # limit to a subdirectory
• coderabbit review --base # compare against a closer base

Upgrade to a paid plan to raise the limit.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 06936af8-d4da-4a45-bc3d-5ec0d3b6fed2

📥 Commits

Reviewing files that changed from the base of the PR and between d67604f and 3496f68.

⛔ Files ignored due to path filters (1)
  • companion/src/images/layouts/mask_layout1x6.png is excluded by !**/*.png
📒 Files selected for processing (299)
  • .devcontainer/devcontainer.json
  • .github/ISSUE_TEMPLATE/bug-report.yml
  • .github/workflows/build_fw.yml
  • .github/workflows/companion.yml
  • .github/workflows/linux_cpn.yml
  • .github/workflows/macosx_cpn.yml
  • .github/workflows/nightly.yml
  • .github/workflows/release-drafter.yml
  • .github/workflows/sync_repos.yml
  • .github/workflows/validate_fw_json.yml
  • .github/workflows/win_cpn-32.yml
  • .github/workflows/win_cpn-64.yml
  • .gitignore
  • .gitpod.yml
  • CMakeLists.txt
  • README.md
  • cliff.toml
  • cmake/FetchImgui.cmake
  • cmake/Macros.cmake
  • companion/.ci-trigger
  • companion/src/apppreferencesdialog.cpp
  • companion/src/apppreferencesdialog.h
  • companion/src/apppreferencesdialog.ui
  • companion/src/companion.qrc
  • companion/src/constants.h
  • companion/src/firmwares/boardjson.cpp
  • companion/src/firmwares/boards.cpp
  • companion/src/firmwares/boards.h
  • companion/src/firmwares/customfunctiondata.cpp
  • companion/src/firmwares/customisation_data.cpp
  • companion/src/firmwares/customisation_data.h
  • companion/src/firmwares/edgetx/yaml_generalsettings.cpp
  • companion/src/firmwares/edgetx/yaml_modeldata.cpp
  • companion/src/firmwares/edgetx/yaml_moduledata.cpp
  • companion/src/firmwares/edgetx/yaml_ops.h
  • companion/src/firmwares/edgetx/yaml_screendata.h
  • companion/src/firmwares/eeprominterface.h
  • companion/src/firmwares/generalsettings.cpp
  • companion/src/firmwares/generalsettings.h
  • companion/src/firmwares/gvardata.cpp
  • companion/src/firmwares/modeldata.cpp
  • companion/src/firmwares/modeldata.h
  • companion/src/firmwares/moduledata.cpp
  • companion/src/firmwares/moduledata.h
  • companion/src/firmwares/opentx/opentxinterface.cpp
  • companion/src/firmwares/radiodata.cpp
  • companion/src/firmwares/radiodata.h
  • companion/src/firmwares/rawsource.cpp
  • companion/src/firmwares/rawsource.h
  • companion/src/flash/flashfirmwaredialog.cpp
  • companion/src/generaledit/generaledit.cpp
  • companion/src/generaledit/generaledit.h
  • companion/src/generaledit/generaledit.ui
  • companion/src/generaledit/generalkeyshortcuts.cpp
  • companion/src/generaledit/generalsetup.cpp
  • companion/src/generaledit/generalsetup.h
  • companion/src/generaledit/generalsetup.ui
  • companion/src/generaledit/hardware.cpp
  • companion/src/helpers.cpp
  • companion/src/helpers.h
  • companion/src/logsdialog.cpp
  • companion/src/logsdialog.h
  • companion/src/logsdialog.ui
  • companion/src/mainwindow.cpp
  • companion/src/mdichild.cpp
  • companion/src/mdichild.h
  • companion/src/modeledit/colorcustomscreens.cpp
  • companion/src/modeledit/customfunctions.cpp
  • companion/src/modeledit/customfunctions.h
  • companion/src/modeledit/gvars.cpp
  • companion/src/modeledit/logicalswitches.cpp
  • companion/src/modeledit/logicalswitches.h
  • companion/src/modeledit/modeledit.cpp
  • companion/src/modeledit/setup_function_switches.cpp
  • companion/src/modeledit/setup_module.cpp
  • companion/src/modeledit/setup_module.h
  • companion/src/modeledit/setup_module.ui
  • companion/src/modelslist.cpp
  • companion/src/modelslist.h
  • companion/src/print/modelprinter.cpp
  • companion/src/shared/CMakeLists.txt
  • companion/src/shared/semanticversion.cpp
  • companion/src/shared/semanticversion.h
  • companion/src/simulation/simulatorwidget.cpp
  • companion/src/simulation/telemetryprovidercrossfire.ui
  • companion/src/simulation/telemetryproviderfrsky.ui
  • companion/src/simulation/telemetryproviderfrskyhub.ui
  • companion/src/simulation/telemetrysimu.ui
  • companion/src/simulation/widgets/buttonswidget.h
  • companion/src/simulation/widgets/lcdwidget.cpp
  • companion/src/storage/appdata.cpp
  • companion/src/storage/appdata.h
  • companion/src/storage/yaml.cpp
  • companion/src/translations/companion_cs.ts
  • companion/src/translations/companion_da.ts
  • companion/src/translations/companion_de.ts
  • companion/src/translations/companion_en.ts
  • companion/src/translations/companion_es.ts
  • companion/src/translations/companion_fi.ts
  • companion/src/translations/companion_fr.ts
  • companion/src/translations/companion_he.ts
  • companion/src/translations/companion_it.ts
  • companion/src/translations/companion_ja.ts
  • companion/src/translations/companion_ko.ts
  • companion/src/translations/companion_nl.ts
  • companion/src/translations/companion_pl.ts
  • companion/src/translations/companion_pt.ts
  • companion/src/translations/companion_ru.ts
  • companion/src/translations/companion_sv.ts
  • companion/src/translations/companion_zh_CN.ts
  • companion/src/translations/companion_zh_TW.ts
  • companion/src/updates/CMakeLists.txt
  • companion/src/updates/reporeleases.cpp
  • companion/src/updates/updateexpresslrs.cpp
  • companion/src/updates/updateexpresslrs.h
  • companion/src/updates/updatefactories.cpp
  • companion/src/updates/updateinterface.cpp
  • companion/src/updates/updateinterface.h
  • companion/src/updates/updatenetwork.cpp
  • companion/targets/linux/companion.desktop.in
  • companion/targets/windows/companion.nsi.in
  • fw.json
  • radio/src/CMakeLists.txt
  • radio/src/MultiProtoDefs.h
  • radio/src/MultiSubtypeDefs.h
  • radio/src/audio.cpp
  • radio/src/audio.h
  • radio/src/boards/generic_stm32/CMakeLists.txt
  • radio/src/boards/generic_stm32/analog_inputs.cpp
  • radio/src/boards/generic_stm32/bl_keys.cpp
  • radio/src/boards/generic_stm32/i2c_bus.cpp
  • radio/src/boards/generic_stm32/inputs.cpp
  • radio/src/boards/generic_stm32/led_driver.cpp
  • radio/src/boards/generic_stm32/linker/stm32h750_sdram/bootloader/layout.ld
  • radio/src/boards/generic_stm32/linker/stm32h750_sdram/layout.ld
  • radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/bootloader/layout.ld
  • radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld
  • radio/src/boards/generic_stm32/module_ports.cpp
  • radio/src/boards/generic_stm32/rgb_6pos.cpp
  • radio/src/boards/generic_stm32/rgb_leds.cpp
  • radio/src/boards/generic_stm32/rgb_leds.h
  • radio/src/boards/helloradio-h750/backlight_driver.cpp
  • radio/src/boards/helloradio-h750/board.cpp
  • radio/src/boards/helloradio-h750/board.h
  • radio/src/boards/helloradio-h750/extflash_driver.cpp
  • radio/src/boards/helloradio-h750/extflash_driver.h
  • radio/src/boards/helloradio-h750/haptic_driver.cpp
  • radio/src/boards/helloradio-h750/key_driver.cpp
  • radio/src/boards/helloradio-h750/lcd_driver.cpp
  • radio/src/boards/helloradio-h750/lcd_driver.h
  • radio/src/boards/helloradio-h750/sdram_driver.cpp
  • radio/src/boards/helloradio-h750/system_clock.c
  • radio/src/boards/helloradio-h750/system_clock.h
  • radio/src/boards/helloradio-h750/touch_driver.cpp
  • radio/src/boards/helloradio-h750/touch_driver.h
  • radio/src/boards/helloradio-h750/usb_charger_driver.cpp
  • radio/src/boards/jumper-h750/board.cpp
  • radio/src/boards/rm-h750/audio_driver.cpp
  • radio/src/boards/rm-h750/backlight_driver.cpp
  • radio/src/boards/rm-h750/board.cpp
  • radio/src/boards/rm-h750/board.h
  • radio/src/boards/rm-h750/bsp_io.cpp
  • radio/src/boards/rm-h750/lcd_driver_800.cpp
  • radio/src/boards/rm-h750/lcd_driver_800.h
  • radio/src/boards/rm-h750/led_driver.cpp
  • radio/src/boards/rm-h750/luminosity_sensor.cpp
  • radio/src/boards/rm-h750/luminosity_sensor.h
  • radio/src/boards/rm-h750/pdm_software_driver.cpp
  • radio/src/boards/rm-h750/pdm_software_driver.h
  • radio/src/boards/rm-h750/sdram_driver.cpp
  • radio/src/boards/rm-h750/system_clock.c
  • radio/src/bootloader/boot.cpp
  • radio/src/bootloader/boot_menu.cpp
  • radio/src/bootloader/boot_uf2.cpp
  • radio/src/cfn_sort.cpp
  • radio/src/cli.cpp
  • radio/src/dataconstants.h
  • radio/src/datastructs.h
  • radio/src/datastructs_model.cpp
  • radio/src/datastructs_private.h
  • radio/src/datastructs_radio.cpp
  • radio/src/definitions.h
  • radio/src/drivers/icm42607C.cpp
  • radio/src/drivers/icm42607C.h
  • radio/src/drivers/icm42627.cpp
  • radio/src/drivers/icm42627.h
  • radio/src/drivers/imu_filter.cpp
  • radio/src/drivers/lsm6ds.cpp
  • radio/src/drivers/lsm6ds.h
  • radio/src/drivers/sc7u22.cpp
  • radio/src/drivers/sc7u22.h
  • radio/src/drivers/tas2505.cpp
  • radio/src/drivers/uf2_ghostfat.cpp
  • radio/src/drivers/uf2_ghostfat.h
  • radio/src/edgetx.cpp
  • radio/src/edgetx.h
  • radio/src/fonts/lvgl/lrg/lv_font_cn_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_cn_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_cn_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_cn_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_cn_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_cn_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_bold_LXL.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_en_bold_XXL.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_he_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_jp_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_jp_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_jp_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_jp_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_jp_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_ko_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_ru_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_ru_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ru_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ru_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_ru_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_tw_bold_XL.c
  • radio/src/fonts/lvgl/lrg/lv_font_ua_L.c
  • radio/src/fonts/lvgl/lrg/lv_font_ua_XS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ua_XXS.c
  • radio/src/fonts/lvgl/lrg/lv_font_ua_bold_STD.c
  • radio/src/fonts/lvgl/lrg/lv_font_ua_bold_XL.c
  • radio/src/fonts/lvgl/lz4_font.cpp
  • radio/src/fonts/lvgl/make_fonts.sh
  • radio/src/fonts/lvgl/sml/lv_font_cn_L.c
  • radio/src/fonts/lvgl/sml/lv_font_cn_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_cn_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_cn_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_cn_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_cn_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_en_L.c
  • radio/src/fonts/lvgl/sml/lv_font_en_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_en_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_en_bold_LXL.c
  • radio/src/fonts/lvgl/sml/lv_font_en_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_en_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_en_bold_XXL.c
  • radio/src/fonts/lvgl/sml/lv_font_he_L.c
  • radio/src/fonts/lvgl/sml/lv_font_he_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_he_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_he_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_he_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_he_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_jp_L.c
  • radio/src/fonts/lvgl/sml/lv_font_jp_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_jp_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_jp_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_jp_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_L.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_ko_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_ru_L.c
  • radio/src/fonts/lvgl/sml/lv_font_ru_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_ru_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_ru_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_ru_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_L.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_tw_bold_XL.c
  • radio/src/fonts/lvgl/sml/lv_font_ua_L.c
  • radio/src/fonts/lvgl/sml/lv_font_ua_XS.c
  • radio/src/fonts/lvgl/sml/lv_font_ua_XXS.c
  • radio/src/fonts/lvgl/sml/lv_font_ua_bold_STD.c
  • radio/src/fonts/lvgl/sml/lv_font_ua_bold_XL.c
  • radio/src/fonts/lvgl/std/lv_font_cn_L.c
  • radio/src/fonts/lvgl/std/lv_font_cn_STD.c
  • radio/src/fonts/lvgl/std/lv_font_cn_XS.c
  • radio/src/fonts/lvgl/std/lv_font_cn_XXS.c
  • radio/src/fonts/lvgl/std/lv_font_cn_bold_STD.c
  • radio/src/fonts/lvgl/std/lv_font_cn_bold_XL.c
  • radio/src/fonts/lvgl/std/lv_font_en_L.c
  • radio/src/fonts/lvgl/std/lv_font_en_XS.c
  • radio/src/fonts/lvgl/std/lv_font_en_XXS.c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@Johanl1964

Copy link
Copy Markdown

Good, but don't forget to fix it so that the V14 LCD is also included in the ETX Buddy with the current FW!! Of all the ETX transmitters on the market, there are only 2 that don't have FW in the Buddy, the V14 LCD and the Commando 14.... Sorry, but I'm getting tired of not having access to the current FW for my V14 LCD!!

@helloradiosky

Copy link
Copy Markdown
Contributor Author

Good, but don't forget to fix it so that the V14 LCD is also included in the ETX Buddy with the current FW!! Of all the ETX transmitters on the market, there are only 2 that don't have FW in the Buddy, the V14 LCD and the Commando 14.... Sorry, but I'm getting tired of not having access to the current FW for my V14 LCD!!

Sorry, I’ll submit an LCD hardware PR as soon as possible. The only difference between LCD and OLED is one single display driver command.

@helloradiosky

Copy link
Copy Markdown
Contributor Author

Good, but don't forget to fix it so that the V14 LCD is also included in the ETX Buddy with the current FW!! Of all the ETX transmitters on the market, there are only 2 that don't have FW in the Buddy, the V14 LCD and the Commando 14.... Sorry, but I'm getting tired of not having access to the current FW for my V14 LCD!!

@Johanl1964 I’ve created the V14LCD target and am awaiting approval.

@pfeerick
pfeerick changed the base branch from main to 2.12 June 21, 2026 09:57
@pfeerick
pfeerick changed the base branch from 2.12 to hrs-v12-2.12 June 21, 2026 09:58
@pfeerick pfeerick changed the title Fixes # Solves the issue where the shutdown icon doesn’t appear when using the two-button shutdown method Summary of changes: fix(v12): shutdown icon doesn’t appear when using the two-button shutdown method Jul 13, 2026
@pfeerick pfeerick changed the title fix(v12): shutdown icon doesn’t appear when using the two-button shutdown method fix(v12): shutdown icon sometimes doesn’t appear when using the two-button shutdown method Jul 14, 2026
@pfeerick pfeerick added the bug 🪲 Something isn't working label Jul 14, 2026
@pfeerick
pfeerick merged commit c93f04b into EdgeTX:hrs-v12-2.12 Jul 14, 2026
1 check passed
pfeerick pushed a commit that referenced this pull request Jul 15, 2026
pfeerick pushed a commit that referenced this pull request Jul 16, 2026
pfeerick pushed a commit that referenced this pull request Jul 16, 2026
pfeerick pushed a commit that referenced this pull request Jul 16, 2026
pfeerick pushed a commit that referenced this pull request Jul 19, 2026
pfeerick pushed a commit that referenced this pull request Jul 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug 🪲 Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants