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.

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

Rephrase more errors and warnings #15315

Merged
merged 3 commits into from
Jul 13, 2020
Merged

Conversation

MaEtUgR
Copy link
Member

@MaEtUgR MaEtUgR commented Jul 13, 2020

Describe problem solved by this pull request
Porting @DanielePettenuzzo 's changes, credit goes to him.

Describe your solution
More error rephrasing. These are the ones done in this pr:

  • change kill switch from error to info when the vehicle is not flying
  • "Data link lost" --> "Connection to ground station lost"
  • "Onboard controller lost" --> "Connection to mission computer lost"
  • "Failsafe enabled: no RC" --> "Failsafe enabled: Manual control stick input unavailable"

Additional context
EDIT: just found a related non-conflicting pr changing some messageing: #14377

@MaEtUgR MaEtUgR added the UI / UX ✨ User Interface / experience improvements label Jul 13, 2020
@MaEtUgR MaEtUgR self-assigned this Jul 13, 2020
Copy link
Member

@bresch bresch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with the rephrasing, but this adds quite a few chars. Could we save the strings "Manual kill-switch" and "engaged", "disengaged" in variables to re-use them after? Also. isn't "Kill-switch engaged" enough? I'm not sure if the "manual" is really useful here. If "manual" is really required, we should rename _manual_control_setpoint.kill_switch...

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Jul 13, 2020

I saved 53 unecessary chars and fixed the build with adaption to #14848.
@bresch what do you think? The messages "engaged" and "disengaged" could be saved in parts but the assembly takes more code... I don't consider it worth it. I imagined something along constexpr char[] KILL_SWITCH = "Kill-switch"; and on the stack

char output[50];
snprintf(output, 50, "", "%s %s", KILL_SWITCH, ENGAGED);

@dagar dagar requested a review from bresch July 13, 2020 13:56
@Antiheavy
Copy link
Contributor

Nice improvements!

@dagar dagar merged commit 40883a0 into master Jul 13, 2020
@dagar dagar deleted the pr-fix-more-errors-and-warnings branch July 13, 2020 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI / UX ✨ User Interface / experience improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants