Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2021-08-19 15:42:23 +00:00
commit 2ff1a6a72f
7 changed files with 83 additions and 5 deletions

View File

@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h" #include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED #define VENDOR_ID 0x5255
#define PRODUCT_ID 0xD0C3 #define PRODUCT_ID 0xE212
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER rate #define MANUFACTURER rate
#define PRODUCT pistachio_mp #define PRODUCT pistachio_mp

View File

@ -0,0 +1,76 @@
/* Copyright 2020 rate
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
// Defines names for use in layer keycodes and the keymap
enum layer_names {
_BASE = 0,
_FN,
_RESERVE_0,
_RESERVE_1
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT(
KC_MPLY,
LT(_FN, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3,
KC_P0, KC_PDOT, KC_PENT
),
/* Fn */
[_FN] = LAYOUT(
KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
RGB_HUI, RGB_SAI, RGB_VAI,
RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG,
KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO
),
/* Reserve */
[_RESERVE_0] = LAYOUT(
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
/* Reserve */
[_RESERVE_1] = LAYOUT(
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS
),
};
#ifdef ENCODER_ENABLE
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
// Volume control
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
}
return true;
}
#endif

View File

@ -0,0 +1 @@
# The via keymap for pistachio_mp

View File

@ -0,0 +1 @@
VIA_ENABLE = yes

View File

@ -1 +1 @@
# The default keymap for pistachio_mp # The default keymap for pistachio_pro

View File

@ -1 +1 @@
# The rate's keymap for pistachio_mp # The rate's keymap for pistachio_pro

View File

@ -1 +1 @@
# The via keymap for pistachio_mp # The via keymap for pistachio_pro