Add osd switching via stick inputs in disarm state #27877

prosolvo4th · 2024-08-20T20:30:14Z

Sticks inputs: roll mid && pitch high && yaw low && throttle mid

peterbarker

The new option would need to be documented in the relevant parameter description in AP_OSD.cpp

Not sure why we haven't supported this before. Seems odd.

libraries/AP_OSD/AP_OSD.cpp

Hwurzburg · 2024-09-13T20:34:08Z

needs Andy's approval that this does not interfere with his param change code

andyp1per · 2024-09-14T07:42:37Z

Pretty sure this is going to interact very badly with the param stuff and runcam menus. I think probably at a minimum you need to check that you are not in the runcam osd menus and disable this behaviour if you are. The param stuff is the same I think - you need to check you are not in these menus when enabling this stuff.

andyp1per

Need to check whether you are in runcam or osd parameter menus

prosolvo4th · 2024-09-14T15:42:13Z

Need to check whether you are in runcam or OSD parameter menus

Hi!
I added checking for the runcam menu state (kind of).
But I don't want to add a check on Screen5 or Screen6. I use this functionality to go to Screen5 to adjust the VTX.

For now, there is no interference between the param menu and the used stick combination.
For the param menu throttle (left stick in mode2) must be in the lower position, in the proposed PR for switching between OSD screens throttle must be in the center.

andyp1per · 2024-09-14T15:46:19Z

Need to check whether you are in runcam or OSD parameter menus

Hi! I added checking for runcam menu state (kind of). But I don't want to add a check on Screen5 or Screen6. I use this functionality to go to Screen5 to adjust the VTX.

Does it work ok? I mean if its working well with the parameter menus then that's great.

prosolvo4th · 2024-09-14T15:47:17Z

Need to check whether you are in runcam or OSD parameter menus

Hi! I added checking for runcam menu state (kind of). But I don't want to add a check on Screen5 or Screen6. I use this functionality to go to Screen5 to adjust the VTX.

Does it work ok? I mean if its working well with the parameter menus then that's great.

yep, so far so good

libraries/AP_OSD/AP_OSD.cpp

Sticks inputs: roll mid && pitch high && yaw low && throttle mid Signed-off-by: 4th <[email protected]>

prosolvo4th · 2024-09-14T16:39:34Z

@Hwurzburg
Here are changes in the wiki:
ArduPilot/ardupilot_wiki#6278

libraries/AP_OSD/AP_OSD.cpp

peterbarker

We don't care if RunCam is preventing arming.

We care that we're in the RunCam menus.

So use an appropriately-named method.

libraries/AP_Camera/AP_RunCam.h

peterbarker · 2024-09-15T00:11:57Z

Byte-cost for this feature:

Board                    AP_Periph  blimp  bootloader  copter  heli  iofirmware  plane  rover  sub
CubeOrange-periph-heavy  *                                                                     
Durandal                            *      *           272     272               272    272    *
Hitec-Airspeed           *                                                                     
KakuteH7-bdshot                     *      *           120     120               120    112    *
MatekF405                           *      *           112     112               120    112    *
Pixhawk1-1M-bdshot                  *                  *       *                 *      *      *
f103-QiotekPeriph        *                                                                     
f303-Universal           *                                                                     
iomcu                                                                *                         
revo-mini                           *      *           120     112               120    112    *
skyviper-v2450                                         *

peterbarker · 2024-09-15T03:31:54Z

... also has to pass CI

prosolvo4th · 2024-09-15T17:39:11Z

... also has to pass CI

This can be quite difficult.
For some reason sometimes tests can fail for no reason.
I created a simple change and PR with this change in my fork, and CI failed in 2 checks.
I am afraid, I am not able to get a CI 100% pass...

Signed-off-by: Mr4th <|\/|>

andyp1per · 2024-09-15T19:14:24Z

libraries/AP_OSD/AP_OSD.cpp

@@ -599,6 +606,32 @@ void AP_OSD::update_current_screen()
            last_switch_ms = 0;
        }
        break;
+    case STICKS_INPUT:
+        if (!AP_Notify::flags.armed && !AP::runcam()->in_menu()) {


You don't need to check for armed here. You can't be in menu and armed

... also the wrong way to check if you're armed; you ask the arming library directly if you're armed.

You don't need to check for armed here. You can't be in menu and armed

Disagree. We should not pre-suppose the inner-workings of AP_RunCam here.

We should both check we are not armed and that we aren't going to screw over AP_RunCam somehow.

Suggested change

if (!AP_Notify::flags.armed && !AP::runcam()->in_menu()) {

if (!AP::arming().is_armed() && !AP::runcam()->in_menu()) {

... actually, you will need to add #ifs around the call to the runcam singleton here, or we'll end up with compilations failures when runcam isn't compiled in

andyp1per · 2024-09-15T19:16:33Z

libraries/AP_Camera/AP_RunCam.cpp

@@ -244,7 +244,7 @@ bool AP_RunCam::pre_arm_check(char *failure_msg, const uint8_t failure_msg_len)
    }

    // currently in the OSD menu, do not allow arming
-    if (is_arming_prevented()) {


please don't change these - it makes it less clear. I don't think this is what @peterbarker was proposing, he suggested having two functions and I think that would be fine.

andyp1per

You will also need to squash the commits

andyp1per · 2024-09-15T19:17:43Z

We don't care if RunCam is preventing arming.

We care that we're in the RunCam menus.

So use an appropriately-named method.

We do internally. I object to this rename internally, but fine for it to be used externally.

Hwurzburg · 2024-09-22T12:56:36Z

libraries/AP_OSD/AP_OSD.cpp

@@ -78,7 +79,7 @@ const AP_Param::GroupInfo AP_OSD::var_info[] = {
    // @Param: _SW_METHOD
    // @DisplayName: Screen switch method
    // @Description: This sets the method used to switch different OSD screens.
-    // @Values: 0: switch to next screen if channel value was changed, 1: select screen based on pwm ranges specified for each screen, 2: switch to next screen after low to high transition and every 1s while channel value is high
+    // @Values: 0: switch to next screen if channel value was changed, 1: select screen based on pwm ranges specified for each screen, 2: switch to next screen after low to high transition and every 1s while channel value is high, 3: switches to next screen if the sticks in the next position: roll - middle, pitch - high, throttle - middle, yaw - left. Keeps toggling to next screen every 1s while sticks in mentioned positions


this causes a CI metadata failure

Suggested change

// @Values: 0: switch to next screen if channel value was changed, 1: select screen based on pwm ranges specified for each screen, 2: switch to next screen after low to high transition and every 1s while channel value is high, 3: switches to next screen if the sticks in the next position: roll - middle, pitch - high, throttle - middle, yaw - left. Keeps toggling to next screen every 1s while sticks in mentioned positions

// @Values: 0: switch to next screen if channel value was changed, 1: select screen based on pwm ranges specified for each screen, 2: switch to next screen after low to high transition and every 1s while channel value is high, 3: switches to next screen if the sticks are held roll-middle pitch-high throttle-middle and yaw-left. Keeps toggling to the next screen every 1s while sticks are in the mentioned positions

prosolvo4th force-pushed the osd_sticks_input_switch branch 2 times, most recently from fd74178 to cdc4255 Compare August 20, 2024 20:32

peterbarker requested changes Sep 13, 2024

View reviewed changes

libraries/AP_OSD/AP_OSD.cpp Outdated Show resolved Hide resolved

libraries/AP_OSD/AP_OSD.cpp Outdated Show resolved Hide resolved

Hwurzburg requested a review from andyp1per September 13, 2024 20:32

andyp1per requested changes Sep 14, 2024

View reviewed changes

prosolvo4th force-pushed the osd_sticks_input_switch branch from cdc4255 to e07d39d Compare September 14, 2024 15:35

Hwurzburg added the WikiNeeded needs wiki update label Sep 14, 2024

andyp1per reviewed Sep 14, 2024

View reviewed changes

libraries/AP_OSD/AP_OSD.cpp Outdated Show resolved Hide resolved

prosolvo4th force-pushed the osd_sticks_input_switch branch from e07d39d to 497aad5 Compare September 14, 2024 15:59

Add osd switching via stick inputs in disarm state

6b8ac78

Sticks inputs: roll mid && pitch high && yaw low && throttle mid Signed-off-by: 4th <[email protected]>

prosolvo4th force-pushed the osd_sticks_input_switch branch from 497aad5 to f9e74b6 Compare September 14, 2024 16:38

prosolvo4th mentioned this pull request Sep 14, 2024

Update OSD switching methods description ArduPilot/ardupilot_wiki#6278

Open

Hwurzburg requested changes Sep 14, 2024

View reviewed changes

libraries/AP_OSD/AP_OSD.cpp Outdated Show resolved Hide resolved

prosolvo4th force-pushed the osd_sticks_input_switch branch 2 times, most recently from cebfc34 to d241686 Compare September 14, 2024 17:19

peterbarker requested changes Sep 14, 2024

View reviewed changes

libraries/AP_Camera/AP_RunCam.h Outdated Show resolved Hide resolved

Mr4th added 3 commits September 15, 2024 20:49

Replace runcam pre arm check with public in menu check

735061b

Signed-off-by: Mr4th <|\/|>

Add check for runcam menu to prevent interfere

1a6674e

Signed-off-by: Mr4th <|\/|>

Update _SW_METHOD value description

65cd913

Signed-off-by: Mr4th <|\/|>

prosolvo4th force-pushed the osd_sticks_input_switch branch from d241686 to 65cd913 Compare September 15, 2024 17:57

andyp1per reviewed Sep 15, 2024

View reviewed changes

andyp1per requested changes Sep 15, 2024

View reviewed changes

Hwurzburg requested changes Sep 22, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add osd switching via stick inputs in disarm state #27877

Add osd switching via stick inputs in disarm state #27877

prosolvo4th commented Aug 20, 2024

peterbarker left a comment

Hwurzburg commented Sep 13, 2024

andyp1per commented Sep 14, 2024

andyp1per left a comment

prosolvo4th commented Sep 14, 2024 •

edited

Loading

andyp1per commented Sep 14, 2024

prosolvo4th commented Sep 14, 2024

prosolvo4th commented Sep 14, 2024

peterbarker left a comment

peterbarker commented Sep 15, 2024

peterbarker commented Sep 15, 2024

prosolvo4th commented Sep 15, 2024

andyp1per Sep 15, 2024

peterbarker Sep 16, 2024

peterbarker Sep 16, 2024

peterbarker Sep 16, 2024

andyp1per Sep 15, 2024

andyp1per left a comment

andyp1per commented Sep 15, 2024

Hwurzburg Sep 22, 2024

	if (!AP_Notify::flags.armed && !AP::runcam()->in_menu()) {
	if (!AP::arming().is_armed() && !AP::runcam()->in_menu()) {

Add osd switching via stick inputs in disarm state #27877

Are you sure you want to change the base?

Add osd switching via stick inputs in disarm state #27877

Conversation

prosolvo4th commented Aug 20, 2024

peterbarker left a comment

Choose a reason for hiding this comment

Hwurzburg commented Sep 13, 2024

andyp1per commented Sep 14, 2024

andyp1per left a comment

Choose a reason for hiding this comment

prosolvo4th commented Sep 14, 2024 • edited Loading

andyp1per commented Sep 14, 2024

prosolvo4th commented Sep 14, 2024

prosolvo4th commented Sep 14, 2024

peterbarker left a comment

Choose a reason for hiding this comment

peterbarker commented Sep 15, 2024

peterbarker commented Sep 15, 2024

prosolvo4th commented Sep 15, 2024

andyp1per Sep 15, 2024

Choose a reason for hiding this comment

peterbarker Sep 16, 2024

Choose a reason for hiding this comment

peterbarker Sep 16, 2024

Choose a reason for hiding this comment

peterbarker Sep 16, 2024

Choose a reason for hiding this comment

andyp1per Sep 15, 2024

Choose a reason for hiding this comment

andyp1per left a comment

Choose a reason for hiding this comment

andyp1per commented Sep 15, 2024

Hwurzburg Sep 22, 2024

Choose a reason for hiding this comment

prosolvo4th commented Sep 14, 2024 •

edited

Loading