Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom global warning #1425

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Custom global warning #1425

wants to merge 6 commits into from
+918 −685

Conversation

piotrva
Copy link
Contributor

@piotrva piotrva commented Jan 13, 2022 •
edited
Loading

Fixes #1276

Summary of changes:

  • Added ability to display custom global warning, that is displayed on startup and each model load
  • The warning has user-defined title and text
  • Added menu entries to enable/disable feature as well as define title
  • Text only to be changed by YAML file edit or using Companion as it is to long to enter by radio GUI

image

Comments:
Together with model notes / checklist it allows to display critical warnings globally and per model.

Notes:

  • All changes were tested only on Radiomaster TX12
  • Tested that opening yaml file without positions for the settings is safe (defaults to this option disabled - backwards compatible)

@raphaelcoeffic raphaelcoeffic added this to the 2.7 milestone Jan 16, 2022
@pfeerick pfeerick mentioned this pull request Jan 27, 2022
Closed
@pfeerick pfeerick modified the milestones: 2.7, 2.8 Mar 28, 2022
@Eldenroot
Copy link
Contributor

Coool!

@Eldenroot
Copy link
Contributor

So there will not be any way how to set it via rx, not companion? Maybe some txt file with text (like note feature) and load it for specified warning? Txt file could be just copied to sd card on pc so no companion needed. I am just asking, this is a really cool idea and feature, I hope it will be merged into 2.8

@piotrva
Copy link
Contributor Author

piotrva commented Aug 26, 2022

@Eldenroot
To keep it flexible and simple simultaneously I decided to:

  • have warning title (short text) with ability to be edited from radio
  • have warning text to be edited from companion / YAML file.

As YAML file is only a specially formatted text file it might be edited without companion with no effort.
In my opinion there is no need to make a mess with another file just to store a line or two of text

@Eldenroot
Copy link
Contributor

@piotrva - OK, sounds good!

@pfeerick pfeerick modified the milestones: 2.8, 2.9 Sep 9, 2022
@HThuren
Copy link
Contributor

HThuren commented Nov 4, 2022

DA translation
add radio/translations/da.h :-)

#define TR_CUSTOM_ALARM_TITLE "Bruger titel"
#define TR_CUSTOM_ALARM "Bruger"

@Eldenroot
Copy link
Contributor

CZ translation
add radio/translations/cz.h

#define TR_CUSTOM_ALARM_TITLE "Vlastní název"
#define TR_CUSTOM_ALARM "Vlastní"

@Eldenroot
Copy link
Contributor

Translators please could you check? :)
@ParkerEde
@Eldenroot - OK
@ulfhedlund
@robustini
@zyren
@ajjjjjjjj
@ToshihiroMakuuchi
@HThuren - OK

@robustini
Copy link
Contributor

IT

#define TR_CUSTOM_ALARM_TITLE "Titolo utente"
#define TR_CUSTOM_ALARM "Utente"

@ajjjjjjjj
Copy link
Contributor

PL

#define TR_CUSTOM_ALARM_TITLE          "Własny tytuł"
#define TR_CUSTOM_ALARM                "Własny"

@zyren
Copy link
Contributor

zyren commented Jan 1, 2023

CN
#define TR_CUSTOM_ALARM_TITLE "自定义标题"
#define TR_CUSTOM_ALARM "自定义"

TW
#define TR_CUSTOM_ALARM_TITLE "自定義標題"
#define TR_CUSTOM_ALARM "自定義"

@ParkerEde
Copy link
Contributor

DE

#define TR_CUSTOM_ALARM_TITLE "Benutzer-Titel"
#define TR_CUSTOM_ALARM "Benutzer"

@ToshihiroMakuuchi
Copy link
Contributor

JP

#define TR_CUSTOM_ALARM_TITLE "カスタムタイトル"
#define TR_CUSTOM_ALARM "カスタム"

@ulfhedlund
Copy link
Contributor

SE

#define TR_CUSTOM_ALARM_TITLE "Anpassad rubrik"
#define TR_CUSTOM_ALARM "Anpassat meddelande"

@pfeerick pfeerick modified the milestones: 2.9, 2.10 Apr 10, 2023
@Eldenroot
Copy link
Contributor

Oh, I see that the milestone is again postponed... :( is there anything what can I do to make it integrated into 2.10?

@gagarinlg
Copy link
Member

Oh, I see that the milestone is again postponed... :( is there anything what can I do to make it integrated into 2.10?

Making a rebase would help a lot

@Eldenroot
Copy link
Contributor

Oh, I see that the milestone is again postponed... :( is there anything what can I do to make it integrated into 2.10?

Making a rebase would help a lot

Above my coding knowledge together with LVGL :( srry

@gagarinlg gagarinlg force-pushed the custom-global-warning branch from e2bde27 to 3e623fd Compare May 7, 2023 19:27
@gagarinlg
Copy link
Member

rebased, but probably not functional right now, at least companion is probably broken

@gagarinlg gagarinlg force-pushed the custom-global-warning branch from 27dea3f to 0096647 Compare May 29, 2023 09:17
ulfhedlund added a commit to ulfhedlund/edgetx that referenced this pull request May 29, 2023
@ulfhedlund
Translation for PR EdgeTX#1425
e195151
@gagarinlg gagarinlg force-pushed the custom-global-warning branch from c520481 to c763592 Compare July 8, 2023 10:53
@raphaelcoeffic raphaelcoeffic marked this pull request as draft August 12, 2023 05:14
@raphaelcoeffic raphaelcoeffic added the needs: rebase A git rebase on top of the latest destination branch version is required label Aug 12, 2023
pfeerick pushed a commit that referenced this pull request Aug 16, 2023
@ulfhedlund
chore(cpn): Updated SE translations (#3878)
2f3c104 
* Translation for PR #1425

* Minor update

* Updates - including theme text translations

* Update se.h

* Proper translations for CZ,DA,DE,FR,HE,IT,JP,PL

Added translations from translators for 8 languages

* Updated translations for new PRs

Updates for new commits c805940, 2b100e0, a2d845d and c4e221f

* New translations added

* Possible minor changes

* First update for 2.10

* One minor change

* One error fixed

* Additional translations up until PR #3726

* Translations up until PR #3726

* Minute change for one string

* Updates for recent PRs

* Updates for new strings

* Minor changes

* Update companion_sv.ts

Minor change in About EdgeTX
@philmoz
Copy link
Collaborator

philmoz commented Nov 1, 2023

Is this still relevant or has the interactive checklist superseded it?

@pfeerick
Copy link
Member

pfeerick commented Nov 1, 2023

This is not directly related to checklists, is a standalone feature so still relevant.

@pfeerick pfeerick modified the milestones: 2.10, 2.11 Dec 12, 2023
@Eldenroot
Copy link
Contributor

Oh, no... again postponed :(

@pfeerick
Copy link
Member

Both this and another PR will be revisited soon once 2.10 is branched off. Just don't have the time or energy to fight with the rebase for them.

@ulfhedlund
Copy link
Contributor

SE translations:
#define TR_NO_NOTES_ON_SD "Inga antecknings-" BREAKSPACE "filer på SD"
#define TR_ASSIGN_NOTES "Ange som anteckningar"
#define TR_NOTES_FILE TR(INDENT "Anteckn.", INDENT "Anteckningsfil")

@HThuren
Copy link
Contributor

HThuren commented May 1, 2024

@ulfhedlund where did that came from, new to translate by all ?

@pfeerick
Copy link
Member

pfeerick commented May 1, 2024

@ulfhedlund where did that came from, new to translate by all ?

I think that was meant for #1441 ... not sure why now though as work on that stalled.

@ulfhedlund
Copy link
Contributor

OK, forget my translation. I realise this is very old and stale :)

@HThuren
Copy link
Contributor

HThuren commented May 4, 2024

OK, forget my translation. I realise this is very old and stale :)

No problem, I just wonder if Danish miss the same translation :-)

pfeerick pushed a commit that referenced this pull request Oct 22, 2024
@piotrva @pfeerick
feat: Custom warnings - squashed #1425
876fb53 
Added proper translations for menu entries for custom warning

Companion support for custom global warning

chore: fix rebase problems

chore: more rebase fixes

fix: merge problems
@Eldenroot
Copy link
Contributor

Guys, please any progress on this one? Thx! :)

@HThuren
Copy link
Contributor

HThuren commented Dec 1, 2024

Files missing DA translation
#define TR_CUSTOM_ALARM_TITLE "Perrsonlig advarsel"
#define TR_CUSTOM_ALARM "Pers. advarsel"

@gagarinlg gagarinlg modified the milestones: 2.11, 3.0 Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
needs: rebase A git rebase on top of the latest destination branch version is required
Projects
None yet
Milestone
3.0
Development

Successfully merging this pull request may close these issues.

Custom warning screens