Button.cpp

@@ -48,8 +48,7 @@ bool LatchedButton::Update(Joystick* js) {
 }
 
 
-PulsedButton::PulsedButton(uint8_t vbutton, Reader* reader, uint8_t release_delay, bool double_action, bool split) : Button(vbutton, reader) {
-  this->release_delay = release_delay;
+PulsedButton::PulsedButton(uint8_t vbutton, Reader* reader, bool double_action, bool split) : Button(vbutton, reader) {
   this->release_time1 = 0;
   this->release_time2 = 0;
   if (double_action) {
@@ -81,21 +80,21 @@ bool PulsedButton::Update(Joystick* js) {
     case BUTTON_PULSED:
       if (reader->On()) {
         js->PressButton(vbutton);
-        release_time1 = millis() + release_delay;
+        release_time1 = millis() + 250;
       }
       break;
     case BUTTON_PULSED_DOUBLE_ACTION:
       js->PressButton(vbutton);
-      release_time1 = millis() + release_delay;
+      release_time1 = millis() + 250;
       break;
     case BUTTON_PULSED_DOUBLE_ACTION_SPLIT:
       if (reader->On()) {
         js->PressButton(vbutton);
-        release_time1 = millis() + release_delay;
+        release_time1 = millis() + 250;
       }
       else {
         js->PressButton(vbutton2);
-        release_time2 = millis() + release_delay;
+        release_time2 = millis() + 250;
       }
       break;
   }
@@ -104,12 +103,11 @@ bool PulsedButton::Update(Joystick* js) {
 }
 
 
-EncoderButton::EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton, int8_t tick_threshold, uint8_t release_delay) : Button(vbutton, NULL) {
+EncoderButton::EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton, int8_t tick_threshold) : Button(vbutton, NULL) {
   this->type = ENCODER_PULSED_SPLIT;
   this->vbutton2 = vbutton + 1;
   this->encoder = new Encoder(pin1, pin2);
   this->last_value = encoder->read();
-  this->release_delay = release_delay;
   this->release_time1 = 0;
   this->release_time2 = 0;
   this->ticks = 0;
@@ -137,13 +135,13 @@ bool EncoderButton::Update(Joystick* js) {
   if (ticks >= tick_threshold) {
     js->PressButton(vbutton);
     changed = true;
-    release_time1 = millis() + release_delay;
+    release_time1 = millis() + 250;
     ticks = 0;
   }
   else if (ticks <= tick_threshold * -1) {
     js->PressButton(vbutton2);
     changed = true;
-    release_time2 = millis() + release_delay;
+    release_time2 = millis() + 250;
     ticks = 0;
   }
 

Button.h

@@ -50,13 +50,12 @@ class LatchedButton : public Button {
 
 class PulsedButton : public Button {
  public:
-  PulsedButton(uint8_t vbutton, Reader* reader, uint8_t release_delay, bool double_action = false, bool split = false);
+  PulsedButton(uint8_t vbutton, Reader* reader, bool double_action = false, bool split = false);
   bool Update(Joystick* js);
 
  protected:
   bool double_action;
   bool split;
-  uint8_t release_delay;
   unsigned long release_time1;
   unsigned long release_time2;
   uint8_t vbutton2;
@@ -64,14 +63,13 @@ class PulsedButton : public Button {
 
 class EncoderButton : public Button {
  public:
-  EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton, int8_t tick_threshold, uint8_t release_delay);
+  EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton, int8_t tick_threshold);
   bool Update(Joystick* js);
 
  protected:
   Encoder* encoder;
   long last_value;
   uint8_t vbutton2;
-  uint8_t release_delay;
   unsigned long release_time1;
   unsigned long release_time2;
   int8_t ticks;

Joystick.cpp

@@ -21,12 +21,11 @@ bool operator !=(JoyReport a, JoyReport b){
   return !(a == b);
 }
 
-Joystick::Joystick(uint8_t release_delay, bool debug) {
+Joystick::Joystick(bool debug) {
   _debug = debug;
   _virtual_buttons = 0;
   _num_axes = 0;
   _num_buttons = 0;
-  this->release_delay = release_delay;
 
   for (uint8_t i=0; i < JOYSTICK_NUM_AXES; i++) {
     _joyReport.axis[i] = 0;
@@ -59,7 +58,7 @@ void Joystick::AddEncoder(uint8_t pin1, uint8_t pin2, int8_t tick_threshold, But
   switch (type) {
     case ENCODER_PULSED_SPLIT:
       // add an encoder button. _BuildButton() doesn't do everything we need, however...
-      button = new EncoderButton(pin1, pin2, _virtual_buttons, tick_threshold, release_delay);
+      button = new EncoderButton(pin1, pin2, _virtual_buttons, tick_threshold);
       _buttons[_num_buttons] = button;
       _num_buttons++;
       _virtual_buttons += 2;
@@ -158,15 +157,15 @@ void Joystick::_addButton(ButtonType type, Reader* reader) {
       _virtual_buttons++;
       break;
     case BUTTON_PULSED:
-      button = new PulsedButton(_virtual_buttons, reader, release_delay, false, false);
+      button = new PulsedButton(_virtual_buttons, reader, false, false);
       _virtual_buttons++;
       break;
     case BUTTON_PULSED_DOUBLE_ACTION:
-      button = new PulsedButton(_virtual_buttons, reader, release_delay, true, false);
+      button = new PulsedButton(_virtual_buttons, reader, true, false);
       _virtual_buttons++;
       break;
     case BUTTON_PULSED_DOUBLE_ACTION_SPLIT:
-      button = new PulsedButton(_virtual_buttons, reader, release_delay, true, true);
+      button = new PulsedButton(_virtual_buttons, reader, true, true);
       _virtual_buttons += 2;
       break;
     case BUTTON_LATCHED_MOMENTARY:

Joystick.h

@@ -29,7 +29,7 @@ bool operator !=(JoyReport a, JoyReport b);
 
 class Joystick {
   public:
-    Joystick(uint8_t release_delay = 50, bool debug = false);
+    Joystick(bool debug=false);
     void Init();
     void Update();
 
@@ -78,7 +78,6 @@ class Joystick {
     JoyReport _joyReport;
 
     bool _debug;
-    uint8_t release_delay;
 };
 
 #endif

example/example.ino

@@ -42,7 +42,7 @@ using namespace admux;
 
 
 bool debug = true;
-Joystick js(250, debug);
+Joystick js(debug);
 
 void setup() {
   js.Init();