Further refactoring of joystick feature (#18437)
This commit is contained in:
		
							parent
							
								
									fb400f2ac2
								
							
						
					
					
						commit
						be8907d634
					
				
					 12 changed files with 248 additions and 309 deletions
				
			
		| 
						 | 
				
			
			@ -10,11 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
 | 
			
		||||
void matrix_scan_user() {
 | 
			
		||||
    int16_t val = (((uint32_t)timer_read() % 5000 - 2500) * 255) / 5000;
 | 
			
		||||
 | 
			
		||||
    if (val != joystick_status.axes[1]) {
 | 
			
		||||
        joystick_status.axes[1] = val;
 | 
			
		||||
        joystick_status.status |= JS_UPDATED;
 | 
			
		||||
    }
 | 
			
		||||
    joystick_set_axis(1, val);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Joystick config
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,8 +3,6 @@
 | 
			
		|||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
#include "joystick.h"
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = LAYOUT_all(
 | 
			
		||||
                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
 | 
			
		||||
| 
						 | 
				
			
			@ -24,11 +22,8 @@ joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
 | 
			
		|||
 | 
			
		||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
 | 
			
		||||
    joystick_position += (clockwise ? 2 : -2) * (full_joystick_value / pulses_per_revolution);  // +2 and -2 are used, since +1.0 and -1.0 axis output refers to positions at half of a full rotation
 | 
			
		||||
    joystick_set_axis(0, joystick_position);
 | 
			
		||||
 | 
			
		||||
    if (joystick_position != joystick_status.axes[0]) {
 | 
			
		||||
        joystick_status.axes[0] = joystick_position;
 | 
			
		||||
        joystick_status.status |= JS_UPDATED;
 | 
			
		||||
    }
 | 
			
		||||
    return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue