Button.cpp

@@ -13,8 +13,7 @@ void Button::ReleaseButtons(Joystick* js) {
   js->ReleaseButton(vbutton);
 }
 
-// TODO: make analog_only work... how to handle that with debouncer?
+SwitchButton::SwitchButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux)  : Button(vbutton) {
-SwitchButton::SwitchButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux, bool analog_only) : Button(vbutton) {
   this->mux = mux;
 
   uint8_t mode = INPUT;
@@ -33,7 +32,6 @@ SwitchButton::SwitchButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux,
 bool SwitchButton::BouncerUpdate() {
   if (mux != NULL) {
     mux->channel(channel_id);
-    delayMicroseconds(500);
   }
 
   return bouncer.update();
@@ -46,25 +44,24 @@ bool SwitchButton::On() {
 }
 
 
-PassthruButton::PassthruButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux, bool analog_only) : SwitchButton(pin, vbutton, pullup, mux, analog_only) {
+PassthruButton::PassthruButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux) : SwitchButton(pin, vbutton, pullup, mux) {
   this->type = BUTTON_PASSTHRU;
 }
 
-bool PassthruButton::Update(Joystick* js) {
+void PassthruButton::Update(Joystick* js) {
-  if (!BouncerUpdate()) return false;
+  if (!BouncerUpdate()) return;
   if (On()) js->PressButton(vbutton);
   else js->ReleaseButton(vbutton);
-  return true;
 }
 
 
-LatchedButton::LatchedButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux, bool analog_only) : SwitchButton(pin, vbutton, pullup, mux, analog_only) {
+LatchedButton::LatchedButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux) : SwitchButton(pin, vbutton, pullup, mux) {
   this->type = BUTTON_LATCHED_MOMENTARY;
   this->pressed = false;
 }
 
-bool LatchedButton::Update(Joystick* js) {
+void LatchedButton::Update(Joystick* js) {
-  if (!BouncerUpdate()) return false;
+  if (!BouncerUpdate()) return;
 
   if (On()) {
     if (!pressed) {
@@ -75,12 +72,10 @@ bool LatchedButton::Update(Joystick* js) {
       pressed = false;
     }
   }
-
-  return true;
 }
 
 
-PulsedButton::PulsedButton(uint8_t pin, uint8_t vbutton, bool double_action, bool split, bool pullup, Mux* mux, bool analog_only) : SwitchButton(pin, vbutton, pullup, mux, analog_only) {
+PulsedButton::PulsedButton(uint8_t pin, uint8_t vbutton, bool double_action, bool split, bool pullup, Mux* mux) : SwitchButton(pin, vbutton, pullup, mux) {
   if (double_action) {
     if (split) {
       this->type = BUTTON_PULSED_DOUBLE_ACTION_SPLIT;
@@ -93,8 +88,8 @@ PulsedButton::PulsedButton(uint8_t pin, uint8_t vbutton, bool double_action, boo
   }
 }
 
-bool PulsedButton::Update(Joystick* js) {
+void PulsedButton::Update(Joystick* js) {
-  if (!BouncerUpdate()) return false;
+  if (!BouncerUpdate()) return;
 
   switch(type) {
     case BUTTON_PULSED:
@@ -108,8 +103,6 @@ bool PulsedButton::Update(Joystick* js) {
       else js->PressButton(vbutton2);
       break;
   }
-
-  return true;
 }
 
 void PulsedButton::ReleaseButtons(Joystick* js) {
@@ -126,19 +119,11 @@ EncoderButton::EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton) : Butt
   this->last_value = encoder->read();
 }
 
-bool EncoderButton::Update(Joystick* js) {
+void EncoderButton::Update(Joystick* js) {
-  bool changed = false;
   long new_value = encoder->read();
-  if (new_value > last_value) {
+  if (new_value > last_value) js->PressButton(vbutton);
-    js->PressButton(vbutton);
+  else if (new_value < last_value) js->PressButton(vbutton2);
-    changed = true;
-  }
-  else if (new_value < last_value) {
-    js->PressButton(vbutton2);
-    changed = true;
-  }
   last_value = new_value;
-  return changed;
 }
 
 void EncoderButton::ReleaseButtons(Joystick* js) {

Button.h

@@ -25,7 +25,7 @@ enum ButtonType {
 class Button {
  public:
   Button(uint8_t vbutton);
-  virtual bool Update(Joystick* js) = 0;
+  virtual void Update(Joystick* js) = 0;
   virtual void ReleaseButtons(Joystick* js);
   ButtonType type;
 
@@ -40,7 +40,8 @@ class Button {
 //   and the multiplexer logic will be automatically invoked by Update()
 class SwitchButton : public Button {
  public:
-  SwitchButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux, bool analog_only);
+  SwitchButton(uint8_t pin, uint8_t vbutton, bool pullup, Mux* mux);
+  virtual void Update(Joystick* js) = 0;
   bool BouncerUpdate(); // returns true if the pin's status has changed
   bool On();
 
@@ -53,14 +54,14 @@ class SwitchButton : public Button {
 
 class PassthruButton : public SwitchButton {
  public:
-  PassthruButton(uint8_t pin, uint8_t vbutton, bool pullup = true, Mux* mux = NULL, bool analog_only = false);
+  PassthruButton(uint8_t pin, uint8_t vbutton, bool pullup = true, Mux* mux = NULL);
-  bool Update(Joystick* js);
+  void Update(Joystick* js);
 };
 
 class LatchedButton : public SwitchButton {
  public:
-  LatchedButton(uint8_t pin, uint8_t vbutton, bool pullup = true, Mux* mux = NULL, bool analog_only = false);
+  LatchedButton(uint8_t pin, uint8_t vbutton, bool pullup = true, Mux* mux = NULL);
-  bool Update(Joystick* js);
+  void Update(Joystick* js);
 
  protected:
   bool pressed;
@@ -68,8 +69,8 @@ class LatchedButton : public SwitchButton {
 
 class PulsedButton : public SwitchButton {
  public:
-  PulsedButton(uint8_t pin, uint8_t vbutton, bool double_action = false, bool split = false, bool pullup = true, Mux* mux = NULL, bool analog_only = false);
+  PulsedButton(uint8_t pin, uint8_t vbutton, bool double_action = false, bool split = false, bool pullup = true, Mux* mux = NULL);
-  bool Update(Joystick* js);
+  void Update(Joystick* js);
   void ReleaseButtons(Joystick* js);
 
  protected:
@@ -81,7 +82,7 @@ class PulsedButton : public SwitchButton {
 class EncoderButton : public Button {
  public:
   EncoderButton(uint8_t pin1, uint8_t pin2, uint8_t vbutton);
-  bool Update(Joystick* js);
+  void Update(Joystick* js);
   void ReleaseButtons(Joystick* js);
 
  protected:

Joystick.cpp

@@ -2,7 +2,6 @@
 #include "Button.h"
 #include <Mux.h>
 #include <Arduino.h>
-#include <stdio.h>
 
 using namespace admux;
 
@@ -40,36 +39,27 @@ void Joystick::Init() {
   delay(100);
 }
 
-void Joystick::AddButton(uint8_t pin, ButtonType type, bool pullup, Mux* mux, bool analog_only) {
+void Joystick::AddButton(uint8_t pin, ButtonType type, bool pullup, Mux* mux) {
   Button *button;
   switch (type) {
     case BUTTON_PASSTHRU:
-      button = new PassthruButton(pin, _virtual_buttons, pullup, mux, analog_only);
+      button = new PassthruButton(pin, _virtual_buttons, pullup, mux);
       _virtual_buttons++;
-      break;
     case BUTTON_PULSED:
-      button = new PulsedButton(pin, _virtual_buttons, false, false, pullup, mux, analog_only);
+      button = new PulsedButton(pin, _virtual_buttons, false, false, pullup, mux);
       _virtual_buttons++;
-      break;
     case BUTTON_PULSED_DOUBLE_ACTION:
-      button = new PulsedButton(pin, _virtual_buttons, true, false, pullup, mux, analog_only);
+      button = new PulsedButton(pin, _virtual_buttons, true, false, pullup, mux);
       _virtual_buttons++;
-      break;
     case BUTTON_PULSED_DOUBLE_ACTION_SPLIT:
-      button = new PulsedButton(pin, _virtual_buttons, true, true, pullup, mux, analog_only);
+      button = new PulsedButton(pin, _virtual_buttons, true, true, pullup, mux);
       _virtual_buttons += 2;
-      break;
     default:
       return;
   }
 
   _buttons[_num_buttons] = button;
   _num_buttons++;
-  if (_debug) {
-    char buffer[100];
-    sprintf(buffer, "Added button %d of type %d", _num_buttons - 1, button->type);
-    Serial.println(buffer);
-  }
   if (type & _BUTTON_PULSED_TYPES) _have_pulsed_button = true;
 }
 
@@ -100,12 +90,7 @@ void Joystick::Update() {
   JoyReport oldReport = _joyReport;
   
   for (uint8_t i = 0; i < _num_buttons; i++) {
-    bool changed = _buttons[i]->Update(this);
+    _buttons[i]->Update(this);
-    if (changed && _debug) {
-      char buffer[25];
-      sprintf(buffer, "Button %d changed state.", i);
-      Serial.println(buffer);
-    }
   }
 
   // TODO: implement this and also refactor it into a class or classes

Joystick.h

@@ -38,9 +38,7 @@ class Joystick {
     // Button types are documented in the ButtonType enum.
     // If `pullup` is true, your button should connect the pin to ground. (also be sure that your board supports INPUT_PULLUP on that pin)
     // If `pullup` is false, your button should connect the pin to VCC.
-    // Setting `analogOnly` to true indicates your button *must* be read with analog code, such as the A6 and A7 pins
+    void AddButton(uint8_t pin, ButtonType type, bool pullup=true, Mux* mux=NULL);
-    //   on the Arduino Nano.
-    void AddButton(uint8_t pin, ButtonType type, bool pullup=true, Mux* mux=NULL, bool analog_only=false);
 
     // Add a rotary encoder. ENCODER button types allow you to treat an encoder as a momentary button or an axis (TODO)
     void AddEncoder(uint8_t pin1, uint8_t pin2, ButtonType type);
@@ -48,8 +46,6 @@ class Joystick {
     // Add an analog axis to the joystick. THIS METHOD IS NOT CURRENTLY TESTED OR SUPPORTED. It might work, but probably not.
     void AddAxis(uint8_t pin);
 
-
-    // These members should not be used by end users; todo: remember how friend classes work
     void PressButton(uint8_t button);
     void ReleaseButton(uint8_t button);
   
@@ -70,7 +66,6 @@ class Joystick {
     uint8_t _num_axes;
     
     JoyReport _joyReport;
-
     bool _debug;
 };