diff --git a/keyboards/havit/kb435l/config.h b/keyboards/havit/kb435l/config.h deleted file mode 100644 index 09cf96594124..000000000000 --- a/keyboards/havit/kb435l/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2015 Jun Wako - -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 . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -#define PERMISSIVE_HOLD - -/* - * 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/havit/kb435l/info.json b/keyboards/havit/kb435l/info.json index 39cd2a8cb133..01e2a04697a8 100644 --- a/keyboards/havit/kb435l/info.json +++ b/keyboards/havit/kb435l/info.json @@ -1,14 +1,11 @@ { + "keyboard_name": "KB435L", "manufacturer": "Havit", - "url": "", - "maintainer": "humannplayer2", - "keyboard_name": "Havit KB435L", + "maintainer": "humanplayer2", "processor": "SN32F268F", "bootloader": "sn32-dfu", "matrix_pins": { - "cols": ["A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", - "D0", "D1", "D2", "D3", "D4", "D5", - "A1", "A2", "A3", "A4", "A5"], + "cols": ["A8", "A9", "A10", "A11", "A12", "A13", "A14", "A15", "D0", "D1", "D2", "D3", "D4", "D5", "A1", "A2", "A3", "A4", "A5"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] }, "usb": { @@ -21,7 +18,7 @@ }, "diode_direction": "ROW2COL", "features": { - "bootmagic": true, + "bootmagic": false, "mousekey": false, "extrakey": true, "console": false, @@ -31,11 +28,8 @@ "rgblight": false, "audio": false }, - "bootmagic": { - "matrix": [0, 0] - }, "layouts": { - "LAYOUT": { + "LAYOUT_tkl_iso": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, @@ -50,12 +44,10 @@ {"matrix": [0, 10], "x": 10, "y": 0}, {"matrix": [0, 11], "x": 11, "y": 0}, {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 15], "x": 14, "y": 0}, {"matrix": [0, 14], "x": 15, "y": 0}, {"matrix": [0, 16], "x": 16, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 2], "x": 2, "y": 1}, @@ -74,7 +66,6 @@ {"matrix": [1, 15], "x": 15, "y": 1}, {"matrix": [1, 16], "x": 16, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 2], "x": 2, "y": 2}, @@ -88,12 +79,10 @@ {"matrix": [2, 10], "x": 10, "y": 2}, {"matrix": [2, 11], "x": 11, "y": 2}, {"matrix": [2, 12], "x": 12, "y": 2}, - {"matrix": [2, 14], "x": 14, "y": 2}, {"matrix": [2, 15], "x": 15, "y": 2}, {"matrix": [2, 16], "x": 16, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 2], "x": 2, "y": 3}, @@ -109,7 +98,6 @@ {"matrix": [3, 12], "x": 12, "y": 3}, {"matrix": [3, 13], "x": 13, "y": 3}, - {"matrix": [4, 0], "x": 0, "y": 4}, {"matrix": [4, 1], "x": 1, "y": 4}, {"matrix": [4, 2], "x": 2, "y": 4}, @@ -122,23 +110,17 @@ {"matrix": [4, 9], "x": 9, "y": 4}, {"matrix": [4, 10], "x": 10, "y": 4}, {"matrix": [4, 11], "x": 11, "y": 4}, - {"matrix": [4, 13], "x": 13, "y": 4}, - {"matrix": [4, 16], "x": 16, "y": 4}, - {"matrix": [5, 0], "x": 0, "y": 5}, {"matrix": [5, 1], "x": 1, "y": 5}, {"matrix": [5, 2], "x": 2, "y": 5}, - {"matrix": [5, 4], "x": 4, "y": 5}, - {"matrix": [5, 6], "x": 6, "y": 5}, {"matrix": [5, 7], "x": 7, "y": 5}, {"matrix": [5, 8], "x": 8, "y": 5}, {"matrix": [5, 9], "x": 9, "y": 5}, - {"matrix": [5, 16], "x": 16, "y": 5}, {"matrix": [5, 17], "x": 17, "y": 5}, {"matrix": [5, 18], "x": 18, "y": 5}, diff --git a/keyboards/havit/kb435l/keymaps/default/keymap.c b/keyboards/havit/kb435l/keymaps/default/keymap.c index 216ed3ecacd7..092dcb0ed95e 100644 --- a/keyboards/havit/kb435l/keymaps/default/keymap.c +++ b/keyboards/havit/kb435l/keymaps/default/keymap.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |LCTRL| LGUI| LALT | SPACE | RALT| FN | MENU| RCTRL | |LFT |DWN |RGT | +--------------------------------------------------------------------------+----------------+ */ - [BASE] = LAYOUT( + [BASE] = LAYOUT_tkl_iso( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, KC_DEL, KC_PGDN, @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [GAME] = LAYOUT( + [GAME] = LAYOUT_tkl_iso( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, KC_DEL, KC_PGDN, @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_NO, KC_LALT, KC_SPC, KC_RALT, MO(FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [FN] = LAYOUT( + [FN] = LAYOUT_tkl_iso( KC_ESC, KC_STOP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MYCM, KC_WHOM,KC_MAIL,KC_CALC, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_INS, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_END, KC_DEL, KC_PGDN,