Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
@@ -14,10 +14,11 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT_pad(
|
||||
KC_PGUP,
|
||||
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
|
||||
KC_KP_7, KC_KP_8, KC_KP_9, MO(1),
|
||||
KC_P4, KC_P5, KC_P6, KC_KP_PLUS,
|
||||
KC_P1, KC_P2, KC_P3, KC_KP_MINUS,
|
||||
KC_P0, KC_PDOT,KC_DELETE, KC_KP_ENTER),
|
||||
@@ -40,17 +41,3 @@ bool oled_task_user(void) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||
if (index == 0) { /* First encoder */
|
||||
if (clockwise) {
|
||||
tap_code(KC_PGDN);
|
||||
} else {
|
||||
tap_code(KC_PGUP);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
void matrix_init_user(void) { render_logo(); }
|
||||
|
Reference in New Issue
Block a user