Skip to content
Snippets Groups Projects

<unset> removes struct entries with inheritance again

Merged Kevin Kuns requested to merge kevin.kuns/pygwinc:inheritance-unset into master

Giving the <unset> key when inheriting ifos removes that entry from the inherited struct. For example, the arm power can be set directly with

+inherit: 'Aplus'

Laser:
    Power: <unset>
    ArmPower: 730e3

Laser.Power needs to be removed from the struct because that cannot be simultaneously defined with Laser.ArmPower.

A test was also added to test this behavior.

Merge request reports

Merge request pipeline #332702 passed

Merge request pipeline passed for 41eabaa2

Approved by

Merged by Lee McCullerLee McCuller 2 years ago (Sep 23, 2022 3:45pm UTC)

Merge details

  • Changes merged into master with fb5cc996.
  • Did not delete the source branch.

Pipeline #457163 passed with warnings

Pipeline passed with warnings for fb5cc996 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading