Suggested Changes part 3

RE: @drashna and @fauxpark
qmk · Feb 10, 2023 · 65bb9aa · 65bb9aa
1 parent 5159f2f
commit 65bb9aa
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 40 deletions.
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
@@ -1,16 +1,18 @@
 {
-	"manufacturer": "Dane Skalski",
-	"keyboard_name": "Junco",
-	"url": "https://github.com/Daneski13/Junco",
-	"maintainer": "Daneski13",
-	"usb": {
-		"vid": "0x4413",
-		"pid": "0x4A13",
-		"device_version": "1.0.0"
-	},
+    "manufacturer": "Dane Skalski",
+    "keyboard_name": "Junco",
+    "url": "https://github.com/Daneski13/Junco",
+    "maintainer": "Daneski13",
+    "usb": {
+        "vid": "0x4413",
+        "pid": "0x4A13",
+        "device_version": "1.0.0"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
     "layouts": {
-		"LAYOUT_split4x6_r1": {
-			"layout": [
+        "LAYOUT_split4x6_r1": {
+            "layout": [
                 { "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
                 { "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
                 { "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
@@ -68,14 +70,38 @@
                 { "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
                 { "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
                 { "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
-                { "label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5 },
-                { "label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5 },
-                { "label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5 },
-                { "label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5 },
+                {
+                    "label": "Del",
+                    "matrix": [4, 3],
+                    "x": 5.1,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Spc",
+                    "matrix": [4, 4],
+                    "x": 6.1,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Shift",
+                    "matrix": [9, 3],
+                    "x": 7.9,
+                    "y": 4.5,
+                    "h": 1.5
+                },
+                {
+                    "label": "Bspc",
+                    "matrix": [9, 4],
+                    "x": 8.9,
+                    "y": 4.5,
+                    "h": 1.5
+                },
                 { "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
                 { "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
                 { "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
             ]
-		}
-	}
+        }
+    }
 }
diff --git a/keyboards/junco/keymaps/default/keymap.c b/keyboards/junco/keymaps/default/keymap.c
@@ -143,12 +143,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 // clang-format off
 
-// Base layer encoder mappings:   index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
-#    define BASE_LAYER_ENCODERS { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    // Base layers
-    [_QWERTY] =     BASE_LAYER_ENCODERS,
-    [_COLEMAK_DH] = BASE_LAYER_ENCODERS,
+    // Base layer encoder mappings:
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 
     // Passes through to base layers
     [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },

diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
@@ -200,12 +200,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 // clang-format off
 
-// Base layer encoder mappings:   index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
-#    define BASE_LAYER_ENCODERS { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }
+// Base layer encoder mappings:
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     // Base layers
-    [_QWERTY] =     BASE_LAYER_ENCODERS,
-    [_COLEMAK_DH] = BASE_LAYER_ENCODERS,
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 
     // Passes through to base layer
     [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },

diff --git a/keyboards/junco/keymaps/via/keymap.c b/keyboards/junco/keymaps/via/keymap.c
@@ -143,12 +143,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 // clang-format off
 
-// Base layer encoder mappings:   index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
-#    define BASE_LAYER_ENCODERS { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) }
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    // Base layers
-    [_QWERTY] =     BASE_LAYER_ENCODERS,
-    [_COLEMAK_DH] = BASE_LAYER_ENCODERS,
+    // Base layer encoder mappings:
+    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
+    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
 
     // Passes through to base layers
     [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },

diff --git a/keyboards/junco/rev1/post_config.h b/keyboards/junco/rev1/post_config.h
@@ -1,6 +1,8 @@
 // Copyright 2022 Dane Skalski (@Daneski13)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#pragma once
+
 /* Default Bootmagic lite */
 // Top left for left side is default in core
 

diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk
@@ -1,12 +1,3 @@
-# MCU
-MCU = RP2040
-
-# Board
-BOARD = GENERIC_RP_RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
 # Split Keyboard Stuff
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = vendor