summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-19 15:42:23 +0000
committerQMK Bot <hello@qmk.fm>2021-08-19 15:42:23 +0000
commit2ff1a6a72f2c160969bdea51bfa156a56ed968af (patch)
treedb4145c1d312cd263b7ae0cdaddf8df61d4cda6c /keyboards
parent7a125872e23c03804efe68646e1c877a3774f17d (diff)
parentd6eee3e0f2d14d53445fe334dd2b4f4b30c21f47 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/pistachio_mp/config.h4
-rw-r--r--keyboards/pistachio_mp/keymaps/via/keymap.c76
-rw-r--r--keyboards/pistachio_mp/keymaps/via/readme.md1
-rw-r--r--keyboards/pistachio_mp/keymaps/via/rules.mk1
-rw-r--r--keyboards/pistachio_pro/keymaps/default/readme.md2
-rw-r--r--keyboards/pistachio_pro/keymaps/rate/readme.md2
-rw-r--r--keyboards/pistachio_pro/keymaps/via/readme.md2
7 files changed, 83 insertions, 5 deletions
diff --git a/keyboards/pistachio_mp/config.h b/keyboards/pistachio_mp/config.h
index f23530a12c..4da866bb7d 100644
--- a/keyboards/pistachio_mp/config.h
+++ b/keyboards/pistachio_mp/config.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xD0C3
+#define VENDOR_ID 0x5255
+#define PRODUCT_ID 0xE212
#define DEVICE_VER 0x0001
#define MANUFACTURER rate
#define PRODUCT pistachio_mp
diff --git a/keyboards/pistachio_mp/keymaps/via/keymap.c b/keyboards/pistachio_mp/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e3592ffa6d
--- /dev/null
+++ b/keyboards/pistachio_mp/keymaps/via/keymap.c
@@ -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
diff --git a/keyboards/pistachio_mp/keymaps/via/readme.md b/keyboards/pistachio_mp/keymaps/via/readme.md
new file mode 100644
index 0000000000..b768049ccc
--- /dev/null
+++ b/keyboards/pistachio_mp/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for pistachio_mp
diff --git a/keyboards/pistachio_mp/keymaps/via/rules.mk b/keyboards/pistachio_mp/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/pistachio_mp/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/pistachio_pro/keymaps/default/readme.md b/keyboards/pistachio_pro/keymaps/default/readme.md
index 2bc50be9dd..bf313ec19d 100644
--- a/keyboards/pistachio_pro/keymaps/default/readme.md
+++ b/keyboards/pistachio_pro/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for pistachio_mp
+# The default keymap for pistachio_pro
diff --git a/keyboards/pistachio_pro/keymaps/rate/readme.md b/keyboards/pistachio_pro/keymaps/rate/readme.md
index b355dced23..c7049b67ce 100644
--- a/keyboards/pistachio_pro/keymaps/rate/readme.md
+++ b/keyboards/pistachio_pro/keymaps/rate/readme.md
@@ -1 +1 @@
-# The rate's keymap for pistachio_mp
+# The rate's keymap for pistachio_pro
diff --git a/keyboards/pistachio_pro/keymaps/via/readme.md b/keyboards/pistachio_pro/keymaps/via/readme.md
index b768049ccc..e2f4b9f6b2 100644
--- a/keyboards/pistachio_pro/keymaps/via/readme.md
+++ b/keyboards/pistachio_pro/keymaps/via/readme.md
@@ -1 +1 @@
-# The via keymap for pistachio_mp
+# The via keymap for pistachio_pro