Kmini refactor and Configurator support (#3388)

* default keymap refactor: QMK_KEYBOARD_H include; readability

* Configurator support

* info.json was missing a comma

* Added matrix functions to matrix.c per @drashna

diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json
index e5631f9334aac17810bb95b0ae2b711ec3f69bf8..13d8176a7dde359dd4ece662bde2d9f34019f7ca 100755 (executable)
--- a/keyboards/kmini/info.json
+++ b/keyboards/kmini/info.json
@@ -1,6 +1,12 @@
 {
   "keyboard_name": "KMAC Mini",
   "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1",
-  "maintainer": "maartenwut"
+  "maintainer": "maartenwut",
+  "width": 18.25,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"GUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Fn", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    }
   }
 }

diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c
index 73d9b611e37e0f1d454953c3271bf8c45c227cc4..9f931448479ccbc9a5ec05c7c074948a6ce85b5c 100755 (executable)
--- a/keyboards/kmini/keymaps/default/keymap.c
+++ b/keyboards/kmini/keymaps/default/keymap.c
@@ -13,10 +13,7 @@
  * 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 "kmini.h"
-
-// Helpful defines
-#define _____ KC_TRNS
+#include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -26,20 +23,20 @@
 #define _FN 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MA] = LAYOUT(
-               KC_F1,  KC_F2,          KC_ESC,         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_INS,         \
-               KC_F3,  KC_F4,          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_BSLS,        KC_DEL,         \
-               KC_F5,  KC_F6,          KC_CAPS,        KC_A,           KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,           KC_L,           KC_SCLN,        KC_QUOT,                                KC_ENT,         KC_PGUP,        \
-               KC_F7,  KC_F8,          KC_LSFT,        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_PGDN,        \
-               KC_F9,  KC_F10,         KC_LCTL,        KC_LGUI,        KC_LALT,                                KC_SPC,                                                                                 MO(_FN),                                KC_LEFT,        KC_DOWN,        KC_RGHT         \
-    ),
-    [_FN] = LAYOUT(
-               _____,  _____,          _____,          KC_F1,          KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         RESET,          _____,          \
-               _____,  _____,          _____,          _____,          _____,  _____,  _____,  _____,  _____,  _____,  _____,          _____,          _____,          _____,          _____,          _____,          _____,          \
-               _____,  _____,          _____,          _____,          _____,  _____,  _____,  _____,  _____,  _____,  _____,          _____,          _____,          _____,                                  _____,          _____,          \
-               _____,  _____,          _____,          _____,          _____,  _____,  _____,  _____,  _____,  _____,  _____,          _____,          _____,                                  _____,          _____,          _____,          \
-               _____,  _____,          _____,          _____,          _____,                                  _____,                                                                                  _____,                                  _____,          _____,          _____           \
-    ),
+  [_MA] = LAYOUT(
+    KC_F1,   KC_F2,   KC_ESC,  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_INS,  \
+    KC_F3,   KC_F4,   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_BSLS, KC_DEL,  \
+    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP, \
+    KC_F7,   KC_F8,   KC_LSFT, 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_PGDN, \
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(_FN),          KC_LEFT, KC_DOWN, KC_RGHT  \
+  ),
+  [_FN] = LAYOUT(
+    _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,   _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, \
+    _______, _______, _______, _______, _______,                            _______,                            _______,          _______, _______, _______  \
+  ),
 };
 
 void led_set_user(uint8_t usb_led) {

diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c
index f0733340cef89411faf53b4c3ace759358a3280f..5f9bfe3d7fa1d557acbc6485d18199b37b24b7d1 100755 (executable)
--- a/keyboards/kmini/matrix.c
+++ b/keyboards/kmini/matrix.c
@@ -48,6 +48,22 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 static void unselect_cols(void);
 static void select_col(uint8_t col);
 
+__attribute__ ((weak))
+void matrix_init_user(void) {}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {}
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+  matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+  matrix_scan_user();
+}
+
 inline
 uint8_t matrix_rows(void) {
     return MATRIX_ROWS;
@@ -219,16 +235,16 @@ static void init_rows(void) {
 static void unselect_cols(void) {
     DDRB  |= (1<<5) | (1<<6) | (1<<0) | (1<<7) | (1<<4); // OUT
     PORTB &= ~((1<<5) | (1<<6) | (1<<0) |  (1<<7) | (1<<4)); // LO
-       
+
     DDRD  |= (1<<4) | (1<<6) | (1<<7); // OUT
     PORTD &= ~((1<<4) | (1<<6) | (1<<7)); // LO
-       
+
     DDRE  |= (1<<6); // OUT
     PORTE &= ~((1<<6)); // LO
-       
+
     DDRF  |= (1<<0) | (1<<1); // OUT
     PORTF &= ~((1<<0) | (1<<1)); // LO
-       
+
     DDRC  |= (1<<7) | (1<<6); // OUT
     PORTC &= ~((1<<7) | (1<<6)); // LO
 }