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

[cmd] Add deadband trigger methods to CommandGenericHID #7085

Merged
merged 22 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e0e186e
first draft java
narmstro2020 Sep 15, 2024
dee6b41
first draft java
narmstro2020 Sep 15, 2024
ca10711
Merge branch 'CommandHIDTrigger' of https://github.com/narmstro2020/a…
narmstro2020 Sep 15, 2024
13d5fde
Formatting fixes
github-actions[bot] Sep 15, 2024
09be2ad
method rearrangement
narmstro2020 Sep 15, 2024
08f2ee7
Formatting fixes
github-actions[bot] Sep 15, 2024
b7ac6c3
formatting fixes
narmstro2020 Sep 15, 2024
2e768e7
Merge branch 'CommandHIDTrigger' of https://github.com/narmstro2020/a…
narmstro2020 Sep 15, 2024
82d31e2
Update wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command…
narmstro2020 Sep 16, 2024
63102a2
Update wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command…
narmstro2020 Sep 16, 2024
ab63fac
cache addition and method removal
narmstro2020 Sep 16, 2024
d0a997b
Formatting fixes
github-actions[bot] Sep 16, 2024
b5c2103
C++ first draft.
narmstro2020 Sep 16, 2024
528bba3
method rename, javadoc reconfigure
narmstro2020 Sep 16, 2024
0fb39ca
Formatting fixes
github-actions[bot] Sep 16, 2024
be4196c
Update wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command…
narmstro2020 Sep 18, 2024
ffe0eab
format fix
narmstro2020 Sep 18, 2024
e72f25c
rename fix
narmstro2020 Sep 18, 2024
d668bb5
Merge branch 'wpilibsuite:main' into CommandHIDTrigger
narmstro2020 Sep 21, 2024
c93a986
Merge branch 'wpilibsuite:main' into CommandHIDTrigger
narmstro2020 Sep 29, 2024
49e10fc
Merge branch 'wpilibsuite:main' into CommandHIDTrigger
narmstro2020 Oct 1, 2024
bd0648e
Merge branch 'wpilibsuite:main' into CommandHIDTrigger
narmstro2020 Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class CommandGenericHID {
new HashMap<>();
private final Map<EventLoop, Map<Pair<Integer, Double>, Trigger>> m_axisGreaterThanCache =
new HashMap<>();
private final Map<EventLoop, Map<Pair<Integer, Double>, Trigger>>
m_axisMagnitudeGreaterThanCache = new HashMap<>();
private final Map<EventLoop, Map<Integer, Trigger>> m_povCache = new HashMap<>();

/**
Expand Down Expand Up @@ -260,6 +262,36 @@ public Trigger axisGreaterThan(int axis, double threshold, EventLoop loop) {
Pair.of(axis, threshold), k -> new Trigger(loop, () -> getRawAxis(axis) > threshold));
}

/**
* Constructs a Trigger instance that is true when the axis magnitude value is greater than {@code
* threshold}, attached to the given loop.
*
* @param axis The axis to read, starting at 0
* @param threshold The value above which this trigger should return true.
* @param loop the event loop instance to attach the trigger to.
* @return a Trigger instance that is true when the axis magnitude value is greater than the
* provided threshold.
*/
public Trigger axisMagnitudeGreaterThan(int axis, double threshold, EventLoop loop) {
var cache = m_axisMagnitudeGreaterThanCache.computeIfAbsent(loop, k -> new HashMap<>());
return cache.computeIfAbsent(
Pair.of(axis, threshold),
k -> new Trigger(loop, () -> Math.abs(getRawAxis(axis)) > threshold));
}

/**
* Constructs a Trigger instance that is true when the axis magnitude value is greater than {@code
* threshold}, attached to the given loop.
narmstro2020 marked this conversation as resolved.
Show resolved Hide resolved
*
* @param axis The axis to read, starting at 0
* @param threshold The value above which this trigger should return true.
* @return a Trigger instance that is true when the deadbanded axis value is active (non-zero).
*/
public Trigger axisActive(int axis, double threshold) {
return axisMagnitudeGreaterThan(
axis, threshold, CommandScheduler.getInstance().getDefaultButtonLoop());
}

/**
* Get the value of the axis.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ Trigger CommandGenericHID::AxisGreaterThan(int axis, double threshold,
});
}

Trigger CommandGenericHID::AxisMagnitudeGreaterThan(
int axis, double deadband, frc::EventLoop* loop) const {
return Trigger(loop, [this, axis, deadband]() {
return std::abs(m_hid.GetRawAxis(axis)) > deadband;
});
}
narmstro2020 marked this conversation as resolved.
Show resolved Hide resolved

void CommandGenericHID::SetRumble(frc::GenericHID::RumbleType type,
double value) {
m_hid.SetRumble(type, value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,21 @@ class CommandGenericHID {
frc::EventLoop* loop =
CommandScheduler::GetInstance().GetDefaultButtonLoop()) const;

/**
* Constructs a Trigger instance that is true when the axis magnitude value is
* greater than {@code threshold}, attached to the given loop.
*
* @param axis The axis to read, starting at 0
* @param threshold The value above which this trigger should return true.
* @param loop the event loop instance to attach the trigger to.
* @return a Trigger instance that is true when the axis magnitude value is
* greater than the provided threshold.
*/
Trigger AxisMagnitudeGreaterThan(
int axis, double threshold,
frc::EventLoop* loop =
CommandScheduler::GetInstance().GetDefaultButtonLoop()) const;

/**
* Set the rumble output for the HID.
*
Expand Down
Loading