Skip to content

Conversation

Williangalvani
Copy link
Member

@Williangalvani Williangalvani commented Aug 25, 2025

mixed feelings about the store. thoughts?
the idea is to slowly move logic away from .vue files

Summary by Sourcery

Extract actuator capability detection to a Vuex module and enhance the gripper component with generic channel mapping and misconfiguration warnings.

New Features:

  • Add ardupilot_capabilities Vuex module to detect actuator support in firmware
  • Display misconfiguration warnings for gripper setup when no actuator or PWM output is configured

Enhancements:

  • Refactor gripper channel detection to iterate over dynamically defined channel arrays
  • Introduce configured_actuators computed property for flexible actuator value mapping
  • Limit gripper card width with max-width styling

Copy link

sourcery-ai bot commented Aug 25, 2025

Reviewer's Guide

This PR refactors gripper-related logic by moving configuration checks into computed properties and a new Vuex module, replaces hardcoded channel detection with a dynamic loop over expanded channel definitions, and enhances the UI with validation messaging and layout constraints.

Class diagram for new ArdupilotCapabilitiesStore Vuex module

classDiagram
  class ArdupilotCapabilitiesStore {
    +firmware_supports_actuators: boolean
  }
  ArdupilotCapabilitiesStore <|-- ardupilot_capabilities: instance
  ArdupilotCapabilitiesStore ..> autopilot_data: uses
Loading

Class diagram for updated gripper.vue component logic

classDiagram
  class Gripper {
    +gripper: number | null
    +boardType: string | undefined
    +configured_actuators(): number[]
    +misconfigured_gripper(): string | null
    +toBoardFriendlyChannel(servo: string): string
  }
  Gripper ..> ardupilot_capabilities: uses
  Gripper ..> autopilot_data: uses
  Gripper ..> autopilot: uses
Loading

File-Level Changes

Change Details Files
Refactored servo channel detection into a dynamic loop
  • Expanded channel arrays to include all toggle and PWM functions for servos 1–5
  • Replaced manual channel1/2/3 if-blocks with a loop over the channels array
core/frontend/src/components/vehiclesetup/overview/gripper.vue
Added misconfigured gripper validation and messaging
  • Introduced misconfigured_gripper computed property with capability checks
  • Displayed error text in template when gripper or actuator setup is invalid
  • Imported ardupilot_capabilities store to gate validation logic
core/frontend/src/components/vehiclesetup/overview/gripper.vue
Created ardupilot_capabilities Vuex module for firmware checks
  • Added ardupilot_capabilities.ts store module
  • Exposed firmware_supports_actuators getter based on ACTUATOR1_INC parameter
core/frontend/src/store/ardupilot_capabilities.ts
Introduced configured_actuators computed property
  • Filter parameters matching SERVO(\d+)_FUNCTION to derive active actuators
  • Map parameter values to actuator indices
core/frontend/src/components/vehiclesetup/overview/gripper.vue
Minor UI and import adjustments
  • Added max-width="250px" to v-card
  • Imported SERVO_FUNCTION enum and reordered imports
core/frontend/src/components/vehiclesetup/overview/gripper.vue

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

}

get firmware_supports_light_functions(): boolean {
// TODO: light functions were introduced at the same time as actuators
Copy link
Member Author

Choose a reason for hiding this comment

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

Suggested change
// TODO: light functions were introduced at the same time as actuators
// light functions were introduced at the same time as actuators

Copy link
Collaborator

@ES-Alexander ES-Alexander left a comment

Choose a reason for hiding this comment

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

Not sure if you wanted reviews yet, since it's still marked as draft, but you did bring it up in the meeting so figured I'd at least take an initial look :-)

Comment on lines +47 to +52
BTN_FUNCTION.SERVO_1_MIN_MOMENTARY,
BTN_FUNCTION.SERVO_1_MAX_MOMENTARY,
BTN_FUNCTION.SERVO_1_MIN_TOGGLE,
BTN_FUNCTION.SERVO_1_MAX_TOGGLE,
BTN_FUNCTION.SERVO_1_MIN,
BTN_FUNCTION.SERVO_1_MAX,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Haven't these been renamed now to actuator_n_*? Not sure how that's best handled from a display perspective, given they were/are called servo_n_* for older firmware versions 🤷‍♂️

BTN_FUNCTION.SERVO_5_MAX_TOGGLE,
BTN_FUNCTION.SERVO_5_MIN,
BTN_FUNCTION.SERVO_5_MAX,
]
Copy link
Collaborator

Choose a reason for hiding this comment

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

What about Actuator 6?

Comment on lines +17 to +18
<v-card-text v-if="misconfigured_gripper" class="red--text">
{{ misconfigured_gripper }}
Copy link
Collaborator

Choose a reason for hiding this comment

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

This seems worth expanding to more general checks of missing outputs corresponding to assigned button functions:

  • Lights N
  • Actuator N (with gripper mentioned as a potential intended output)
  • Relay N

but that's perhaps out of scope for this PR 🤷‍♂️


get firmware_supports_light_functions(): boolean {
// TODO: light functions were introduced at the same time as actuators
return autopilot_data.parameter('ACTUATOR1_INC') !== undefined
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there pre-filtering somewhere, that makes this apply only to ArduSub?
IIRC Actuator outputs are more general ArduPilot, but Lights is a Sub thing - I could be wrong on both accounts though 🤷‍♂️

@ES-Alexander
Copy link
Collaborator

Relevant to #3501

@ES-Alexander ES-Alexander changed the title Gripper updates 2 Accurately reflect PWM output configuration Sep 15, 2025
@ES-Alexander
Copy link
Collaborator

Needs to include outputs displaying as RCIN9/10 when using a firmware that supports the new lights outputs (if the output parameters are not using Lights1/2 values)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants