Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
6a8df58887
3 changed files with 3 additions and 3 deletions
|
@ -16,4 +16,4 @@
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
// Dummy
|
// Dummy
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
|
||||||
|
|
|
@ -21,4 +21,4 @@
|
||||||
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
|
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
|
||||||
|
|
||||||
// Dummy
|
// Dummy
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
|
||||||
|
|
|
@ -25,7 +25,7 @@ int8_t delta_x = 0;
|
||||||
int8_t delta_y = 0;
|
int8_t delta_y = 0;
|
||||||
|
|
||||||
// Dummy
|
// Dummy
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
|
||||||
|
|
||||||
void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) {
|
void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) {
|
||||||
if (scroll_enabled) {
|
if (scroll_enabled) {
|
||||||
|
|
Loading…
Reference in a new issue