summaryrefslogtreecommitdiff
path: root/keyboards/handwired/bolek
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/bolek')
-rw-r--r--keyboards/handwired/bolek/bolek.c17
-rw-r--r--keyboards/handwired/bolek/bolek.h43
-rw-r--r--keyboards/handwired/bolek/config.h18
-rw-r--r--keyboards/handwired/bolek/info.json86
4 files changed, 49 insertions, 115 deletions
diff --git a/keyboards/handwired/bolek/bolek.c b/keyboards/handwired/bolek/bolek.c
deleted file mode 100644
index 413f7166c6..0000000000
--- a/keyboards/handwired/bolek/bolek.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Mikołaj Biel
- *
- * 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 "bolek.h"
diff --git a/keyboards/handwired/bolek/bolek.h b/keyboards/handwired/bolek/bolek.h
deleted file mode 100644
index 4fc0f5a2fd..0000000000
--- a/keyboards/handwired/bolek/bolek.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 Mikołaj Biel
- *
- * 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
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K405, K406, K407, K408, K409, \
- K100, K101, K102, K103, K104, K505, K506, K507, K508, K509, \
- K200, K201, K202, K203, K204, K605, K606, K607, K608, K609, \
- K302, K303, K304, K705, K706, K707 \
-) { \
- { K000, K001, K002, K003, K004, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K100, K101, K102, K103, K104, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K200, K201, K202, K203, K204, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, K302, K303, K304, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K405, K406, K407, K408, K409 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505, K506, K507, K508, K509 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K605, K606, K607, K608, K609 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO } \
-}
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index ec81b3337a..72c76ac580 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, B5, D3, D2, D1, B4 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, E6, D7, C6, D0, D4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -56,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json
index 410ed8b933..e8cf3c82db 100644
--- a/keyboards/handwired/bolek/info.json
+++ b/keyboards/handwired/bolek/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "bolek",
- "manufacturer": "Mikołaj Biel",
+ "manufacturer": "Miko\u0142aj Biel",
"url": "https://github.com/klausweiss/bolek",
"maintainer": "klausweiss",
"usb": {
@@ -8,47 +8,59 @@
"pid": "0x3708",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"],
+ "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Q", "x": 0, "y": 0.25 },
- { "label": "W", "x": 1, "y": 0 },
- { "label": "E", "x": 2, "y": 0 },
- { "label": "R", "x": 3, "y": 0.25 },
- { "label": "T", "x": 4, "y": 0.5 },
- { "label": "Y", "x": 7.75, "y": 0.5 },
- { "label": "U", "x": 8.75, "y": 0.25 },
- { "label": "I", "x": 9.75, "y": 0 },
- { "label": "O", "x": 10.75, "y": 0 },
- { "label": "P", "x": 11.75, "y": 0.25 },
- { "label": "A", "x": 0, "y": 1.25 },
- { "label": "S", "x": 1, "y": 1 },
- { "label": "D", "x": 2, "y": 1 },
- { "label": "F", "x": 3, "y": 1.25 },
- { "label": "G", "x": 4, "y": 1.5 },
- { "label": "H", "x": 7.75, "y": 1.5 },
- { "label": "J", "x": 8.75, "y": 1.25 },
- { "label": "K", "x": 9.75, "y": 1 },
- { "label": "L", "x": 10.75, "y": 1 },
- { "label": ";", "x": 11.75, "y": 1.25 },
- { "label": "Z", "x": 0, "y": 2.25 },
- { "label": "X", "x": 1, "y": 2 },
- { "label": "C", "x": 2, "y": 2 },
- { "label": "V", "x": 3, "y": 2.25 },
- { "label": "B", "x": 4, "y": 2.5 },
- { "label": "N", "x": 7.75, "y": 2.5 },
- { "label": "M", "x": 8.75, "y": 2.25 },
- { "label": ",", "x": 9.75, "y": 2 },
- { "label": ".", "x": 10.75, "y": 2 },
- { "label": "'", "x": 11.75, "y": 2.25 },
- { "label": "ESC", "x": 3.25, "y": 3.75 },
- { "label": "SPC", "x": 4.25, "y": 4 },
- { "label": "TAB", "x": 5.25, "y": 4.25 },
- { "label": "RET", "x": 6.5, "y": 4.25 },
- { "label": "BSPC", "x": 7.5, "y": 4 },
- { "label": "RESET", "x": 8.5, "y": 3.75 }
+ {"matrix": [0, 0], "x": 0, "y": 0.25},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [4, 5], "x": 7.75, "y": 0.5},
+ {"matrix": [4, 6], "x": 8.75, "y": 0.25},
+ {"matrix": [4, 7], "x": 9.75, "y": 0},
+ {"matrix": [4, 8], "x": 10.75, "y": 0},
+ {"matrix": [4, 9], "x": 11.75, "y": 0.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [5, 5], "x": 7.75, "y": 1.5},
+ {"matrix": [5, 6], "x": 8.75, "y": 1.25},
+ {"matrix": [5, 7], "x": 9.75, "y": 1},
+ {"matrix": [5, 8], "x": 10.75, "y": 1},
+ {"matrix": [5, 9], "x": 11.75, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [6, 5], "x": 7.75, "y": 2.5},
+ {"matrix": [6, 6], "x": 8.75, "y": 2.25},
+ {"matrix": [6, 7], "x": 9.75, "y": 2},
+ {"matrix": [6, 8], "x": 10.75, "y": 2},
+ {"matrix": [6, 9], "x": 11.75, "y": 2.25},
+
+ {"matrix": [3, 2], "x": 3.25, "y": 3.75},
+ {"matrix": [3, 3], "x": 4.25, "y": 4},
+ {"matrix": [3, 4], "x": 5.25, "y": 4.25},
+
+ {"matrix": [7, 5], "x": 6.5, "y": 4.25},
+ {"matrix": [7, 6], "x": 7.5, "y": 4},
+ {"matrix": [7, 7], "x": 8.5, "y": 3.75}
]
}
}