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

keyboards/evancookaudio/sleepingdinosaur/config.h

@@ -37,8 +37,8 @@
 
 /* key matrix pins */
 
-#define MATRIX_ROW_PINS {D0, D1, D4, C6, D7}
+#define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3}
+#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4}
 
 #define UNUSED_PINS {B2, B6, B7, D5, C7, F1, F0, B4, E6}
 

keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c

@@ -0,0 +1,61 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,-----------------------------------------------.
+ * |   1   |   2   |   3   |   4   |   5   |   -   |
+ * |-------+-------+-------|-------|-------|-------|
+ * |   6   |   7   |   8   |   9   |   0   |   R   |
+ * |-------+-------+-------|-------|-------|-------|
+ * | LT(/) |   Q   |   W   |   E   |   U   |   V   |
+ *  -------+-------+-------|-------|-------|-------|
+ * | ENTER |   A   |   S   |   D   | SPACE |   O   |
+ * |       |-------+-------+-------|       |-------|
+ * |       |   Z   |   X   |   C   |       |   N   |
+ * ,-----------------------------------------------.
+ */
+LAYOUT(
+  KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS,
+  KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R,
+  LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V,
+  KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O,
+              KC_Z,      KC_X,      KC_C,                 KC_N     
+)
+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,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+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,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+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,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+};

keyboards/evancookaudio/sleepingdinosaur/keymaps/via/rules.mk

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

keyboards/evancookaudio/sleepingdinosaur/rules.mk

@@ -7,9 +7,9 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover