annabunches/arduino-joystick
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile-time errors, which necessitated some refactoring of the interface.

Browse Source
This commit is contained in:
Anna Rose
2021-11-02 23:17:25 +00:00
parent 5c2a2736dc
commit fbd786fe96
4 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Joystick.cpp
View File

@ -1,6 +1,6 @@
#include "Joystick.h"
#include <Arduino.h>
#include <Mux.h>
#include <Arduino.h>
using namespace admux;
@ -40,6 +40,17 @@ void Joystick::Init() {
}
void Joystick::AddButton(uint8_t pin, ButtonType type, bool pullup) {
_BuildButton(pin, type, pullup);
}
void Joystick::AddMuxButton(uint8_t pin, uint8_t mux_id, uint8_t mux_channel, ButtonType type, bool pullup) {
Button *button = _BuildButton(pin, type, pullup);
button->mux = true;
button->mux_id = mux_id;
button->mux_channel = mux_channel;
}
Button* Joystick::_BuildButton(uint8_t pin, ButtonType type, bool pullup) {
uint8_t mode;
if (pullup) mode = INPUT_PULLUP;
else mode = INPUT;
@ -65,6 +76,8 @@ void Joystick::AddButton(uint8_t pin, ButtonType type, bool pullup) {
_virtual_buttons += increment;
if (type & _BUTTON_PULSED_TYPES) _have_pulsed_button = true;
return &button;
}
void Joystick::AddAxis(uint8_t pin) {
@ -72,18 +85,14 @@ void Joystick::AddAxis(uint8_t pin) {
_num_axes++;
}
void Joystick::AddMux(uint8_t signal_pin, uint8_t addr_pins[], uint8_t addr_width, bool pullup=true) {
Pinset pins;
for (uint8_t i = 0; i < addr_width; i++) {
pins.pins[i] = addr_pins[i];
}
pins.m_size = addr_width;
uint8_t Joystick::AddMux(uint8_t signal_pin, Pinset addr_pins, bool pullup) {
uint8_t mux_id = _num_mux;
uint8_t mode = INPUT_PULLUP;
if (!pullup) mode = INPUT;
Mux mux(Pin(signal_pin, mode, PinType::Digital), pins);
_mux[_num_mux] = mux;
Mux mux(Pin(signal_pin, mode, PinType::Digital), addr_pins);
_mux[mux_id] = &mux;
_num_mux++;
return mux_id;
}
void Joystick::Update() {
@ -161,7 +170,7 @@ void Joystick::Write() {
void Joystick::_UpdateButton(uint8_t button_num) {
Button *button = &_buttons[button_num];
if (button->mux) {
_mux[button->mux_id].channel(button->mux_channel);
_mux[button->mux_id]->channel(button->mux_channel);
}
bool changed = button->bouncer.update();
if (!changed) return;