Add save and restore of each pin used in reading joystick (AVR).
Allow output pin to be JS_VIRTUAL_AXIS if the axis is connected to Vcc instead of an output pin from the MCU. Fix joystick report id Fix broken v-usb hid joystick interface. Make it more resilient to unusual settings (none multiple of eight button count, 0 buttons or 0 axes) Correct adc reading for multiple axes. Piecewise range conversion for uncentered raw value range. Input, output and ground pin configuration per axis. Documentation fixes
This commit is contained in:
achol
a-chol
parent
ee43b338ea
commit
b030c45705
8 changed files with 223 additions and 38 deletions
|
|
@ -2,7 +2,11 @@
|
|||
|
||||
joystick_t joystick_status = {
|
||||
.buttons = {0},
|
||||
.axes = {0},
|
||||
.axes = {
|
||||
#if JOYSTICK_AXES_COUNT>0
|
||||
0
|
||||
#endif
|
||||
},
|
||||
.status = 0
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -16,12 +16,19 @@
|
|||
//
|
||||
#define JS_VIRTUAL_AXIS 0xFF
|
||||
|
||||
#define JOYSTICK_AXIS_VIRTUAL {JS_VIRTUAL_AXIS,JS_VIRTUAL_AXIS,JS_VIRTUAL_AXIS,0 ,1023}
|
||||
#define JOYSTICK_AXIS_IN(INPUT_PIN, LOW, REST, HIGH) {JS_VIRTUAL_AXIS,INPUT_PIN ,JS_VIRTUAL_AXIS,LOW,REST,HIGH}
|
||||
#define JOYSTICK_AXIS_IN_OUT(INPUT_PIN, OUTPUT_PIN, LOW, REST, HIGH) {OUTPUT_PIN ,INPUT_PIN ,JS_VIRTUAL_AXIS,LOW,REST,HIGH}
|
||||
#define JOYSTICK_AXIS_IN_OUT_GROUND(INPUT_PIN, OUTPUT_PIN, GROUND_PIN, LOW, REST, HIGH) {OUTPUT_PIN ,INPUT_PIN ,GROUND_PIN ,LOW,REST,HIGH}
|
||||
|
||||
typedef struct {
|
||||
uint8_t output_pin;
|
||||
uint8_t input_pin;
|
||||
uint8_t ground_pin;
|
||||
|
||||
//the AVR ADC offers 10 bit precision, with significant bits on the higher part
|
||||
uint16_t min_digit;
|
||||
uint16_t mid_digit;
|
||||
uint16_t max_digit;
|
||||
} joystick_config_t;
|
||||
|
||||
|
|
@ -36,7 +43,7 @@ typedef struct {
|
|||
|
||||
uint8_t buttons[JOYSTICK_BUTTON_COUNT/8+1];
|
||||
|
||||
int8_t axes[JOYSTICK_AXES_COUNT];
|
||||
int16_t axes[JOYSTICK_AXES_COUNT];
|
||||
uint8_t status:2;
|
||||
} joystick_t;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,12 +24,14 @@ bool process_joystick(uint16_t keycode, keyrecord_t *record){
|
|||
|
||||
__attribute__ ((weak))
|
||||
void joystick_task(void){
|
||||
if (process_joystick_analog() && (joystick_status.status & JS_UPDATED)){
|
||||
if (process_joystick_analogread() && (joystick_status.status & JS_UPDATED)){
|
||||
send_joystick_packet(&joystick_status);
|
||||
joystick_status.status &= ~JS_UPDATED;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool process_joystick_buttons(uint16_t keycode, keyrecord_t *record){
|
||||
|
||||
if (keycode < JS_BUTTON0 || keycode > JS_BUTTON_MAX){
|
||||
|
|
@ -47,33 +49,110 @@ bool process_joystick_buttons(uint16_t keycode, keyrecord_t *record){
|
|||
return true;
|
||||
}
|
||||
|
||||
uint8_t savePinState(uint8_t pin){
|
||||
#ifdef __AVR__
|
||||
uint8_t pinNumber = pin & 0xF;
|
||||
return ((PIN_ADDRESS(pin, 2) >> pinNumber) & 0x1) << 1
|
||||
| ((PIN_ADDRESS(pin, 1) >> pinNumber) & 0x1) ;
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
void restorePinState(uint8_t pin, uint8_t restoreState){
|
||||
#ifdef __AVR__
|
||||
uint8_t pinNumber = pin & 0xF;
|
||||
PIN_ADDRESS(pin, 2) = (PIN_ADDRESS(pin, 2) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber);
|
||||
PIN_ADDRESS(pin, 1) = (PIN_ADDRESS(pin, 1) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber);
|
||||
#else
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
|
||||
__attribute__ ((weak))
|
||||
bool process_joystick_analog(){
|
||||
bool process_joystick_analogread(){
|
||||
return process_joystick_analogread_quantum();
|
||||
}
|
||||
|
||||
bool process_joystick_analogread_quantum(){
|
||||
|
||||
#if JOYSTICK_AXES_COUNT > 0
|
||||
for (int axis_index=0 ; axis_index<JOYSTICK_AXES_COUNT ; ++axis_index){
|
||||
if (joystick_axes[axis_index].output_pin==JS_VIRTUAL_AXIS || joystick_axes[axis_index].input_pin==JS_VIRTUAL_AXIS){
|
||||
if (joystick_axes[axis_index].input_pin==JS_VIRTUAL_AXIS){
|
||||
continue;
|
||||
}
|
||||
|
||||
setPinOutput(joystick_axes[axis_index].output_pin);
|
||||
writePinHigh(joystick_axes[axis_index].output_pin);
|
||||
//save previous input pin status as well
|
||||
uint8_t inputSavedState = savePinState(joystick_axes[axis_index].input_pin);
|
||||
|
||||
//disable pull-up resistance
|
||||
setPinInput(joystick_axes[axis_index].input_pin);
|
||||
//disable pull-up resistor
|
||||
writePinLow(joystick_axes[axis_index].input_pin);
|
||||
|
||||
//if pin was a pull-up input, we need to uncharge it by turning it low
|
||||
// before making it a low input
|
||||
setPinOutput(joystick_axes[axis_index].input_pin);
|
||||
|
||||
wait_us(10);
|
||||
|
||||
//save and apply output pin status
|
||||
uint8_t outputSavedState = 0;
|
||||
if (joystick_axes[axis_index].output_pin!=JS_VIRTUAL_AXIS) {
|
||||
//save previous output pin status
|
||||
outputSavedState = savePinState(joystick_axes[axis_index].output_pin);
|
||||
|
||||
setPinOutput(joystick_axes[axis_index].output_pin);
|
||||
writePinHigh(joystick_axes[axis_index].output_pin);
|
||||
}
|
||||
|
||||
uint8_t groundSavedState = 0;
|
||||
if (joystick_axes[axis_index].ground_pin!=JS_VIRTUAL_AXIS) {
|
||||
//save previous output pin status
|
||||
groundSavedState = savePinState(joystick_axes[axis_index].ground_pin);
|
||||
|
||||
setPinOutput(joystick_axes[axis_index].ground_pin);
|
||||
writePinLow(joystick_axes[axis_index].ground_pin);
|
||||
}
|
||||
|
||||
wait_us(10);
|
||||
|
||||
setPinInput(joystick_axes[axis_index].input_pin);
|
||||
|
||||
wait_us(10);
|
||||
|
||||
#ifdef __AVR__
|
||||
int16_t axis_val = analogReadPin(joystick_axes[axis_index].input_pin);
|
||||
#else
|
||||
int16_t axis_val = 0;
|
||||
//default to resting position
|
||||
int16_t axis_val = joystick_axes[axis_index].mid_digit;
|
||||
#endif
|
||||
if (axis_val!=joystick_status.axes[axis_index]){
|
||||
joystick_status.axes[axis_index] = axis_val;
|
||||
|
||||
//test the converted value against the lower range
|
||||
uint16_t ref = joystick_axes[axis_index].mid_digit;
|
||||
uint16_t range = joystick_axes[axis_index].min_digit;
|
||||
int16_t ranged_val = -127*fminf(1.f, (axis_val - (float)(ref)) /(range - (float)ref));
|
||||
if (ranged_val > 0){
|
||||
//the value is in the higher range
|
||||
range = joystick_axes[axis_index].max_digit;
|
||||
ranged_val = 127*fminf(1.f, (axis_val - (float)(ref)) /(range - (float)ref));
|
||||
}
|
||||
|
||||
if (ranged_val!=joystick_status.axes[axis_index]){
|
||||
joystick_status.axes[axis_index] = ranged_val;
|
||||
joystick_status.status |= JS_UPDATED;
|
||||
}
|
||||
|
||||
writePinLow(joystick_axes[axis_index].output_pin);
|
||||
//restore output, ground and input status
|
||||
if (joystick_axes[axis_index].output_pin!=JS_VIRTUAL_AXIS) {
|
||||
restorePinState(joystick_axes[axis_index].output_pin, outputSavedState);
|
||||
}
|
||||
if (joystick_axes[axis_index].ground_pin!=JS_VIRTUAL_AXIS) {
|
||||
restorePinState(joystick_axes[axis_index].ground_pin, groundSavedState);
|
||||
}
|
||||
|
||||
restorePinState(joystick_axes[axis_index].input_pin, inputSavedState);
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ bool process_joystick(uint16_t keycode, keyrecord_t *record);
|
|||
|
||||
void joystick_task(void);
|
||||
|
||||
bool process_joystick_analog(void);
|
||||
bool process_joystick_analogread(void);
|
||||
bool process_joystick_analogread_quantum(void);
|
||||
|
||||
#endif //PROCESS_JOYSTICK_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue