diff options
| -rwxr-xr-x | keyboards/kmini/info.json | 8 | ||||
| -rwxr-xr-x | keyboards/kmini/keymaps/default/keymap.c | 33 | ||||
| -rwxr-xr-x | keyboards/kmini/matrix.c | 24 |
3 files changed, 42 insertions, 23 deletions
diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json index e5631f933..13d8176a7 100755 --- a/keyboards/kmini/info.json +++ b/keyboards/kmini/info.json | |||
| @@ -1,6 +1,12 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "KMAC Mini", | 2 | "keyboard_name": "KMAC Mini", |
| 3 | "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1", | 3 | "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1", |
| 4 | "maintainer": "maartenwut" | 4 | "maintainer": "maartenwut", |
| 5 | "width": 18.25, | ||
| 6 | "height": 5, | ||
| 7 | "layouts": { | ||
| 8 | "LAYOUT": { | ||
| 9 | "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}] | ||
| 10 | } | ||
| 5 | } | 11 | } |
| 6 | } | 12 | } |
diff --git a/keyboards/kmini/keymaps/default/keymap.c b/keyboards/kmini/keymaps/default/keymap.c index 73d9b611e..9f9314484 100755 --- a/keyboards/kmini/keymaps/default/keymap.c +++ b/keyboards/kmini/keymaps/default/keymap.c | |||
| @@ -13,10 +13,7 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "kmini.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | |||
| 18 | // Helpful defines | ||
| 19 | #define _____ KC_TRNS | ||
| 20 | 17 | ||
| 21 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 18 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 22 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 19 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| @@ -26,20 +23,20 @@ | |||
| 26 | #define _FN 1 | 23 | #define _FN 1 |
| 27 | 24 | ||
| 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 29 | [_MA] = LAYOUT( | 26 | [_MA] = LAYOUT( |
| 30 | 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, \ | 27 | 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, \ |
| 31 | 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, \ | 28 | 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, \ |
| 32 | 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, \ | 29 | 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, \ |
| 33 | 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, \ | 30 | 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, \ |
| 34 | KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT \ | 31 | KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT \ |
| 35 | ), | 32 | ), |
| 36 | [_FN] = LAYOUT( | 33 | [_FN] = LAYOUT( |
| 37 | _____, _____, _____, 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, _____, \ | 34 | _______, _______, _______, 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, _______, \ |
| 38 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, \ | 35 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 39 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, \ | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 40 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, \ | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 41 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____ \ | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 42 | ), | 39 | ), |
| 43 | }; | 40 | }; |
| 44 | 41 | ||
| 45 | void led_set_user(uint8_t usb_led) { | 42 | void led_set_user(uint8_t usb_led) { |
diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c index f0733340c..5f9bfe3d7 100755 --- 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) | |||
| 48 | static void unselect_cols(void); | 48 | static void unselect_cols(void); |
| 49 | static void select_col(uint8_t col); | 49 | static void select_col(uint8_t col); |
| 50 | 50 | ||
| 51 | __attribute__ ((weak)) | ||
| 52 | void matrix_init_user(void) {} | ||
| 53 | |||
| 54 | __attribute__ ((weak)) | ||
| 55 | void matrix_scan_user(void) {} | ||
| 56 | |||
| 57 | __attribute__ ((weak)) | ||
| 58 | void matrix_init_kb(void) { | ||
| 59 | matrix_init_user(); | ||
| 60 | } | ||
| 61 | |||
| 62 | __attribute__ ((weak)) | ||
| 63 | void matrix_scan_kb(void) { | ||
| 64 | matrix_scan_user(); | ||
| 65 | } | ||
| 66 | |||
| 51 | inline | 67 | inline |
| 52 | uint8_t matrix_rows(void) { | 68 | uint8_t matrix_rows(void) { |
| 53 | return MATRIX_ROWS; | 69 | return MATRIX_ROWS; |
| @@ -219,16 +235,16 @@ static void init_rows(void) { | |||
| 219 | static void unselect_cols(void) { | 235 | static void unselect_cols(void) { |
| 220 | DDRB |= (1<<5) | (1<<6) | (1<<0) | (1<<7) | (1<<4); // OUT | 236 | DDRB |= (1<<5) | (1<<6) | (1<<0) | (1<<7) | (1<<4); // OUT |
| 221 | PORTB &= ~((1<<5) | (1<<6) | (1<<0) | (1<<7) | (1<<4)); // LO | 237 | PORTB &= ~((1<<5) | (1<<6) | (1<<0) | (1<<7) | (1<<4)); // LO |
| 222 | 238 | ||
| 223 | DDRD |= (1<<4) | (1<<6) | (1<<7); // OUT | 239 | DDRD |= (1<<4) | (1<<6) | (1<<7); // OUT |
| 224 | PORTD &= ~((1<<4) | (1<<6) | (1<<7)); // LO | 240 | PORTD &= ~((1<<4) | (1<<6) | (1<<7)); // LO |
| 225 | 241 | ||
| 226 | DDRE |= (1<<6); // OUT | 242 | DDRE |= (1<<6); // OUT |
| 227 | PORTE &= ~((1<<6)); // LO | 243 | PORTE &= ~((1<<6)); // LO |
| 228 | 244 | ||
| 229 | DDRF |= (1<<0) | (1<<1); // OUT | 245 | DDRF |= (1<<0) | (1<<1); // OUT |
| 230 | PORTF &= ~((1<<0) | (1<<1)); // LO | 246 | PORTF &= ~((1<<0) | (1<<1)); // LO |
| 231 | 247 | ||
| 232 | DDRC |= (1<<7) | (1<<6); // OUT | 248 | DDRC |= (1<<7) | (1<<6); // OUT |
| 233 | PORTC &= ~((1<<7) | (1<<6)); // LO | 249 | PORTC &= ~((1<<7) | (1<<6)); // LO |
| 234 | } | 250 | } |
