Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
c9f192bae8
7 changed files with 9 additions and 15 deletions
|
@ -15,4 +15,3 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "aball.h"
|
#include "aball.h"
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
|
|
||||||
|
|
|
@ -18,12 +18,4 @@
|
||||||
|
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
/* This is a shortcut to help you visually see your layout.
|
#define LAYOUT(k00) {{ k00 }}
|
||||||
*
|
|
||||||
* The first section contains all of the arguments representing the physical
|
|
||||||
* layout of the board and position of the keys.
|
|
||||||
*
|
|
||||||
* The second converts the arguments into a two-dimensional array which
|
|
||||||
* represents the switch matrix.
|
|
||||||
*/
|
|
||||||
#define LAYOUT(k00) {{ KC_NO }}
|
|
||||||
|
|
|
@ -15,4 +15,5 @@
|
||||||
*/
|
*/
|
||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
// Dummy
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
|
||||||
|
|
|
@ -20,4 +20,5 @@
|
||||||
|
|
||||||
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
|
// safe range starts at `PLOOPY_SAFE_RANGE` instead.
|
||||||
|
|
||||||
// placeholder file so it will compile
|
// Dummy
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
|
||||||
|
|
|
@ -24,6 +24,9 @@ uint8_t lock_state = 0;
|
||||||
int8_t delta_x = 0;
|
int8_t delta_x = 0;
|
||||||
int8_t delta_y = 0;
|
int8_t delta_y = 0;
|
||||||
|
|
||||||
|
// Dummy
|
||||||
|
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) {
|
||||||
delta_x += x;
|
delta_x += x;
|
||||||
|
|
|
@ -48,8 +48,6 @@
|
||||||
# define PLOOPY_DPI_DEFAULT 2
|
# define PLOOPY_DPI_DEFAULT 2
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
|
|
||||||
|
|
||||||
keyboard_config_t keyboard_config;
|
keyboard_config_t keyboard_config;
|
||||||
uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS;
|
uint16_t dpi_array[] = PLOOPY_DPI_OPTIONS;
|
||||||
#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
|
#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
#define LAYOUT(k00) {{ KC_NO }}
|
#define LAYOUT(k00) {{ k00 }}
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
uint32_t raw;
|
uint32_t raw;
|
||||||
|
|
Loading…
Reference in a new issue