feat: add support for ExpressLRS optional arming method #5641

mha1 · 2024-10-25T10:15:28Z

This PR adds support for ExpressLRS/ExpressLRS#3008

Changes:

adds UI to select Arming mode Switch and to set a switch (logical, physical or any other suitable source)
sends requested arming state in extended CRSF message 0x16 in arming mode Switch

For more details please refer to ExpressLRS PR #3008

…ing (legacy) and SF Arm arming (new)

… version that allows SF ARM

…ing. If SF Arm is not defined system will use ch5 logic for arming.

…and arming command message. This ensures the arming status is sent periodically and at the same rate as channel 5.

…annels packet adds extra byte to the RC channels message in arming mode Function: - frame len 24 -> arming mode Channel: module will use channel 5 - frame len 25 -> arming mode Function: send commanded armed status in extra byte after channel data

ulfhedlund · 2024-10-29T16:33:22Z

Great new functionality!
SE translation:
#define TR_SF_ARM "Aktivera"
#define TR_ARMING_MODE "Aktivering"

ajjjjjjjj · 2024-10-30T14:43:49Z

This seems to be designed as CRSF specific, but is only tied to ELRS. How about adding "ELRS" to all labels to improve UX?
Also this could be done in lua by using getSwitch*() and/or getLogicalSwitchValue() functions.

I'm not EdgeTX advocate nor involved as developer/UX designer but I don't like how ELRS configuration must be done in many places (lua, specific module configuration, specific special function) where all of this can be kept in lua.

I know historically MPM is also integrated in EdgeTX but because there was no lua by the time and other constraints. Now, there is better way, so i don't think it is the way to go nor user friendly.

I'm not against your change, I just see other path that could be considered by project maintainers to make both projects better.

radio/src/datastructs_private.h

radio/src/translations/en.h

philmoz · 2024-10-30T21:02:21Z

Why does this need a special function? This seems overly complicated to me.

Wouldn't it be simpler and easier for users to just use a switch that the user can select.
Then the options would be 'Channel5' and 'Switch'.
If 'Switch' is selected then the user can use the existing switch selection UI to pick which switch to use for arming.
There looks to be plenty of room in the ModuleData structure to put both the arming mode flag and the selected arming switch in the 'crsf' section.

pfeerick · 2024-10-30T21:30:31Z

This seems to be designed as CRSF specific, but is only tied to ELRS. How about adding "ELRS" to all labels to improve UX?
Also this could be done in lua by using getSwitch*() and/or getLogicalSwitchValue() functions.

I guess if the same mechanism as is used to display the bind option only for ELRS that could be done. Especially since this is a ELRS only option. For configuration, sure Lua is fine, but I don't like it for critical mixer tasks - i.e. I would want to be certain this wouldn't cause the link to be dropped if Lua is terminated.

Why does this need a special function? This seems overly complicated to me.

Then the options would be 'Channel5' and 'Switch'.
If 'Switch' is selected then the user can use the existing switch selection UI to pick which switch to use for arming.

As long as you keep in mind it may not even need to be a physical switch but could be a LS (or even constant 😀), that would be a much better UX, as well as it bit more self-documenting.

mha1 · 2024-10-30T21:32:17Z

Why does this need a special function? This seems overly complicated to me.

Wouldn't it be simpler and easier for users to just use a switch that the user can select. Then the options would be 'Channel5' and 'Switch'. If 'Switch' is selected then the user can use the existing switch selection UI to pick which switch to use for arming. There looks to be plenty of room in the ModuleData structure to put both the arming mode flag and the selected arming switch in the 'crsf' section.

Actually that's a good idea idea if "Switch" can be a logical switch too which I think it does, doesn't it?

I agree on "Channel" vs "Channel5". maybe even better "AUX1(CH5)" because ExpressLRS/BF mostly use the term AUX1 if that fits the small b&w screens too.

pfeerick · 2024-10-30T21:42:15Z

AUX1 is inav/bf notation though? What about ardupilot, sbus etc? May be better to not have non-ELRS specific verbiage. After all, we don't use any other BF/INAV specific.

I.e. Channel 5 for long form, CH5 for short.

mha1 · 2024-10-30T22:19:33Z

AUX1 is inav/bf notation though? What about ardupilot, sbus etc? May be better to not have non-ELRS specific verbiage. After all, we don't use any other BF/INAV specific.

Hah, same thought about "Switch". And you're right about ON/OFF too. Maybe I'm wrong but the reason why I chose SF Arm is the fact all the logic for activation/deactivation is already there and can be used. Having a "Switch" selection in the CRSF UI just defines the switch. If "Switch" is more than physical switch, ie more like "Trigger" the logic to determine the status needs to be done. It'd be like a hidden internal SF.

AUX1 is also ExpressLRS lingo. Open the online documentation at expresslrs.org and search for AUX1. But really, I'm good with Channel5 or CH5 (if Channel5 doesn't fit the b&w screens).

Sorry about the missing translation. I missed that one. Will update everything once we agree on the UI. I like the idea to keep it all to the CRSF UI.

mha1 · 2024-11-11T11:44:17Z

And how about replacing the label "Arming" with "Arm using". It'd fit b&w too and might help to make the intention clear.

pfeerick · 2024-11-11T20:16:15Z

That sounds good. Can be surprising how a small change makes all the difference.

…

On Mon, 11 Nov 2024, 9:44 pm Michael, ***@***.***> wrote: And how about replacing the label "Arming" with "Arm using". It'd fit b&w too and might help to make the intention clear. — Reply to this email directly, view it on GitHub <#5641 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABJ66KPMP6BMXBKYEUNCSSD2ACKCRAVCNFSM6AAAAABQS6L54CVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINRXHE3TKMRUGU> . You are receiving this because you were mentioned.Message ID: ***@***.***>

mha1 · 2024-11-11T21:11:44Z

That sounds good. Can be surprising how a small change makes all the difference.

Thanks, great, will do it.

mha1 · 2024-11-12T09:02:59Z

@pfeerick I updated all the translations files. CH5 and Switch are now reusing TR_CH and TR_SWITCH, so no need to ask for translations but #define TR_CRSF_ARMING_MODE "Arm using" needs translating.

If you're happy with this could you please trigger the translators.

ulfhedlund · 2024-11-13T18:47:02Z

SE translation:
#define TR_CRSF_ARMING_MODE TR("Aktivera m.", "Aktivera med"), unless the full length translation actually fits on BW small screen.

mha1 · 2024-11-13T20:01:45Z

SE translation: #define TR_CRSF_ARMING_MODE TR("Aktivera m.", "Aktivera med"), unless the full length translation actually fits on BW small screen.

If I count correctly b&w allows a max of 10 characters. Your b&w translation might be too long.

3djc · 2024-11-13T20:11:58Z

BW doesnt use fixed width fonts, so it depends on the text itself, not char count

mha1 · 2024-11-16T18:21:13Z

froqstar · 2024-11-16T19:11:59Z

DE
#define TR_CRSF_ARMING_MODE "Armen via"

@other german speakers: Do we have a german word for arming in EdgeTX/ExpressLRS yet? Personally I use "armen/gearmed" in german conversations, but not sure how widespread that is. "Entsichern" or "scharf schalten" are too long and militaristic for me.

Pat6874 · 2024-11-17T08:04:44Z

FR: "define TR_CRSF_ARMING_MODE "Mode d'armement" Le sam. 16 nov. 2024, 20:12, Martin Mathes ***@***.***> a écrit :

…

DE #define TR_CRSF_ARMING_MODE "Armen via" @other <https://github.com/other> german speakers: Do we have a german word for arming in EdgeTX/ExpressLRS yet? Personally I use "armen/gearmed" in german conversations, but not sure how widespread that is. "Entsichern" or "scharf schalten" are too long and militaristic for me. — Reply to this email directly, view it on GitHub <#5641 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/A6HE7XP7GN5PCKRR3EMZHZ32A6KJPAVCNFSM6AAAAABQS6L54CVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBQG42DENBQHA> . You are receiving this because you were mentioned.Message ID: ***@***.***>

robustini · 2024-11-17T09:44:57Z

IT
#define TR_CRSF_ARMING_MODE TR("Modo arm", "Modo d'armamento")

Also in Italian since time immemorial “armed” has referred more to weapons, there is little use of the term “armed,” e.g. we do not say “the house alarm is armed” but “the house alarm is enabled, or activated.”
So in italian an armed F-35 means it carries bombs or missiles on board, unarmed means it has no armament on board.
But a house alarm cannot have bombs or missiles installed! :p
In fact for that reason DJI people were smarter, they always used “start or stop motors,” never arm/disarm.

3djc · 2024-11-17T09:55:29Z

We also need shorter forms for BW

Pat6874 · 2024-11-17T09:58:39Z

Shorter FR: "Mod. Arm." Le 17 nov. 2024, 10:55, à 10:55, 3djc ***@***.***> a écrit:

…

We also need shorter forms for BW -- Reply to this email directly or view it on GitHub: #5641 (comment) You are receiving this because you were mentioned. Message ID: ***@***.***>

robustini · 2024-11-17T10:10:03Z

We also need shorter forms for BW

IT edited.

Eldenroot · 2024-11-17T11:34:32Z

#define TR_CRSF_ARMING_MODE "Arm mód"

zyren · 2024-11-18T07:22:53Z

CN

#define TR_CRSF_ARMING_MODE            "解锁类型"

TW

#define TR_CRSF_ARMING_MODE            "解鎖類型"

mha1 · 2024-11-18T12:02:55Z

Thank you guys. So far I have:

CN: #define TR_CRSF_ARMING_MODE "解锁类型"
TW: #define TR_CRSF_ARMING_MODE "解鎖類型"
CZ: #define TR_CRSF_ARMING_MODE "Arm mód"
IT: #define TR_CRSF_ARMING_MODE TR("Modo arm", "Modo d'armamento")
FR: #define TR_CRSF_ARMING_MODE TR("Mod. Arm.", "Mode d'armement")
DE: #define TR_CRSF_ARMING_MODE "Armen via"
SE: #define TR_CRSF_ARMING_MODE TR("Aktivera m.", "Aktivera med")
RU: #define TR_CRSF_ARMING_MODE "Arm режим"
DA: #define TR_CRSF_ARMING_MODE TR("Aktiver m.", "Aktiver med")
ES: #define TR_CRSF_ARMING_MODE TR("Modo Arm.", "Modo Armado")
PT: #define TR_CRSF_ARMING_MODE TR("Armar via", "Armar usando")
JP: #define TR_CRSF_ARMING_MODE "アームロック解除"

kobakirill · 2024-11-18T13:56:09Z

RU
#define TR_CRSF_ARMING_MODE "Arm режим"

HThuren · 2024-11-18T15:22:32Z

DA translation:
#define TR_CRSF_ARMING_MODE TR("Aktiver m.", "Aktiver med")

Luznatural · 2024-11-19T03:30:13Z

ES translation:
#define TR_CRSF_ARMING_MODE TR "Modo Armado"
Shorter version
#define TR_CRSF_ARMING_MODE TR "Modo Arm."

zandorsp · 2024-11-19T11:57:05Z

PT
#define TR_CRSF_ARMING_MODE TR("Armar via", "Armar usando")

zandorsp · 2024-11-19T12:17:33Z

Also in Italian since time immemorial “armed” has referred more to weapons, there is little use of the term “armed,” e.g. we do not say “the house alarm is armed” but “the house alarm is enabled, or activated.”

Portuguese doesn't have this problem. We say 'the house alarm is armed', even outside a military context, but this is the Brazilian use. I am curious about other countries that use Portuguese, mainly Portugal. Anyone?

ToshihiroMakuuchi · 2024-11-19T13:10:52Z

JP
#define TR_CRSF_ARMING_MODE "アームロック解除"

mha1 · 2024-11-19T17:37:51Z

So far only FI, HE, NL and PL are missing. Does anyone know who to contact for FI, HE, NL?

pfeerick · 2024-11-20T05:50:15Z

HE translator asked not to be pinged for each PR, I think they plan on doing translations nearer to a release as a batch. For the others, nada, nope... so until someone says "I speak the lingo, I'll do it"... they get ignored 😇

mha1 · 2024-11-20T07:15:24Z

HE translator asked not to be pinged for each PR, I think they plan on doing translations nearer to a release as a batch. For the others, nada, nope... so until someone says "I speak the lingo, I'll do it"... they get ignored 😇

Alright, then we're through

mha1 added 17 commits October 25, 2024 10:12

initial commit

8bbf20d

only necessary for local builds

fd0953b

update to use extended modelID message to distinguish between ch4 arm…

1060bd6

…ing (legacy) and SF Arm arming (new)

update to be able to run pre SF ARM capable ELRS firmware with EdgeTX…

2a83007

… version that allows SF ARM

updated logic to provide migration path from ch5 arming to SF Arm arm…

4f2e687

…ing. If SF Arm is not defined system will use ch5 logic for arming.

separated SF Arm logic from modelID message

e3d3403

updated yaml_datastructs

b6ef484

made SF Arm selection text translatable

fbfa82e

added CPN support for SF Arm

46343fe

selection of CRSF armimg mode via internal/external RF settings

d601c10

added Companion support for crsfArmingMode setting

eac9ca5

Change to use extended RC channels message instead of a separate comm…

85665a1

…and arming command message. This ensures the arming status is sent periodically and at the same rate as channel 5.

add SF ARM to LUA

15d0090

change extended channels id to 0x18

79c0643

revert unit test

b8314a9

cleanup

42c629b

mha1 mentioned this pull request Oct 25, 2024

Adds optional arming method and provides contiguous proportional channels for all full-res modes ExpressLRS/ExpressLRS#3008

Merged

pfeerick added enhancement ✨ New feature or request user manual change Will impact on the user manual in some respect labels Oct 30, 2024

philmoz reviewed Oct 30, 2024

View reviewed changes

radio/src/datastructs_private.h Outdated Show resolved Hide resolved

philmoz reviewed Oct 30, 2024

View reviewed changes

radio/src/datastructs_private.h Outdated Show resolved Hide resolved

philmoz reviewed Oct 30, 2024

View reviewed changes

radio/src/translations/en.h Outdated Show resolved Hide resolved

cleanup, updated translation files

e3c3b5c

CPN and FW translation updates

8d6d64b

pfeerick added this to the 2.11 milestone Nov 22, 2024

pfeerick merged commit 8fd3d50 into EdgeTX:main Nov 22, 2024
51 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add support for ExpressLRS optional arming method #5641

feat: add support for ExpressLRS optional arming method #5641

mha1 commented Oct 25, 2024 •

edited

Loading

ulfhedlund commented Oct 29, 2024

ajjjjjjjj commented Oct 30, 2024 •

edited

Loading

philmoz commented Oct 30, 2024

pfeerick commented Oct 30, 2024 •

edited

Loading

mha1 commented Oct 30, 2024

pfeerick commented Oct 30, 2024 •

edited

Loading

mha1 commented Oct 30, 2024

mha1 commented Nov 11, 2024 •

edited

Loading

pfeerick commented Nov 11, 2024 via email

mha1 commented Nov 11, 2024

mha1 commented Nov 12, 2024

ulfhedlund commented Nov 13, 2024

mha1 commented Nov 13, 2024

3djc commented Nov 13, 2024

mha1 commented Nov 16, 2024 •

edited

Loading

froqstar commented Nov 16, 2024

Pat6874 commented Nov 17, 2024 via email

robustini commented Nov 17, 2024 •

edited

Loading

3djc commented Nov 17, 2024

Pat6874 commented Nov 17, 2024 via email

robustini commented Nov 17, 2024

Eldenroot commented Nov 17, 2024

zyren commented Nov 18, 2024

mha1 commented Nov 18, 2024 •

edited

Loading

kobakirill commented Nov 18, 2024 •

edited

Loading

HThuren commented Nov 18, 2024

Luznatural commented Nov 19, 2024 •

edited

Loading

zandorsp commented Nov 19, 2024 •

edited

Loading

zandorsp commented Nov 19, 2024 •

edited

Loading

ToshihiroMakuuchi commented Nov 19, 2024

mha1 commented Nov 19, 2024

pfeerick commented Nov 20, 2024

mha1 commented Nov 20, 2024

feat: add support for ExpressLRS optional arming method #5641

feat: add support for ExpressLRS optional arming method #5641

Conversation

mha1 commented Oct 25, 2024 • edited Loading

ulfhedlund commented Oct 29, 2024

ajjjjjjjj commented Oct 30, 2024 • edited Loading

philmoz commented Oct 30, 2024

pfeerick commented Oct 30, 2024 • edited Loading

mha1 commented Oct 30, 2024

pfeerick commented Oct 30, 2024 • edited Loading

mha1 commented Oct 30, 2024

mha1 commented Nov 11, 2024 • edited Loading

pfeerick commented Nov 11, 2024 via email

mha1 commented Nov 11, 2024

mha1 commented Nov 12, 2024

ulfhedlund commented Nov 13, 2024

mha1 commented Nov 13, 2024

3djc commented Nov 13, 2024

mha1 commented Nov 16, 2024 • edited Loading

froqstar commented Nov 16, 2024

Pat6874 commented Nov 17, 2024 via email

robustini commented Nov 17, 2024 • edited Loading

3djc commented Nov 17, 2024

Pat6874 commented Nov 17, 2024 via email

robustini commented Nov 17, 2024

Eldenroot commented Nov 17, 2024

zyren commented Nov 18, 2024

mha1 commented Nov 18, 2024 • edited Loading

kobakirill commented Nov 18, 2024 • edited Loading

HThuren commented Nov 18, 2024

Luznatural commented Nov 19, 2024 • edited Loading

zandorsp commented Nov 19, 2024 • edited Loading

zandorsp commented Nov 19, 2024 • edited Loading

ToshihiroMakuuchi commented Nov 19, 2024

mha1 commented Nov 19, 2024

pfeerick commented Nov 20, 2024

mha1 commented Nov 20, 2024

mha1 commented Oct 25, 2024 •

edited

Loading

ajjjjjjjj commented Oct 30, 2024 •

edited

Loading

pfeerick commented Oct 30, 2024 •

edited

Loading

pfeerick commented Oct 30, 2024 •

edited

Loading

mha1 commented Nov 11, 2024 •

edited

Loading

mha1 commented Nov 16, 2024 •

edited

Loading

robustini commented Nov 17, 2024 •

edited

Loading

mha1 commented Nov 18, 2024 •

edited

Loading

kobakirill commented Nov 18, 2024 •

edited

Loading

Luznatural commented Nov 19, 2024 •

edited

Loading

zandorsp commented Nov 19, 2024 •

edited

Loading

zandorsp commented Nov 19, 2024 •

edited

Loading