.gitignore

@@ -1,2 +0,0 @@
-*.elf
-*.hex

Joystick.cpp

@@ -17,7 +17,7 @@ bool operator !=(JoyReport a, JoyReport b){
 
 Joystick::Joystick(bool debug) {
   _debug = debug;
-  _virtual_buttons = 0;
+  _last_button_index = 0;
   _num_axes = 0;
   _have_pulsed_button = false;
   
@@ -38,23 +38,23 @@ void Joystick::AddButton(uint8_t pin, ButtonType type, bool pullup) {
 
   Button button;
   button.type = type;
-  button.inverted = pullup;
   button.bouncer.attach(pin, mode);
+  uint8_t index = _last_button_index + 1;
   uint8_t increment = 1;
-  button.vbutton0 = _virtual_buttons;
+  button.index0 = index;
 
   if (type == BUTTON_PULSED_DOUBLE_ACTION_SPLIT) {
     increment = 2;
-    button.vbutton1 = _virtual_buttons + 1;
+    button.index1 = index + 1;
   }
 
-  if (_virtual_buttons + increment > JOYSTICK_NUM_BUTTONS) {
+  if (_last_button_index + increment > JOYSTICK_NUM_BUTTONS) {
       // todo: fail here
   }
 
   _buttons[_num_buttons] = button;
   _num_buttons++;
-  _virtual_buttons += increment;
+  _last_button_index += increment;
 
   if (type & _BUTTON_PULSED_TYPES) _have_pulsed_button = true;
 }
@@ -112,8 +112,8 @@ void Joystick::ReleaseAllButtons() {
 void Joystick::_ReleasePulsedButtons() {
   for (uint8_t i = 0; i < _num_buttons; i++ ) {
     Button button = _buttons[i];
-    if (button.type & _BUTTON_PULSED_TYPES) ReleaseButton(button.vbutton0);
-    if (button.type & BUTTON_PULSED_DOUBLE_ACTION_SPLIT) ReleaseButton(button.vbutton1);
+    if (button.type & _BUTTON_PULSED_TYPES) ReleaseButton(button.index0);
+    if (button.type & BUTTON_PULSED_DOUBLE_ACTION_SPLIT) ReleaseButton(button.index1);
   }
 }
 
@@ -139,33 +139,29 @@ void Joystick::Write() {
 void Joystick::_UpdateButton(uint8_t button_num) {
   Button *button = &_buttons[button_num];
   bool changed = button->bouncer.update();
-  if (!changed) return;
-
-  bool on = button->bouncer.rose();
-  if (button->inverted) on = button->bouncer.fell();
 
   switch (button->type) {
     case BUTTON_PASSTHRU:
-      if (on) PressButton(button->vbutton0);
-      else ReleaseButton(button->vbutton0);
+      if (button->bouncer.rose()) PressButton(button->index0);
+      else if (button->bouncer.fell()) ReleaseButton(button->index0);
       break;
     case BUTTON_PULSED:
-      if (on) PressButton(button->vbutton0);
+      if (button->bouncer.rose()) PressButton(button->index0);
       break;
     case BUTTON_PULSED_DOUBLE_ACTION:
-      PressButton(button->vbutton0);
+      if (changed) PressButton(button->index0);
       break;
     case BUTTON_PULSED_DOUBLE_ACTION_SPLIT:
-      if (on) PressButton(button->vbutton0);
-      else PressButton(button->vbutton1);
+      if (button->bouncer.rose()) PressButton(button->index0);
+      else if (button->bouncer.fell()) PressButton(button->index1);
       break;
     case BUTTON_LATCHED_MOMENTARY:
-      if (on) {
+      if (button->bouncer.rose()) {
         if (!button->pressed) {
-          PressButton(button->vbutton0);
+          PressButton(button->index0);
           button->pressed = true;
         } else {
-          ReleaseButton(button->vbutton0);
+          ReleaseButton(button->index0);
           button->pressed = false;
         }
       }

Joystick.h

@@ -31,8 +31,8 @@ struct JoyReport {
 struct Button {
   ButtonType type;
   Bounce bouncer;
-  uint8_t vbutton0;
-  uint8_t vbutton1; // only used by BUTTON_PULSED_DOUBLE_ACTION_SPLIT
+  uint8_t index0;
+  uint8_t index1; // only used by BUTTON_PULSED_DOUBLE_ACTION_SPLIT
   bool pressed = false; // only used by BUTTON_LATCHED_MOMENTARY
   bool inverted = false; // if true, send button press on release and vice versa.
 };
@@ -64,7 +64,7 @@ class Joystick {
     
     Button _buttons[JOYSTICK_NUM_BUTTONS];
     uint8_t _num_buttons;
-    uint8_t _virtual_buttons; // a single user-defined button can have multiple virtual buttons.
+    uint8_t _last_button_index; // a single physical button can have multiple logical buttons. _last_button_index tracks the number of logical / virtual buttons we have defined.
     bool _have_pulsed_button;
 
     uint8_t _axes[JOYSTICK_NUM_AXES];

examples/type_test/Makefile

@@ -1,8 +0,0 @@
-TARGET_BOARD=arduino:avr:uno
-COM_PORT=/dev/ttyACM0
-
-build:
-	arduino-cli compile -b ${TARGET_BOARD}
-
-upload:
-	arduino-cli upload -b ${TARGET_BOARD} -p ${COM_PORT}