summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-06-09 01:46:47 +0000
committerQMK Bot <hello@qmk.fm>2023-06-09 01:46:47 +0000
commit4c60ebdbe0560d40cdcbfde8688cafc6a83c899d (patch)
tree3cdc175295e23ad6231271fa741c952556f446c5
parent806b61c2f71c085de73a93493a6624b5699d63cc (diff)
parent232281946d1baab9db4da3f5f6da210792c4c184 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/planck/readme.md2
-rw-r--r--keyboards/planck/rev6_drop/matrix.c159
-rw-r--r--keyboards/planck/rev6_drop/rules.mk2
-rw-r--r--keyboards/planck/rev7/chconf.h29
-rw-r--r--keyboards/planck/rev7/config.h53
-rw-r--r--keyboards/planck/rev7/halconf.h24
-rw-r--r--keyboards/planck/rev7/info.json322
-rw-r--r--keyboards/planck/rev7/keymaps/default/config.h49
-rw-r--r--keyboards/planck/rev7/keymaps/default/keymap.c315
-rw-r--r--keyboards/planck/rev7/keymaps/default/rules.mk1
-rw-r--r--keyboards/planck/rev7/matrix.c173
-rw-r--r--keyboards/planck/rev7/mcuconf.h51
-rw-r--r--keyboards/planck/rev7/readme.md31
-rw-r--r--keyboards/planck/rev7/rev7.c74
-rw-r--r--keyboards/planck/rev7/rules.mk9
15 files changed, 1164 insertions, 130 deletions
diff --git a/keyboards/planck/readme.md b/keyboards/planck/readme.md
index 748c251478..797774dc0a 100644
--- a/keyboards/planck/readme.md
+++ b/keyboards/planck/readme.md
@@ -6,7 +6,7 @@ Planck
A compact 40% (12x4) ortholinear keyboard kit made and sold by OLKB and Massdrop. [More info on qmk.fm](http://qmk.fm/planck/)
Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)
-Hardware Supported: Planck PCB rev1, rev2, rev3, rev4, rev5, rev6; Planck Light, Planck EZ
+Hardware Supported: Planck PCB rev1, rev2, rev3, rev4, rev5, rev6, rev7; Planck Light, Planck EZ
Hardware Availability: [OLKB.com](https://olkb.com), [Massdrop](https://www.massdrop.com/buy/planck-mechanical-keyboard?mode=guest_open), [Ergodox (Planck EZ)](https://ergodox-ez.com/pages/planck)
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c
index 6f7d6725a1..fae7de179c 100644
--- a/keyboards/planck/rev6_drop/matrix.c
+++ b/keyboards/planck/rev6_drop/matrix.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 Jack Humbert <jack.humb@gmail.com>
+ * Copyright 2018-2023 Jack Humbert <jack.humb@gmail.com>
*
* 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
@@ -17,155 +17,58 @@
#include "quantum.h"
-#ifndef DEBOUNCE
-# define DEBOUNCE 5
-#endif
-
-/*
- * col: { B11, B10, B2, B1, A7, B0 }
- * row: { A10, A9, A8, B15, C13, C14, C15, A2 }
- */
/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_COLS];
-static bool debouncing = false;
-static uint16_t debouncing_time = 0;
-
-__attribute__((weak)) void matrix_init_user(void) {}
+static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static pin_t matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-__attribute__((weak)) void matrix_scan_user(void) {}
+static matrix_row_t matrix_inverted[MATRIX_COLS];
-__attribute__((weak)) void matrix_init_kb(void) {
- matrix_init_user();
-}
+void matrix_init_custom(void) {
+ // actual matrix setup - cols
+ for (int i = 0; i < MATRIX_COLS; i++) {
+ setPinOutput(matrix_col_pins[i]);
+ }
-__attribute__((weak)) void matrix_scan_kb(void) {
- matrix_scan_user();
+ // rows
+ for (int i = 0; i < MATRIX_ROWS; i++) {
+ setPinInputLow(matrix_row_pins[i]);
+ }
}
-void matrix_init(void) {
- dprintf("matrix init\n");
- // debug_matrix = true;
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ bool changed = false;
- // actual matrix setup
- palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
-
- palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOB, 15, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
- palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
-
- memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
- memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
-
- matrix_init_kb();
-}
-
-uint8_t matrix_scan(void) {
// actual matrix
for (int col = 0; col < MATRIX_COLS; col++) {
matrix_row_t data = 0;
- // strobe col { B11, B10, B2, B1, A7, B0 }
- switch (col) {
- case 0:
- palSetPad(GPIOB, 11);
- break;
- case 1:
- palSetPad(GPIOB, 10);
- break;
- case 2:
- palSetPad(GPIOB, 2);
- break;
- case 3:
- palSetPad(GPIOB, 1);
- break;
- case 4:
- palSetPad(GPIOA, 7);
- break;
- case 5:
- palSetPad(GPIOB, 0);
- break;
- }
+ // strobe col
+ writePinHigh(matrix_col_pins[col]);
// need wait to settle pin state
wait_us(20);
- // read row data { A10, A9, A8, B15, C13, C14, C15, A2 }
- data = ((palReadPad(GPIOA, 10) << 0) | (palReadPad(GPIOA, 9) << 1) | (palReadPad(GPIOA, 8) << 2) | (palReadPad(GPIOB, 15) << 3) | (palReadPad(GPIOC, 13) << 4) | (palReadPad(GPIOC, 14) << 5) | (palReadPad(GPIOC, 15) << 6) | (palReadPad(GPIOA, 2) << 7));
-
- // unstrobe col { B11, B10, B2, B1, A7, B0 }
- switch (col) {
- case 0:
- palClearPad(GPIOB, 11);
- break;
- case 1:
- palClearPad(GPIOB, 10);
- break;
- case 2:
- palClearPad(GPIOB, 2);
- break;
- case 3:
- palClearPad(GPIOB, 1);
- break;
- case 4:
- palClearPad(GPIOA, 7);
- break;
- case 5:
- palClearPad(GPIOB, 0);
- break;
+ // read row data
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ data |= (readPin(matrix_row_pins[row]) << row);
}
- if (matrix_debouncing[col] != data) {
- matrix_debouncing[col] = data;
- debouncing = true;
- debouncing_time = timer_read();
- }
- }
+ // unstrobe col
+ writePinLow(matrix_col_pins[col]);
- if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
- for (int row = 0; row < MATRIX_ROWS; row++) {
- matrix[row] = 0;
- for (int col = 0; col < MATRIX_COLS; col++) {
- matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
- }
+ if (matrix_inverted[col] != data) {
+ matrix_inverted[col] = data;
}
- debouncing = false;
}
- matrix_scan_kb();
-
- return 1;
-}
-
-bool matrix_is_on(uint8_t row, uint8_t col) {
- return (matrix[row] & (1 << col));
-}
-
-matrix_row_t matrix_get_row(uint8_t row) {
- return matrix[row];
-}
-
-void matrix_print(void) {
- dprintf("\nr/c 01234567\n");
- for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- dprintf("%X0: ", row);
- matrix_row_t data = matrix_get_row(row);
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ matrix_row_t old = current_matrix[row];
+ current_matrix[row] = 0;
for (int col = 0; col < MATRIX_COLS; col++) {
- if (data & (1 << col))
- dprintf("1");
- else
- dprintf("0");
+ current_matrix[row] |= ((matrix_inverted[col] & (1 << row) ? 1 : 0) << col);
}
- dprintf("\n");
+ changed |= old != current_matrix[row];
}
+
+ return changed;
}
diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk
index e20d33831d..3eb3eac7eb 100644
--- a/keyboards/planck/rev6_drop/rules.mk
+++ b/keyboards/planck/rev6_drop/rules.mk
@@ -10,7 +10,7 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = yes # Audio output
-CUSTOM_MATRIX = yes
+CUSTOM_MATRIX = lite
# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
RGB_MATRIX_ENABLE = no
ENCODER_ENABLE = yes
diff --git a/keyboards/planck/rev7/chconf.h b/keyboards/planck/rev7/chconf.h
new file mode 100644
index 0000000000..e1243f23ec
--- /dev/null
+++ b/keyboards/planck/rev7/chconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/planck/rev6/chconf.h -r platforms/chibios/QMK_PROTON_C/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_RESOLUTION 16
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#include_next <chconf.h>
+
diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h
new file mode 100644
index 0000000000..3da5a4e6b9
--- /dev/null
+++ b/keyboards/planck/rev7/config.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 Jack Humbert <jack.humb@gmail.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#define DIP_SWITCH_PINS \
+ { B14, A15, A0, B9 }
+
+#define MUSIC_MAP
+#undef AUDIO_VOICES
+#undef AUDIO_PIN
+#define AUDIO_PIN A5
+#define AUDIO_PIN_ALT A4
+#define AUDIO_PIN_ALT_AS_NEGATIVE
+
+#define WS2812_PWM_DRIVER PWMD2
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_DMA_CHANNEL 2
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
diff --git a/keyboards/planck/rev7/halconf.h b/keyboards/planck/rev7/halconf.h
new file mode 100644
index 0000000000..6da795fada
--- /dev/null
+++ b/keyboards/planck/rev7/halconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 QMK
+ *
+ * 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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_PWM TRUE
+#define HAL_USE_GPT TRUE
+#define HAL_USE_DAC TRUE
+#define HAL_USE_I2C TRUE
+#define HAL_USE_WDG TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
new file mode 100644
index 0000000000..e4d7433423
--- /dev/null
+++ b/keyboards/planck/rev7/info.json
@@ -0,0 +1,322 @@
+{
+ "keyboard_name": "Planck",
+ "manufacturer": "Drop",
+ "url": "https://olkb.com/planck",
+ "maintainer": "jackhumbert",
+ "usb": {
+ "vid": "0x03A8",
+ "pid": "0xA4F9",
+ "device_version": "0.0.7"
+ },
+ "ws2812": {
+ "pin": "A1",
+ "driver": "pwm"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "A7", "B0"],
+ "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B12", "pin_b": "B13"}
+ ]
+ },
+ "features": {
+ "audio": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "rgblight": {
+ "led_count": 9
+ },
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["ortho_4x12", "planck_mit"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12",
+ "LAYOUT_planck_grid": "LAYOUT_ortho_4x12",
+ "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC"
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [4, 0], "x": 6, "y": 0 },
+ { "matrix": [4, 1], "x": 7, "y": 0 },
+ { "matrix": [4, 2], "x": 8, "y": 0 },
+ { "matrix": [4, 3], "x": 9, "y": 0 },
+ { "matrix": [4, 4], "x": 10, "y": 0 },
+ { "matrix": [4, 5], "x": 11, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [5, 0], "x": 6, "y": 1 },
+ { "matrix": [5, 1], "x": 7, "y": 1 },
+ { "matrix": [5, 2], "x": 8, "y": 1 },
+ { "matrix": [5, 3], "x": 9, "y": 1 },
+ { "matrix": [5, 4], "x": 10, "y": 1 },
+ { "matrix": [5, 5], "x": 11, "y": 1 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [6, 0], "x": 6, "y": 2 },
+ { "matrix": [6, 1], "x": 7, "y": 2 },
+ { "matrix": [6, 2], "x": 8, "y": 2 },
+ { "matrix": [6, 3], "x": 9, "y": 2 },
+ { "matrix": [6, 4], "x": 10, "y": 2 },
+ { "matrix": [6, 5], "x": 11, "y": 2 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [7, 3], "x": 3, "y": 3 },
+ { "matrix": [7, 4], "x": 4, "y": 3 },
+ { "matrix": [7, 5], "x": 5, "y": 3 },
+ { "matrix": [7, 0], "x": 6, "y": 3 },
+ { "matrix": [7, 1], "x": 7, "y": 3 },
+ { "matrix": [7, 2], "x": 8, "y": 3 },
+ { "matrix": [3, 3], "x": 9, "y": 3 },
+ { "matrix": [3, 4], "x": 10, "y": 3 },
+ { "matrix": [3, 5], "x": 11, "y": 3 }
+ ]
+ },
+ "LAYOUT_planck_1x2uC": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [4, 0], "x": 6, "y": 0 },
+ { "matrix": [4, 1], "x": 7, "y": 0 },
+ { "matrix": [4, 2], "x": 8, "y": 0 },
+ { "matrix": [4, 3], "x": 9, "y": 0 },
+ { "matrix": [4, 4], "x": 10, "y": 0 },
+ { "matrix": [4, 5], "x": 11, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [5, 0], "x": 6, "y": 1 },
+ { "matrix": [5, 1], "x": 7, "y": 1 },
+ { "matrix": [5, 2], "x": 8, "y": 1 },
+ { "matrix": [5, 3], "x": 9, "y": 1 },
+ { "matrix": [5, 4], "x": 10, "y": 1 },
+ { "matrix": [5, 5], "x": 11, "y": 1 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [6, 0], "x": 6, "y": 2 },
+ { "matrix": [6, 1], "x": 7, "y": 2 },
+ { "matrix": [6, 2], "x": 8, "y": 2 },
+ { "matrix": [6, 3], "x": 9, "y": 2 },
+ { "matrix": [6, 4], "x": 10, "y": 2 },
+ { "matrix": [6, 5], "x": 11, "y": 2 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [7, 3], "x": 3, "y": 3 },
+ { "matrix": [7, 4], "x": 4, "y": 3 },
+ { "matrix": [7, 0], "x": 5, "y": 3, "w": 2 },
+ { "matrix": [7, 1], "x": 7, "y": 3 },
+ { "matrix": [7, 2], "x": 8, "y": 3 },
+ { "matrix": [3, 3], "x": 9, "y": 3 },
+ { "matrix": [3, 4], "x": 10, "y": 3 },
+ { "matrix": [3, 5], "x": 11, "y": 3 }
+ ]
+ },
+ "LAYOUT_planck_1x2uL": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [4, 0], "x": 6, "y": 0 },
+ { "matrix": [4, 1], "x": 7, "y": 0 },
+ { "matrix": [4, 2], "x": 8, "y": 0 },
+ { "matrix": [4, 3], "x": 9, "y": 0 },
+ { "matrix": [4, 4], "x": 10, "y": 0 },
+ { "matrix": [4, 5], "x": 11, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [5, 0], "x": 6, "y": 1 },
+ { "matrix": [5, 1], "x": 7, "y": 1 },
+ { "matrix": [5, 2], "x": 8, "y": 1 },
+ { "matrix": [5, 3], "x": 9, "y": 1 },
+ { "matrix": [5, 4], "x": 10, "y": 1 },
+ { "matrix": [5, 5], "x": 11, "y": 1 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [6, 0], "x": 6, "y": 2 },
+ { "matrix": [6, 1], "x": 7, "y": 2 },
+ { "matrix": [6, 2], "x": 8, "y": 2 },
+ { "matrix": [6, 3], "x": 9, "y": 2 },
+ { "matrix": [6, 4], "x": 10, "y": 2 },
+ { "matrix": [6, 5], "x": 11, "y": 2 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [7, 3], "x": 3, "y": 3 },
+ { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+ { "matrix": [7, 0], "x": 6, "y": 3 },
+ { "matrix": [7, 1], "x": 7, "y": 3 },
+ { "matrix": [7, 2], "x": 8, "y": 3 },
+ { "matrix": [3, 3], "x": 9, "y": 3 },
+ { "matrix": [3, 4], "x": 10, "y": 3 },
+ { "matrix": [3, 5], "x": 11, "y": 3 }
+ ]
+ },
+ "LAYOUT_planck_1x2uR": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [4, 0], "x": 6, "y": 0 },
+ { "matrix": [4, 1], "x": 7, "y": 0 },
+ { "matrix": [4, 2], "x": 8, "y": 0 },
+ { "matrix": [4, 3], "x": 9, "y": 0 },
+ { "matrix": [4, 4], "x": 10, "y": 0 },
+ { "matrix": [4, 5], "x": 11, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [5, 0], "x": 6, "y": 1 },
+ { "matrix": [5, 1], "x": 7, "y": 1 },
+ { "matrix": [5, 2], "x": 8, "y": 1 },
+ { "matrix": [5, 3], "x": 9, "y": 1 },
+ { "matrix": [5, 4], "x": 10, "y": 1 },
+ { "matrix": [5, 5], "x": 11, "y": 1 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [6, 0], "x": 6, "y": 2 },
+ { "matrix": [6, 1], "x": 7, "y": 2 },
+ { "matrix": [6, 2], "x": 8, "y": 2 },
+ { "matrix": [6, 3], "x": 9, "y": 2 },
+ { "matrix": [6, 4], "x": 10, "y": 2 },
+ { "matrix": [6, 5], "x": 11, "y": 2 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [7, 3], "x": 3, "y": 3 },
+ { "matrix": [7, 4], "x": 4, "y": 3 },
+ { "matrix": [7, 5], "x": 5, "y": 3 },
+ { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+ { "matrix": [7, 2], "x": 8, "y": 3 },
+ { "matrix": [3, 3], "x": 9, "y": 3 },
+ { "matrix": [3, 4], "x": 10, "y": 3 },
+ { "matrix": [3, 5], "x": 11, "y": 3 }
+ ]
+ },
+ "LAYOUT_planck_2x2u": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [4, 0], "x": 6, "y": 0 },
+ { "matrix": [4, 1], "x": 7, "y": 0 },
+ { "matrix": [4, 2], "x": 8, "y": 0 },
+ { "matrix": [4, 3], "x": 9, "y": 0 },
+ { "matrix": [4, 4], "x": 10, "y": 0 },
+ { "matrix": [4, 5], "x": 11, "y": 0 },
+
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [5, 0], "x": 6, "y": 1 },
+ { "matrix": [5, 1], "x": 7, "y": 1 },
+ { "matrix": [5, 2], "x": 8, "y": 1 },
+ { "matrix": [5, 3], "x": 9, "y": 1 },
+ { "matrix": [5, 4], "x": 10, "y": 1 },
+ { "matrix": [5, 5], "x": 11, "y": 1 },
+
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [6, 0], "x": 6, "y": 2 },
+ { "matrix": [6, 1], "x": 7, "y": 2 },
+ { "matrix": [6, 2], "x": 8, "y": 2 },
+ { "matrix": [6, 3], "x": 9, "y": 2 },
+ { "matrix": [6, 4], "x": 10, "y": 2 },
+ { "matrix": [6, 5], "x": 11, "y": 2 },
+
+ { "matrix": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [7, 3], "x": 3, "y": 3 },
+ { "matrix": [7, 5], "x": 4, "y": 3, "w": 2 },
+ { "matrix": [7, 1], "x": 6, "y": 3, "w": 2 },
+ { "matrix": [7, 2], "x": 8, "y": 3 },
+ { "matrix": [3, 3], "x": 9, "y": 3 },
+ { "matrix": [3, 4], "x": 10, "y": 3 },
+ { "matrix": [3, 5], "x": 11, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/planck/rev7/keymaps/default/config.h b/keyboards/planck/rev7/keymaps/default/config.h
new file mode 100644
index 0000000000..c3de26365b
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/default/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2015-2023 Jack Humbert
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+# define STARTUP_SONG SONG(PLANCK_SOUND)
+// #define STARTUP_SONG SONG(NO_SOUND)
+
+# define DEFAULT_LAYER_SONGS \
+ { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+ - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+ - MIDI notes can be added to the keymap
+ - Octave shift and transpose
+ - Virtual sustain, portamento, and modulation wheel
+ - etc.
+*/
+// #define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+// #define MIDI_TONE_KEYCODE_OCTAVES 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/rev7/keymaps/default/keymap.c b/keyboards/planck/rev7/keymaps/default/keymap.c
new file mode 100644
index 0000000000..37d7ba0d23
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/default/keymap.c
@@ -0,0 +1,315 @@
+/* Copyright 2015-2023 Jack Humbert
+ *
+ * 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
+
+enum planck_layers { _QWERTY, _COLEMAK, _DVORAK, _LOWER, _RAISE, _PLOVER, _ADJUST };
+
+enum planck_keycodes { QWERTY = SAFE_RANGE, COLEMAK, DVORAK, PLOVER, BACKLIT, EXT_PLV };
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+/* clang-format off */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc | A | S | D | F | G | H | J | K | L | ; | ' |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
+ BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_RSFT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | F | P | G | J | L | U | Y | ; | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc | A | R | S | T | D | H | N | E | I | O | ' |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| Z | X | C | V | B | K | M | , | . | / |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
+ KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
+ BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_RSFT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | ' | , | . | P | Y | F | G | C | R | L | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc | A | O | E | U | I | D | H | T | N | S | / |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| ; | Q | J | K | X | B | M | W | V | Z |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_planck_grid(
+ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
+ KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
+ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
+ BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_RSFT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO ~ |ISO | | Home | End | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * | # | # | # | # | # | # | # | # | # | # | # | # |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | S | T | P | H | * | * | F | P | L | T | D |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | S | K | W | R | * | * | R | B | G | S | Z |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit | | | A | O | | E | U | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_planck_grid(
+ KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 ,
+ XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,
+ XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ EXT_PLV, XXXXXXX, XXXXXXX, KC_C, KC_V, XXXXXXX, XXXXXXX, KC_N, KC_M, XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ * v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * | | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover| |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+ _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, EE_CLR, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
+ _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+/* clang-format on */
+
+#ifdef AUDIO_ENABLE
+float plover_song[][2] = SONG(PLOVER_SOUND);
+float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+ return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case QWERTY:
+ if (record->event.pressed) {
+ print("mode just switched to qwerty and this is a huge string\n");
+ set_single_persistent_default_layer(_QWERTY);
+ }
+ return false;
+ break;
+ case COLEMAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_COLEMAK);
+ }
+ return false;
+ break;
+ case DVORAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_DVORAK);
+ }
+ return false;
+ break;
+ case BACKLIT:
+ if (record->event.pressed) {
+ register_code(KC_RSFT);
+#ifdef BACKLIGHT_ENABLE
+ backlight_step();
+#endif
+#ifdef KEYBOARD_planck_rev5
+ writePinLow(E6);
+#endif
+ } else {
+ unregister_code(KC_RSFT);
+#ifdef KEYBOARD_planck_rev5
+ writePinHigh(E6);
+#endif
+ }
+ return false;
+ break;
+ case PLOVER:
+ if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+ stop_all_notes();
+ PLAY_SONG(plover_song);
+#endif
+ layer_off(_RAISE);
+ layer_off(_LOWER);
+ layer_off(_ADJUST);
+ layer_on(_PLOVER);
+ if (!eeconfig_is_enabled()) {
+ eeconfig_init();
+ }
+ keymap_config.raw = eeconfig_read_keymap();
+ keymap_config.nkro = 1;
+ eeconfig_update_keymap(keymap_config.raw);
+ }
+ return false;
+ break;
+ case EXT_PLV:
+ if (record->event.pressed) {
+#ifdef AUDIO_ENABLE
+ PLAY_SONG(plover_gb_song);
+#endif
+ layer_off(_PLOVER);
+ }
+ return false;
+ break;
+ }
+ return true;
+}
+
+/* clang-format off */
+float melody[8][2][2] = {
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+ {{440.0f, 8}, {440.0f, 24}},
+};
+/* clang-format on */
+
+#define JUST_MINOR_THIRD 1.2
+#define JUST_MAJOR_THIRD 1.25
+#define JUST_PERFECT_FOURTH 1.33333333
+#define JUST_TRITONE 1.42222222
+#define JUST_PERFECT_FIFTH 1.33333333
+
+#define ET12_MINOR_SECOND 1.059463
+#define ET12_MAJOR_SECOND 1.122462
+#define ET12_MINOR_THIRD 1.189207
+#define ET12_MAJOR_THIRD 1.259921
+#define ET12_PERFECT_FOURTH 1.33484
+#define ET12_TRITONE 1.414214
+#define ET12_PERFECT_FIFTH 1.498307
+
+deferred_token tokens[8];
+
+uint32_t reset_note(uint32_t trigger_time, void *note) {
+ *(float*)note = 440.0f;
+ return 0;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ cancel_deferred_exec(tokens[index]);
+ if (clockwise) {
+ melody[index][1][0] = melody[index][1][0] * ET12_MINOR_SECOND;
+ melody[index][0][0] = melody[index][1][0] / ET12_PERFECT_FIFTH;
+ audio_play_melody(&melody[index], 2, false);
+ } else {
+ melody[index][1][0] = melody[index][1][0] / ET12_MINOR_SECOND;
+ melody[index][0][0] = melody[index][1][0] * ET12_TRITONE;
+ audio_play_melody(&melody[index], 2, false);
+ }
+ tokens[index] = defer_exec(1000, reset_note, &melody[index][1][0]);
+ return false;
+}
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+ switch (index) {
+ case 0: {
+#ifdef AUDIO_ENABLE
+ static bool play_sound = false;
+#endif
+ if (active) {
+#ifdef AUDIO_ENABLE
+ if (play_sound) {
+ PLAY_SONG(plover_song);
+ }
+#endif
+ layer_on(_ADJUST);
+ } else {
+#ifdef AUDIO_ENABLE
+ if (play_sound) {
+ PLAY_SONG(plover_gb_song);
+ }
+#endif
+ layer_off(_ADJUST);
+ }
+#ifdef AUDIO_ENABLE
+ play_sound = true;
+#endif
+ break;
+ }
+ }
+ return true;
+} \ No newline at end of file
diff --git a/keyboards/planck/rev7/keymaps/default/rules.mk b/keyboards/planck/rev7/keymaps/default/rules.mk
new file mode 100644
index 0000000000..13fc199bb6
--- /dev/null
+++ b/keyboards/planck/rev7/keymaps/default/rules.mk
@@ -0,0 +1 @@
+DEFERRED_EXEC_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c
new file mode 100644
index 0000000000..6b45d61861
--- /dev/null
+++ b/keyboards/planck/rev7/matrix.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2018-2023 Jack Humbert <jack.humb@gmail.com>
+ *
+ * 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 "gpio.h"
+#include "hal_pal.h"
+#include "hal_pal_lld.h"
+#include "quantum.h"
+
+// STM32-specific watchdog config calculations
+// timeout = 31.25us * PR * (RL + 1)
+#define _STM32_IWDG_LSI(us) ((us) / 31.25)
+#define STM32_IWDG_PR_US(us) (uint8_t)(log(_STM32_IWDG_LSI(us)) / log(2) - 11)
+#define STM32_IWDG_PR_MS(s) STM32_IWDG_PR_US(s * 1000.0)
+#define STM32_IWDG_PR_S(s) STM32_IWDG_PR_US(s * 1000000.0)
+#define _STM32_IWDG_SCALAR(us) (2 << ((uint8_t)STM32_IWDG_PR_US(us) + 1))
+#define STM32_IWDG_RL_US(us) (uint64_t)(_STM32_IWDG_LSI(us)) / _STM32_IWDG_SCALAR(us)
+#define STM32_IWDG_RL_MS(s) STM32_IWDG_RL_US(s * 1000.0)
+#define STM32_IWDG_RL_S(s) STM32_IWDG_RL_US(s * 1000000.0)
+
+/* matrix state(1:on, 0:off) */
+static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static pin_t matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static matrix_row_t matrix_inverted[MATRIX_COLS];
+
+int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
+uint8_t encoder_state[8] = {0};
+int8_t encoder_pulses[8] = {0};
+uint8_t encoder_value[8] = {0};
+
+void matrix_init_custom(void) {
+ // actual matrix setup - cols
+ for (int i = 0; i < MATRIX_COLS; i++) {
+ setPinOutput(matrix_col_pins[i]);
+ }
+
+ // rows
+ for (int i = 0; i < MATRIX_ROWS; i++) {
+ setPinInputLow(matrix_row_pins[i]);
+ }
+
+ // encoder A & B setup
+ setPinInputLow(B12);
+ setPinInputLow(B13);
+
+ // setup watchdog timer for 1 second
+ wdgInit();
+
+ static WDGConfig wdgcfg;
+ wdgcfg.pr = STM32_IWDG_PR_S(1.0);
+ wdgcfg.rlr = STM32_IWDG_RL_S(1.0);
+ wdgcfg.winr = STM32_IWDG_WIN_DISABLED;
+ wdgStart(&WDGD1, &wdgcfg);
+}
+
+bool encoder_update(uint8_t index, uint8_t state) {
+ bool changed = false;
+ uint8_t i = index;
+
+ encoder_pulses[i] += encoder_LUT[state & 0xF];
+
+ if (encoder_pulses[i] >= ENCODER_RESOLUTION) {
+ encoder_value[index]++;
+ changed = true;
+#ifdef ENCODER_MAP_ENABLE
+ encoder_exec_mapping(index, false);
+#else // ENCODER_MAP_ENABLE
+ encoder_update_kb(index, false);
+#endif // ENCODER_MAP_ENABLE
+ }
+ if (encoder_pulses[i] <= -ENCODER_RESOLUTION) {
+ encoder_value[index]--;
+ changed = true;
+#ifdef ENCODER_MAP_ENABLE
+ encoder_exec_mapping(index, true);
+#else // ENCODER_MAP_ENABLE
+ encoder_update_kb(index, true);
+#endif // ENCODER_MAP_ENABLE
+ }
+ encoder_pulses[i] %= ENCODER_RESOLUTION;
+#ifdef ENCODER_DEFAULT_POS
+ encoder_pulses[i] = 0;
+#endif
+ return changed;
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ // reset watchdog
+ wdgReset(&WDGD1);
+
+ bool changed = false;
+
+ // actual matrix
+ for (int col = 0; col < MATRIX_COLS; col++) {
+ matrix_row_t data = 0;
+
+ // strobe col
+ writePinHigh(matrix_col_pins[col]);
+
+ // need wait to settle pin state
+ wait_us(20);
+
+ // read row data
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ data |= (readPin(matrix_row_pins[row]) << row);
+ }
+
+ // unstrobe col
+ writePinLow(matrix_col_pins[col]);
+
+ if (matrix_inverted[col] != data) {
+ matrix_inverted[col] = data;
+ }
+ }
+
+ for (int row = 0; row < MATRIX_ROWS; row++) {
+ matrix_row_t old = current_matrix[row];
+ current_matrix[row] = 0;
+ for (int col = 0; col < MATRIX_COLS; col++) {
+ current_matrix[row] |= ((matrix_inverted[col] & (1 << row) ? 1 : 0) << col);
+ }
+ changed |= old != current_matrix[row];
+ }
+
+ // encoder-matrix functionality
+
+ // set up C/rows for encoder read
+ for (int i = 0; i < MATRIX_ROWS; i++) {
+ setPinOutput(matrix_row_pins[i]);
+ writePinHigh(matrix_row_pins[i]);
+ }
+
+ // set up A & B for reading
+ setPinInputHigh(B12);
+ setPinInputHigh(B13);
+
+ for (int i = 0; i < MATRIX_ROWS; i++) {
+ writePinLow(matrix_row_pins[i]);
+ wait_us(10);
+ uint8_t new_status = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1);
+ if ((encoder_state[i] & 0x3) != new_status) {
+ encoder_state[i] <<= 2;
+ encoder_state[i] |= new_status;
+ encoder_update(i, encoder_state[i]);
+ }
+ writePinHigh(matrix_row_pins[i]);
+ }
+
+ // revert A & B to matrix state
+ setPinInputLow(B12);
+ setPinInputLow(B13);
+
+ // revert C/rows to matrix state
+ for (int i = 0; i < MATRIX_ROWS; i++) {
+ setPinInputLow(matrix_row_pins[i]);
+ }
+
+ return changed;
+}
diff --git a/keyboards/planck/rev7/mcuconf.h b/keyboards/planck/rev7/mcuconf.h
new file mode 100644
index 0000000000..fa3d3be885
--- /dev/null
+++ b/keyboards/planck/rev7/mcuconf.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 QMK Contributors
+ *
+ * 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 3 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/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
+// on the Planck requires the use of TIM2 to run PWM -- rework which timers are
+// allocated for PWM usage.
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_DAC_USE_DAC1_CH1
+#define STM32_DAC_USE_DAC1_CH1 TRUE
+#undef STM32_DAC_USE_DAC1_CH2
+#define STM32_DAC_USE_DAC1_CH2 TRUE
+#undef STM32_GPT_USE_TIM6
+#define STM32_GPT_USE_TIM6 TRUE
+#undef STM32_GPT_USE_TIM7
+#define STM32_GPT_USE_TIM7 TRUE
+#undef STM32_GPT_USE_TIM8
+#define STM32_GPT_USE_TIM8 TRUE
+
+// As mentioned above, we need to reallocate the SysTick timer used from
+// TIM2 to TIM3.
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 3
+
+// enable i2c
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+// use the watchdog timer
+#undef STM32_WDG_USE_IWDG
+#define STM32_WDG_USE_IWDG TRUE
+#undef STM32_IWDG_IS_WINDOWED
+#define STM32_IWDG_IS_WINDOWED TRUE
diff --git a/keyboards/planck/rev7/readme.md b/keyboards/planck/rev7/readme.md
new file mode 100644
index 0000000000..f41ec9afd5
--- /dev/null
+++ b/keyboards/planck/rev7/readme.md
@@ -0,0 +1,31 @@
+# Planck
+
+A compact 40% (12x4) ortholinear keyboard kit designed by OLKB and sold by Drop. A complete hardware rework of the rev6 Planck PCB, with support for up to 8 rotary encoders. [More info on qmk.fm](http://qmk.fm/planck/)
+
+* Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)
+* Hardware Supported: Planck PCB rev7
+* Hardware Availability: [Drop](https://drop.com/buy/planck-mechanical-keyboard?mode=guest_open)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make planck/rev7:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Encoders
+
+Encoders much have matching pulse & detent resolutions (e.g. 24/24) for the scanning to work properly. Multiple encoders can be used at the same time, and are zero-indexed (compared to being one-indexed on the PCB's silkscreen) in the `encoder_update_user(index, clockwise)` function:
+
+```
+,-----------------------------------------------------------------------------------.
+| 0 | | | | | | | | | | | 4 |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| 1 | | | | | | | | | | | 5 |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| 2 | | | | | | | | | | | 6 |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| 3 | | | | | | | | | | 7 |
+`-----------------------------------------------------------------------------------'
+```
+
+If an encoder has a switch built-in, it's connected to the key at that location. On the default keymap, each encoder will play its own rising/falling tone sequence when rotated, and will reset the pitch after one second of inactivity. \ No newline at end of file
diff --git a/keyboards/planck/rev7/rev7.c b/keyboards/planck/rev7/rev7.c
new file mode 100644
index 0000000000..bb9d0ee1e8
--- /dev/null
+++ b/keyboards/planck/rev7/rev7.c
@@ -0,0 +1,74 @@
+/* Copyright 2023 Jack Humbert <jack.humb@gmail.com>
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+ // Key Matrix to LED Index
+ { NO_LED, 6, NO_LED, NO_LED, 5, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 0 },
+ { NO_LED, 7, NO_LED, NO_LED, 2, NO_LED },
+ { NO_LED, 4, NO_LED, NO_LED, 3, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+ { NO_LED, 1, NO_LED, NO_LED, 8, NO_LED },
+}, {
+ // LED Index to Physical Position
+ {112, 39}, {148, 60}, {206, 53}, {206, 3}, {150, 3}, {74, 3}, {18, 3}, {18, 54}, {77, 60}
+}, {
+ // LED Index to Flag
+ LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+ LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+} };
+
+// LED physical location index
+// 6 5 4 3
+// 0
+// 7 8 1 2
+
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
+const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+ {{5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
+ {{5, 5}, {4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}},
+ {{5, 6}, {4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
+ {{5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+
+ {{5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+ {{5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+ {{5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+ {{5, 7}, {4, 7}, {3, 7}, {2, 7}, {1, 7}, {0, 7}},
+};
+
+# ifdef ENCODER_MAP_ENABLE
+const uint8_t PROGMEM encoder_hand_swap_config[NUM_ENCODERS] = {0};
+# endif
+#endif
+
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ {36, 37, 38, 39, 40, 41},
+ {24, 25, 26, 27, 28, 29},
+ {12, 13, 14, 15, 16, 17},
+ { 0, 1, 2, 9, 10, 11},
+ {42, 43, 44, 45, 46, 47},
+ {30, 31, 32, 33, 34, 35},
+ {18, 19, 20, 21, 22, 23},
+ { 6, 7, 8, 3, 4, 5}
+};
diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk
new file mode 100644
index 0000000000..38710bc00b
--- /dev/null
+++ b/keyboards/planck/rev7/rules.mk
@@ -0,0 +1,9 @@
+# Build Options
+# change yes to no to disable
+#
+CUSTOM_MATRIX = lite
+DIP_SWITCH_ENABLE = yes
+
+SRC += matrix.c
+
+LAYOUTS_HAS_RGB = no