Cache and directly construct Triggers

wpilibNewCommands/src/generate/main/java/edu/wpi/first/wpilibj2/command/button/commandhid.java.jinja

@@ -60,7 +60,7 @@ public class Command{{ ConsoleName }}Controller extends CommandGenericHID {
    *     to the given loop.
    */
   public Trigger {{ button.name }}(EventLoop loop) {
-    return m_hid.{{ button.name }}(loop).castTo(Trigger::new);
+    return button({{ ConsoleName }}Controller.Button.k{{ capitalize_first(button.name) }}.value, loop);
   }
 {% endfor -%}
 {% for trigger in triggers -%}
@@ -76,7 +76,7 @@ public class Command{{ ConsoleName }}Controller extends CommandGenericHID {
    *     threshold, attached to the given event loop
    */
   public Trigger {{ trigger.name }}(double threshold, EventLoop loop) {
-    return m_hid.{{ trigger.name }}(threshold, loop).castTo(Trigger::new);
+    return axisGreaterThan({{ ConsoleName }}Controller.Axis.k{{ capitalize_first(trigger.name) }}.value, threshold, loop);
   }
 
   /**

wpilibNewCommands/src/generate/main/native/cpp/frc2/command/button/commandhid.cpp.jinja

@@ -18,14 +18,16 @@ frc::{{ ConsoleName }}Controller& Command{{ ConsoleName }}Controller::GetHID() {
 }
 {% for button in buttons %}
 Trigger Command{{ ConsoleName }}Controller::{{ capitalize_first(button.name) }}(frc::EventLoop* loop) const {
-  return m_hid.{{ capitalize_first(button.name) }}(loop).CastTo<Trigger>();
+  return Button(frc::{{ ConsoleName }}Controller::Button::k{{ capitalize_first(button.name) }}, loop);
 }
 {% endfor -%}
 {% for trigger in triggers -%}
 {% if trigger.UseThresholdMethods %}
 Trigger Command{{ ConsoleName }}Controller::{{ capitalize_first(trigger.name) }}(double threshold,
                                            frc::EventLoop* loop) const {
-  return m_hid.{{ capitalize_first(trigger.name) }}(threshold, loop).CastTo<Trigger>();
+  return Trigger(loop, [this, threshold] {
+    return m_hid.Get{{ capitalize_first(trigger.name) }}Axis() > threshold;
+  });
 }
 {% endif -%}
 {% endfor -%}