ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The other required set of changes

Browse source 
As per the PR, the changes still holding it up.
Add onekey for testing.
Fix ARM builds.
Fix device descriptor when either axes or buttons is zero.
Add compile-time check for at least one axis or button.
Move definition to try to fix conflict.
PR review comments.
qmk cformat
This commit is contained in:
Nick Brassel 2020-01-10 06:29:34 +11:00 • committed by a-chol
parent d88bdc6a1b
commit 801be60473
18 changed files with 455 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

55
quantum/joystick.h
View file

@ -1,55 +1,52 @@
#ifndef JOYSTICK_H
#define JOYSTICK_H
#pragma once
#ifndef JOYSTICK_BUTTON_COUNT
#define JOYSTICK_BUTTON_COUNT 8
# define JOYSTICK_BUTTON_COUNT 8
#endif
#ifndef JOYSTICK_AXES_COUNT
#define JOYSTICK_AXES_COUNT 4
# define JOYSTICK_AXES_COUNT 4
#endif
#include <stdint.h>
//configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
// configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
// to prevent it from being read from the ADC. This allows outputing forged axis value.
//
#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}
#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;
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;
extern joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT];
enum joystick_status{
JS_INITIALIZED = 1,
JS_UPDATED = 2
};
enum joystick_status { JS_INITIALIZED = 1, JS_UPDATED = 2 };
typedef struct {
uint8_t buttons[JOYSTICK_BUTTON_COUNT/8+1];
int16_t axes[JOYSTICK_AXES_COUNT];
uint8_t status:2;
uint8_t buttons[JOYSTICK_BUTTON_COUNT / 8 + 1];
int16_t axes[JOYSTICK_AXES_COUNT];
uint8_t status : 2;
} joystick_t;
extern joystick_t joystick_status;
//to be implemented in the hid protocol library
// to be implemented in the hid protocol library
void send_joystick_packet(joystick_t* joystick);
#endif //JOYSTICK_H