mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-10-31 13:22:31 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						61ed48edc3
					
				| @ -18,7 +18,6 @@ | |||||||
| 
 | 
 | ||||||
| /* joystick configuration */ | /* joystick configuration */ | ||||||
| #define JOYSTICK_BUTTON_COUNT 25 | #define JOYSTICK_BUTTON_COUNT 25 | ||||||
| #define JOYSTICK_AXIS_COUNT 2 |  | ||||||
| #define JOYSTICK_AXIS_RESOLUTION 10 | #define JOYSTICK_AXIS_RESOLUTION 10 | ||||||
| 
 | 
 | ||||||
| /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | ||||||
|  | |||||||
| @ -1,4 +1,3 @@ | |||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #define JOYSTICK_AXIS_COUNT 2 |  | ||||||
| #define JOYSTICK_BUTTON_COUNT 1 | #define JOYSTICK_BUTTON_COUNT 1 | ||||||
|  | |||||||
| @ -16,11 +16,6 @@ | |||||||
| 
 | 
 | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| /* joystick support */ |  | ||||||
| #ifdef JOYSTICK_ENABLE |  | ||||||
| #   define JOYSTICK_AXIS_COUNT 2 |  | ||||||
| #define JOYSTICK_BUTTON_COUNT 1 | #define JOYSTICK_BUTTON_COUNT 1 | ||||||
| #   define JOYSTICK_AXIS_RESOLUTION 8 |  | ||||||
| #endif |  | ||||||
| 
 | 
 | ||||||
| #define SPLIT_USB_DETECT | #define SPLIT_USB_DETECT | ||||||
|  | |||||||
| @ -22,6 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | |||||||
| #include "keycode.h" | #include "keycode.h" | ||||||
| #include "util.h" | #include "util.h" | ||||||
| 
 | 
 | ||||||
|  | #ifdef JOYSTICK_ENABLE | ||||||
|  | #    include "joystick.h" | ||||||
|  | #endif | ||||||
|  | 
 | ||||||
| // clang-format off
 | // clang-format off
 | ||||||
| 
 | 
 | ||||||
| /* HID report IDs */ | /* HID report IDs */ | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 QMK Bot
						QMK Bot