aboutsummaryrefslogtreecommitdiff
path: root/keyboards/peej/lumberjack
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/peej/lumberjack')
-rw-r--r--keyboards/peej/lumberjack/config.h26
-rw-r--r--keyboards/peej/lumberjack/info.json132
-rw-r--r--keyboards/peej/lumberjack/lumberjack.h16
3 files changed, 71 insertions, 103 deletions
diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h
deleted file mode 100644
index 032cdf4e23..0000000000
--- a/keyboards/peej/lumberjack/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2020 Paul James
- *
- * 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 MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, D4, D1, D0, C1, C2, C3 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json
index 7e3878151f..83b4a6e6c2 100644
--- a/keyboards/peej/lumberjack/info.json
+++ b/keyboards/peej/lumberjack/info.json
@@ -6,74 +6,84 @@
"usb": {
"vid": "0x706A",
"pid": "0x0002",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "max_power": 100
},
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"],
+ "rows": ["C0", "B5", "B4", "B3", "B2", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega328p",
"bootloader": "usbasploader",
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 7, "y": 0 },
- { "x": 8, "y": 0 },
- { "x": 9, "y": 0 },
- { "x": 10, "y": 0 },
- { "x": 11, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 0, "y": 4 },
- { "x": 1, "y": 4 },
- { "x": 2, "y": 4 },
- { "x": 3, "y": 4 },
- { "x": 4, "y": 4 },
- { "x": 5, "y": 4 },
- { "x": 6, "y": 4 },
- { "x": 7, "y": 4 },
- { "x": 8, "y": 4 },
- { "x": 9, "y": 4 },
- { "x": 10, "y": 4 },
- { "x": 11, "y": 4 }
+ {"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": [1, 4], "x": 5, "y": 0},
+ {"matrix": [1, 9], "x": 6, "y": 0},
+ {"matrix": [0, 9], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [0, 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": [2, 3], "x": 4, "y": 1},
+ {"matrix": [2, 4], "x": 5, "y": 1},
+ {"matrix": [2, 9], "x": 6, "y": 1},
+ {"matrix": [2, 8], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 7], "x": 9, "y": 1},
+ {"matrix": [1, 6], "x": 10, "y": 1},
+ {"matrix": [1, 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": [3, 2], "x": 3, "y": 2},
+ {"matrix": [3, 3], "x": 4, "y": 2},
+ {"matrix": [3, 4], "x": 5, "y": 2},
+ {"matrix": [3, 9], "x": 6, "y": 2},
+ {"matrix": [3, 8], "x": 7, "y": 2},
+ {"matrix": [3, 7], "x": 8, "y": 2},
+ {"matrix": [2, 7], "x": 9, "y": 2},
+ {"matrix": [2, 6], "x": 10, "y": 2},
+ {"matrix": [2, 5], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [4, 1], "x": 2, "y": 3},
+ {"matrix": [4, 2], "x": 3, "y": 3},
+ {"matrix": [4, 3], "x": 4, "y": 3},
+ {"matrix": [4, 4], "x": 5, "y": 3},
+ {"matrix": [4, 9], "x": 6, "y": 3},
+ {"matrix": [4, 8], "x": 7, "y": 3},
+ {"matrix": [4, 7], "x": 8, "y": 3},
+ {"matrix": [4, 6], "x": 9, "y": 3},
+ {"matrix": [3, 6], "x": 10, "y": 3},
+ {"matrix": [3, 5], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [5, 0], "x": 1, "y": 4},
+ {"matrix": [5, 1], "x": 2, "y": 4},
+ {"matrix": [5, 2], "x": 3, "y": 4},
+ {"matrix": [5, 3], "x": 4, "y": 4},
+ {"matrix": [5, 4], "x": 5, "y": 4},
+ {"matrix": [5, 9], "x": 6, "y": 4},
+ {"matrix": [5, 8], "x": 7, "y": 4},
+ {"matrix": [5, 7], "x": 8, "y": 4},
+ {"matrix": [5, 6], "x": 9, "y": 4},
+ {"matrix": [5, 5], "x": 10, "y": 4},
+ {"matrix": [4, 5], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/peej/lumberjack/lumberjack.h b/keyboards/peej/lumberjack/lumberjack.h
index 785f13a903..b14f72d81e 100644
--- a/keyboards/peej/lumberjack/lumberjack.h
+++ b/keyboards/peej/lumberjack/lumberjack.h
@@ -18,21 +18,5 @@
#include "quantum.h"
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k0b, k0a, k09, k08, k07 }, \
- { k10, k11, k12, k13, k05, k1b, k1a, k19, k18, k06 }, \
- { k20, k21, k22, k14, k15, k2b, k2a, k29, k17, k16 }, \
- { k30, k31, k23, k24, k25, k3b, k3a, k28, k27, k26 }, \
- { k40, k32, k33, k34, k35, k4b, k39, k38, k37, k36 }, \
- { k41, k42, k43, k44, k45, k4a, k49, k48, k47, k46 } \
-}
-
#define LED1 C5
#define LED2 C4