aboutsummaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-08-29 22:57:48 +0000
committerQMK Bot <hello@qmk.fm>2020-08-29 22:57:48 +0000
commita3db72df7299140e52f57d082a3742a8b480a226 (patch)
tree41d62db0fecd2eb0aeae1744b52e677555e55288 /quantum/process_keycode
parent000eb14d789f84afc7dbd33955dbfb6481792f0b (diff)
downloadqmk_firmware-a3db72df7299140e52f57d082a3742a8b480a226.tar.gz
qmk_firmware-a3db72df7299140e52f57d082a3742a8b480a226.zip
format code according to conventions [skip ci]
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_auto_shift.c35
-rw-r--r--quantum/process_keycode/process_combo.c4
-rw-r--r--quantum/process_keycode/process_joystick.c42
3 files changed, 37 insertions, 44 deletions
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index 330037cef..b1267922c 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -41,34 +41,34 @@ void autoshift_flush(void) {
41} 41}
42 42
43void autoshift_on(uint16_t keycode) { 43void autoshift_on(uint16_t keycode) {
44 autoshift_time = timer_read(); 44 autoshift_time = timer_read();
45 autoshift_lastkey = keycode; 45 autoshift_lastkey = keycode;
46} 46}
47 47
48void autoshift_toggle(void) { 48void autoshift_toggle(void) {
49 if (autoshift_enabled) { 49 if (autoshift_enabled) {
50 autoshift_enabled = false; 50 autoshift_enabled = false;
51 autoshift_flush(); 51 autoshift_flush();
52 } else { 52 } else {
53 autoshift_enabled = true; 53 autoshift_enabled = true;
54 } 54 }
55} 55}
56 56
57void autoshift_enable(void) { autoshift_enabled = true; } 57void autoshift_enable(void) { autoshift_enabled = true; }
58void autoshift_disable(void) { 58void autoshift_disable(void) {
59 autoshift_enabled = false; 59 autoshift_enabled = false;
60 autoshift_flush(); 60 autoshift_flush();
61} 61}
62 62
63#ifndef AUTO_SHIFT_NO_SETUP 63# ifndef AUTO_SHIFT_NO_SETUP
64void autoshift_timer_report(void) { 64void autoshift_timer_report(void) {
65 char display[8]; 65 char display[8];
66 66
67 snprintf(display, 8, "\n%d\n", autoshift_timeout); 67 snprintf(display, 8, "\n%d\n", autoshift_timeout);
68 68
69 send_string((const char *)display); 69 send_string((const char *)display);
70} 70}
71#endif 71# endif
72 72
73bool get_autoshift_state(void) { return autoshift_enabled; } 73bool get_autoshift_state(void) { return autoshift_enabled; }
74 74
@@ -79,7 +79,6 @@ void set_autoshift_timeout(uint16_t timeout) { autoshift_timeout = timeout; }
79bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { 79bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
80 if (record->event.pressed) { 80 if (record->event.pressed) {
81 switch (keycode) { 81 switch (keycode) {
82
83 case KC_ASTG: 82 case KC_ASTG:
84 autoshift_toggle(); 83 autoshift_toggle();
85 return true; 84 return true;
@@ -92,10 +91,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
92 return true; 91 return true;
93 92
94# ifndef AUTO_SHIFT_NO_SETUP 93# ifndef AUTO_SHIFT_NO_SETUP
95 case KC_ASUP: 94 case KC_ASUP:
96 autoshift_timeout += 5; 95 autoshift_timeout += 5;
97 return true; 96 return true;
98 case KC_ASDN: 97 case KC_ASDN:
99 autoshift_timeout -= 5; 98 autoshift_timeout -= 5;
100 return true; 99 return true;
101 100
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 1f715f43b..f38d7d47a 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -27,7 +27,7 @@ extern int COMBO_LEN;
27__attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {} 27__attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
28 28
29static uint16_t timer = 0; 29static uint16_t timer = 0;
30static uint16_t current_combo_index = 0; 30static uint16_t current_combo_index = 0;
31static bool drop_buffer = false; 31static bool drop_buffer = false;
32static bool is_active = false; 32static bool is_active = false;
33static bool b_combo_enable = true; // defaults to enabled 33static bool b_combo_enable = true; // defaults to enabled
@@ -82,7 +82,7 @@ static inline void dump_key_buffer(bool emit) {
82 } while (0) 82 } while (0)
83 83
84static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) { 84static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record) {
85 uint8_t count = 0; 85 uint8_t count = 0;
86 uint16_t index = -1; 86 uint16_t index = -1;
87 /* Find index of keycode and number of combo keys */ 87 /* Find index of keycode and number of combo keys */
88 for (const uint16_t *keys = combo->keys;; ++count) { 88 for (const uint16_t *keys = combo->keys;; ++count) {
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index c12f75685..5778a7434 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -17,8 +17,7 @@ bool process_joystick(uint16_t keycode, keyrecord_t *record) {
17 return true; 17 return true;
18} 18}
19 19
20__attribute__((weak)) 20__attribute__((weak)) void joystick_task(void) {
21void joystick_task(void) {
22 if (process_joystick_analogread() && (joystick_status.status & JS_UPDATED)) { 21 if (process_joystick_analogread() && (joystick_status.status & JS_UPDATED)) {
23 send_joystick_packet(&joystick_status); 22 send_joystick_packet(&joystick_status);
24 joystick_status.status &= ~JS_UPDATED; 23 joystick_status.status &= ~JS_UPDATED;
@@ -47,16 +46,11 @@ uint16_t savePinState(pin_t pin) {
47 return ((PORTx_ADDRESS(pin) >> pinNumber) & 0x1) << 1 | ((DDRx_ADDRESS(pin) >> pinNumber) & 0x1); 46 return ((PORTx_ADDRESS(pin) >> pinNumber) & 0x1) << 1 | ((DDRx_ADDRESS(pin) >> pinNumber) & 0x1);
48#elif defined(PROTOCOL_CHIBIOS) 47#elif defined(PROTOCOL_CHIBIOS)
49 /* 48 /*
50 The pin configuration is backed up in the following format : 49 The pin configuration is backed up in the following format :
51 bit 15 9 8 7 6 5 4 3 2 1 0 50 bit 15 9 8 7 6 5 4 3 2 1 0
52 |unused|ODR|IDR|PUPDR|OSPEEDR|OTYPER|MODER| 51 |unused|ODR|IDR|PUPDR|OSPEEDR|OTYPER|MODER|
53 */ 52 */
54 return (( PAL_PORT(pin)->MODER >> (2*PAL_PAD(pin))) & 0x3) 53 return ((PAL_PORT(pin)->MODER >> (2 * PAL_PAD(pin))) & 0x3) | (((PAL_PORT(pin)->OTYPER >> (1 * PAL_PAD(pin))) & 0x1) << 2) | (((PAL_PORT(pin)->OSPEEDR >> (2 * PAL_PAD(pin))) & 0x3) << 3) | (((PAL_PORT(pin)->PUPDR >> (2 * PAL_PAD(pin))) & 0x3) << 5) | (((PAL_PORT(pin)->IDR >> (1 * PAL_PAD(pin))) & 0x1) << 7) | (((PAL_PORT(pin)->ODR >> (1 * PAL_PAD(pin))) & 0x1) << 8);
55 | (((PAL_PORT(pin)->OTYPER >> (1*PAL_PAD(pin))) & 0x1) << 2)
56 | (((PAL_PORT(pin)->OSPEEDR >> (2*PAL_PAD(pin))) & 0x3) << 3)
57 | (((PAL_PORT(pin)->PUPDR >> (2*PAL_PAD(pin))) & 0x3) << 5)
58 | (((PAL_PORT(pin)->IDR >> (1*PAL_PAD(pin))) & 0x1) << 7)
59 | (((PAL_PORT(pin)->ODR >> (1*PAL_PAD(pin))) & 0x1) << 8);
60#else 54#else
61 return 0; 55 return 0;
62#endif 56#endif
@@ -68,12 +62,12 @@ void restorePinState(pin_t pin, uint16_t restoreState) {
68 PORTx_ADDRESS(pin) = (PORTx_ADDRESS(pin) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber); 62 PORTx_ADDRESS(pin) = (PORTx_ADDRESS(pin) & ~_BV(pinNumber)) | (((restoreState >> 1) & 0x1) << pinNumber);
69 DDRx_ADDRESS(pin) = (DDRx_ADDRESS(pin) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber); 63 DDRx_ADDRESS(pin) = (DDRx_ADDRESS(pin) & ~_BV(pinNumber)) | ((restoreState & 0x1) << pinNumber);
70#elif defined(PROTOCOL_CHIBIOS) 64#elif defined(PROTOCOL_CHIBIOS)
71 PAL_PORT(pin)->MODER = (PAL_PORT(pin)->MODER & ~(0x3<< (2*PAL_PAD(pin)))) | (restoreState & 0x3) << (2*PAL_PAD(pin)); 65 PAL_PORT(pin)->MODER = (PAL_PORT(pin)->MODER & ~(0x3 << (2 * PAL_PAD(pin)))) | (restoreState & 0x3) << (2 * PAL_PAD(pin));
72 PAL_PORT(pin)->OTYPER = (PAL_PORT(pin)->OTYPER & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>2) & 0x1) << (1*PAL_PAD(pin)); 66 PAL_PORT(pin)->OTYPER = (PAL_PORT(pin)->OTYPER & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 2) & 0x1) << (1 * PAL_PAD(pin));
73 PAL_PORT(pin)->OSPEEDR= (PAL_PORT(pin)->OSPEEDR & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>3) & 0x3) << (2*PAL_PAD(pin)); 67 PAL_PORT(pin)->OSPEEDR = (PAL_PORT(pin)->OSPEEDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 3) & 0x3) << (2 * PAL_PAD(pin));
74 PAL_PORT(pin)->PUPDR = (PAL_PORT(pin)->PUPDR & ~(0x3<< (2*PAL_PAD(pin)))) | ((restoreState>>5) & 0x3) << (2*PAL_PAD(pin)); 68 PAL_PORT(pin)->PUPDR = (PAL_PORT(pin)->PUPDR & ~(0x3 << (2 * PAL_PAD(pin)))) | ((restoreState >> 5) & 0x3) << (2 * PAL_PAD(pin));
75 PAL_PORT(pin)->IDR = (PAL_PORT(pin)->IDR & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>7) & 0x1) << (1*PAL_PAD(pin)); 69 PAL_PORT(pin)->IDR = (PAL_PORT(pin)->IDR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 7) & 0x1) << (1 * PAL_PAD(pin));
76 PAL_PORT(pin)->ODR = (PAL_PORT(pin)->ODR & ~(0x1<< (1*PAL_PAD(pin)))) | ((restoreState>>8) & 0x1) << (1*PAL_PAD(pin)); 70 PAL_PORT(pin)->ODR = (PAL_PORT(pin)->ODR & ~(0x1 << (1 * PAL_PAD(pin)))) | ((restoreState >> 8) & 0x1) << (1 * PAL_PAD(pin));
77#else 71#else
78 return; 72 return;
79#endif 73#endif
@@ -132,21 +126,21 @@ bool process_joystick_analogread_quantum() {
132 int16_t axis_val = joystick_axes[axis_index].mid_digit; 126 int16_t axis_val = joystick_axes[axis_index].mid_digit;
133# endif 127# endif
134 128
135 //test the converted value against the lower range 129 // test the converted value against the lower range
136 int32_t ref = joystick_axes[axis_index].mid_digit; 130 int32_t ref = joystick_axes[axis_index].mid_digit;
137 int32_t range = joystick_axes[axis_index].min_digit; 131 int32_t range = joystick_axes[axis_index].min_digit;
138 int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref) ; 132 int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref);
139 133
140 if (ranged_val > 0) { 134 if (ranged_val > 0) {
141 //the value is in the higher range 135 // the value is in the higher range
142 range = joystick_axes[axis_index].max_digit; 136 range = joystick_axes[axis_index].max_digit;
143 ranged_val = ((axis_val - ref) * 127) / (range - ref); 137 ranged_val = ((axis_val - ref) * 127) / (range - ref);
144 } 138 }
145 139
146 //clamp the result in the valid range 140 // clamp the result in the valid range
147 ranged_val = ranged_val < -127 ? -127 : ranged_val; 141 ranged_val = ranged_val < -127 ? -127 : ranged_val;
148 ranged_val = ranged_val > 127 ? 127 : ranged_val; 142 ranged_val = ranged_val > 127 ? 127 : ranged_val;
149 143
150 if (ranged_val != joystick_status.axes[axis_index]) { 144 if (ranged_val != joystick_status.axes[axis_index]) {
151 joystick_status.axes[axis_index] = ranged_val; 145 joystick_status.axes[axis_index] = ranged_val;
152 joystick_status.status |= JS_UPDATED; 146 joystick_status.status |= JS_UPDATED;