From 3fc94a72e98ef8d061ea5a2d2f97848fa4bcb2bc Mon Sep 17 00:00:00 2001 From: jfescobar18 Date: Sat, 7 Aug 2021 17:05:48 -0500 Subject: [PATCH 01/15] MIni Ashen 40 Keyboard init --- keyboards/miniashen40/README.md | 26 ++++++++++++ keyboards/miniashen40/config.h | 56 ++++++++++++++++++++++++++ keyboards/miniashen40/info.json | 0 keyboards/miniashen40/miniashen40.c | 0 keyboards/miniashen40/miniashen40.h | 0 keyboards/miniashen40/miniashen40.json | 0 keyboards/miniashen40/rules.mk | 0 7 files changed, 82 insertions(+) create mode 100644 keyboards/miniashen40/README.md create mode 100644 keyboards/miniashen40/config.h create mode 100644 keyboards/miniashen40/info.json create mode 100644 keyboards/miniashen40/miniashen40.c create mode 100644 keyboards/miniashen40/miniashen40.h create mode 100644 keyboards/miniashen40/miniashen40.json create mode 100644 keyboards/miniashen40/rules.mk diff --git a/keyboards/miniashen40/README.md b/keyboards/miniashen40/README.md new file mode 100644 index 000000000000..a8106f02337e --- /dev/null +++ b/keyboards/miniashen40/README.md @@ -0,0 +1,26 @@ +# Mini Ashen 40 + +![Mini Ashen 40](https://i.imgur.com/0EWBzNt.jpeg) + +![Mini Ashen 40](https://i.imgur.com/m8z1kMV.jpeg) + +![Mini Ashen 40](https://i.imgur.com/AZIfVzN.jpeg) + +A 40% keyboard with some extras + - Arrows + - Mini macro cluster + - Full assembly with only through hole components + +* Keyboard Maintainer: [jfescobar18](https://github.com/jfescobar18) +* Hardware Supported: Mini Ashen 40 PCB +* Hardware Availability: [MechanicKeys](https://www.facebook.com/MechanicKeys-104963764775280) + +Make example for this keyboard (after setting up your build environment): + + make miniashen40/:default + +Flashing example for this keyboard: + + make miniashen40:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file diff --git a/keyboards/miniashen40/config.h b/keyboards/miniashen40/config.h new file mode 100644 index 000000000000..694b8de23cbb --- /dev/null +++ b/keyboards/miniashen40/config.h @@ -0,0 +1,56 @@ +/* +Copyright 2021 Franciso Escobar +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 + +#include "config_common.h" + +#define VENDOR_ID 0x4D4B // MechanicKeys +#define PRODUCT_ID 0x6D6E +#define DEVICE_VER 0x0001 +#define MANUFACTURER MechanicKeys +#define PRODUCT MINI ASHEN 40 + +/* key matrix size */ +#define MATRIX_ROWS 4 +#define MATRIX_COLS 13 + +/* + * 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) + * +*/ +/* R0 R1 R2 R3*/ +#define MATRIX_ROW_PINS { B1, B2, B3, B4 } +/* COL0 COL1 COL2 COL3 COL4 COL5 COL6 COL7 COL8 COL9 COL10 COL11 COL12*/ +#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5} +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/miniashen40/info.json b/keyboards/miniashen40/info.json new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/miniashen40/miniashen40.c b/keyboards/miniashen40/miniashen40.c new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/miniashen40/miniashen40.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/miniashen40/miniashen40.json b/keyboards/miniashen40/miniashen40.json new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/miniashen40/rules.mk b/keyboards/miniashen40/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 From a66cc4f669a07b423e20fb95ebb2fab19bad0258 Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Sun, 8 Aug 2021 16:56:06 -0500 Subject: [PATCH 02/15] keymap updated --- keyboards/miniashen40/info.json | 17 +++++++++++++++ keyboards/miniashen40/miniashen40.c | 15 ++++++++++++++ keyboards/miniashen40/miniashen40.h | 32 +++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/keyboards/miniashen40/info.json b/keyboards/miniashen40/info.json index e69de29bb2d1..6f38fec76ef9 100644 --- a/keyboards/miniashen40/info.json +++ b/keyboards/miniashen40/info.json @@ -0,0 +1,17 @@ +{ + "keyboard_name": "Mini Ashen 40", + "url": "", + "maintainer": "qmk", + "width": 13, + "height": 4, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Tab", "x": 0, "y": 0}, {"label": "Q", "x": 1, "y": 0}, {"label": "W", "x": 2, "y": 0}, {"label": "E", "x": 3, "y": 0}, {"label": "R", "x": 4, "y": 0}, {"label": "T", "x": 5, "y": 0}, {"label": "Y", "x": 6, "y": 0}, {"label": "U", "x": 7, "y": 0}, {"label": "I", "x": 8, "y": 0}, {"label": "O", "x": 9, "y": 0}, {"label": "P", "x": 10, "y": 0}, {"label": "Del", "x": 11, "y": 0}, {"label": "M1", "x": 12.25, "y": 0}, {"label": "M2", "x": 13.25, "y": 0}, + {"label": "F4", "x": 0, "y": 2}, {"label": "F5", "x": 1, "y": 2}, {"label": "Caps", "x": 3.5, "y": 2}, {"label": "A", "x": 5.25, "y": 2}, {"label": "S", "x": 6.25, "y": 2}, {"label": "D", "x": 7.25, "y": 2}, {"label": "F", "x": 8.25, "y": 2}, {"label": "G", "x": 9.25, "y": 2}, {"label": "H", "x": 10.25, "y": 2}, {"label": "J", "x": 11.25, "y": 2}, {"label": "K", "x": 12.25, "y": 2}, {"label": "L", "x": 13.25, "y": 2}, {"label": ";", "x": 14.25, "y": 2}, {"label": "'", "x": 15.25, "y": 2}, {"label": "Enter", "x": 16.25, "y": 2}, + {"label": "F6", "x": 0, "y": 3}, {"label": "F7", "x": 1, "y": 3}, {"label": "Shift", "x": 3.5, "y": 3}, {"label": "Z", "x": 5.5, "y": 3}, {"label": "X", "x": 6.5, "y": 3}, {"label": "C", "x": 7.5, "y": 3}, {"label": "V", "x": 8.5, "y": 3}, {"label": "B", "x": 9.5, "y": 3}, {"label": "N", "x": 10.5, "y": 3}, {"label": "M", "x": 11.5, "y": 3}, {"label": ",", "x": 12.5, "y": 3}, {"label": ".", "x": 13.5, "y": 3}, {"label": "/", "x": 14.5, "y": 3}, {"label": "Shift", "x": 15.5, "y": 3}, + {"label": "F1", "x": 0, "y": 4}, {"label": "F2", "x": 1, "y": 4}, {"label": "Ctrl", "x": 3.5, "y": 4}, {"label": "OS", "x": 4.75, "y": 4}, {"label": "Alt", "x": 6, "y": 4}, {"label": "Space", "x": 7.25, "y": 4}, {"label": "Alt", "x": 13.5, "y": 4}, {"label": "OS", "x": 14.75, "y": 4}, {"label": "Ctrl", "x": 16, "y": 4}, {"label": "Fn", "x": 17.25, "y": 4} + ] + } + } + } \ No newline at end of file diff --git a/keyboards/miniashen40/miniashen40.c b/keyboards/miniashen40/miniashen40.c index e69de29bb2d1..0fd51bf85748 100644 --- a/keyboards/miniashen40/miniashen40.c +++ b/keyboards/miniashen40/miniashen40.c @@ -0,0 +1,15 @@ +/* +Copyright 2021 Franciso Escobar +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 . +*/ + +#include "miniashen40.h"; \ No newline at end of file diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/miniashen40/miniashen40.h index e69de29bb2d1..c453bcf72419 100644 --- a/keyboards/miniashen40/miniashen40.h +++ b/keyboards/miniashen40/miniashen40.h @@ -0,0 +1,32 @@ +/* Copyright 2021 Francisco Escobar + * + * 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 + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D \ + K30, K31, K33, K37, K3A, K3B, K3C, K3D, K3E \ +) \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D, K1E } \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ + { K30, K31, KC_NO, K33, KC_NO, KC_NO, KC_NO, K37, KC_NO, KC_NO, K3A, K38, K3C, K3D, K3E, }, \ +} From 4bbad74cdc4733009eb474b2dc02718c29913f7b Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Tue, 10 Aug 2021 01:43:40 -0500 Subject: [PATCH 03/15] Firmware updated --- keyboards/miniashen40/config.h | 8 +--- keyboards/miniashen40/info.json | 30 ++++++------ .../miniashen40/keymaps/default/keymap.c | 47 +++++++++++++++++++ keyboards/miniashen40/keymaps/via/keymap.c | 47 +++++++++++++++++++ keyboards/miniashen40/keymaps/via/rules.mk | 1 + keyboards/miniashen40/miniashen40.c | 2 +- keyboards/miniashen40/miniashen40.h | 26 ++++++---- keyboards/miniashen40/miniashen40.json | 0 keyboards/miniashen40/rules.mk | 32 +++++++++++++ 9 files changed, 163 insertions(+), 30 deletions(-) create mode 100644 keyboards/miniashen40/keymaps/default/keymap.c create mode 100644 keyboards/miniashen40/keymaps/via/keymap.c create mode 100644 keyboards/miniashen40/keymaps/via/rules.mk delete mode 100644 keyboards/miniashen40/miniashen40.json diff --git a/keyboards/miniashen40/config.h b/keyboards/miniashen40/config.h index 694b8de23cbb..f65cbf8c792d 100644 --- a/keyboards/miniashen40/config.h +++ b/keyboards/miniashen40/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 4 -#define MATRIX_COLS 13 +#define MATRIX_COLS 14 /* * Keyboard Matrix Assignments @@ -49,8 +49,4 @@ along with this program. If not, see . #define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 +//#define MATRIX_HAS_GHOST \ No newline at end of file diff --git a/keyboards/miniashen40/info.json b/keyboards/miniashen40/info.json index 6f38fec76ef9..24bb7e34a738 100644 --- a/keyboards/miniashen40/info.json +++ b/keyboards/miniashen40/info.json @@ -1,17 +1,17 @@ { - "keyboard_name": "Mini Ashen 40", - "url": "", - "maintainer": "qmk", - "width": 13, - "height": 4, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "Tab", "x": 0, "y": 0}, {"label": "Q", "x": 1, "y": 0}, {"label": "W", "x": 2, "y": 0}, {"label": "E", "x": 3, "y": 0}, {"label": "R", "x": 4, "y": 0}, {"label": "T", "x": 5, "y": 0}, {"label": "Y", "x": 6, "y": 0}, {"label": "U", "x": 7, "y": 0}, {"label": "I", "x": 8, "y": 0}, {"label": "O", "x": 9, "y": 0}, {"label": "P", "x": 10, "y": 0}, {"label": "Del", "x": 11, "y": 0}, {"label": "M1", "x": 12.25, "y": 0}, {"label": "M2", "x": 13.25, "y": 0}, - {"label": "F4", "x": 0, "y": 2}, {"label": "F5", "x": 1, "y": 2}, {"label": "Caps", "x": 3.5, "y": 2}, {"label": "A", "x": 5.25, "y": 2}, {"label": "S", "x": 6.25, "y": 2}, {"label": "D", "x": 7.25, "y": 2}, {"label": "F", "x": 8.25, "y": 2}, {"label": "G", "x": 9.25, "y": 2}, {"label": "H", "x": 10.25, "y": 2}, {"label": "J", "x": 11.25, "y": 2}, {"label": "K", "x": 12.25, "y": 2}, {"label": "L", "x": 13.25, "y": 2}, {"label": ";", "x": 14.25, "y": 2}, {"label": "'", "x": 15.25, "y": 2}, {"label": "Enter", "x": 16.25, "y": 2}, - {"label": "F6", "x": 0, "y": 3}, {"label": "F7", "x": 1, "y": 3}, {"label": "Shift", "x": 3.5, "y": 3}, {"label": "Z", "x": 5.5, "y": 3}, {"label": "X", "x": 6.5, "y": 3}, {"label": "C", "x": 7.5, "y": 3}, {"label": "V", "x": 8.5, "y": 3}, {"label": "B", "x": 9.5, "y": 3}, {"label": "N", "x": 10.5, "y": 3}, {"label": "M", "x": 11.5, "y": 3}, {"label": ",", "x": 12.5, "y": 3}, {"label": ".", "x": 13.5, "y": 3}, {"label": "/", "x": 14.5, "y": 3}, {"label": "Shift", "x": 15.5, "y": 3}, - {"label": "F1", "x": 0, "y": 4}, {"label": "F2", "x": 1, "y": 4}, {"label": "Ctrl", "x": 3.5, "y": 4}, {"label": "OS", "x": 4.75, "y": 4}, {"label": "Alt", "x": 6, "y": 4}, {"label": "Space", "x": 7.25, "y": 4}, {"label": "Alt", "x": 13.5, "y": 4}, {"label": "OS", "x": 14.75, "y": 4}, {"label": "Ctrl", "x": 16, "y": 4}, {"label": "Fn", "x": 17.25, "y": 4} - ] - } + "keyboard_name": "Mini Ashen 40", + "url": "", + "maintainer": "qmk", + "width": 14.25, + "height": 4.25, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Tab", "x": 0, "y": 0}, {"label": "Q", "x": 1, "y": 0}, {"label": "W", "x": 2, "y": 0}, {"label": "E", "x": 3, "y": 0}, {"label": "R", "x": 4, "y": 0}, {"label": "T", "x": 5, "y": 0}, {"label": "Y", "x": 6, "y": 0}, {"label": "U", "x": 7, "y": 0}, {"label": "I", "x": 8, "y": 0}, {"label": "O", "x": 9, "y": 0}, {"label": "P", "x": 10, "y": 0}, {"label": "Del", "x": 11, "y": 0}, {"label": "M1", "x": 12.25, "y": 0}, {"label": "M2", "x": 13.25, "y": 0}, + {"label": "Ctrl", "x": 0, "y": 1, "w":1.25}, {"label": "A", "x": 1.25, "y": 1}, {"label": "S", "x": 2.25, "y": 1}, {"label": "D", "x": 3.25, "y": 1}, {"label": "F", "x": 4.25, "y": 1}, {"label": "G", "x": 5.25, "y": 1}, {"label": "H", "x": 6.25, "y": 1}, {"label": "J", "x": 7.25, "y": 1}, {"label": "K", "x": 8.25, "y": 1}, {"label": "L", "x": 9.25, "y": 1}, {"label": "Enter", "x": 10.25, "y": 1, "w":1.75}, {"label": "M3", "x": 12.25, "y": 1}, {"label": "M4", "x": 13.25, "y": 1}, + {"label": "Shift", "x": 0, "y": 2, "w":1.75}, {"label": "Z", "x": 1.75, "y": 2}, {"label": "X", "x": 2.75, "y": 2}, {"label": "C", "x": 3.75, "y": 2}, {"label": "V", "x": 4.75, "y": 2}, {"label": "B", "x": 5.75, "y": 2}, {"label": "N", "x": 6.75, "y": 2}, {"label": "M", "x": 7.75, "y": 2}, {"label": ",", "x": 8.75, "y": 2}, {"label": ".", "x": 9.75, "y": 2}, {"label": "Fn", "x": 10.75, "y": 2, "w":1.25}, {"label": "Up", "x": 12.25, "y": 2.25}, + {"label": "Alt", "x": 1, "y": 3}, {"label": "OS", "x": 2, "y": 3, "w": 1.5}, {"label": "", "x": 3.5, "y": 3, "w": 2.75}, {"label": "", "x": 6.25, "y": 3, "w": 2.25}, {"label": "Os", "x": 8.5, "y": 3, "w": 1.5}, {"label": "Alt", "x": 10, "y": 3}, {"label": "Left", "x": 11.25, "y": 3.25}, {"label": "Down", "x": 12.25, "y": 3.25}, {"label": "Right", "x": 13.25, "y": 3.25} + ] } - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/keyboards/miniashen40/keymaps/default/keymap.c b/keyboards/miniashen40/keymaps/default/keymap.c new file mode 100644 index 000000000000..ac90e3da3324 --- /dev/null +++ b/keyboards/miniashen40/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2021 Francisco Escobar + * + * 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( /* 0: qwerty */ + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_INS, KC_PGUP, + CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_DEL, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, + KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( /* 1: Symbols */ + 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, + MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( /* 2: Fn */ + 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( /*3: Media */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; \ No newline at end of file diff --git a/keyboards/miniashen40/keymaps/via/keymap.c b/keyboards/miniashen40/keymaps/via/keymap.c new file mode 100644 index 000000000000..ac90e3da3324 --- /dev/null +++ b/keyboards/miniashen40/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2021 Francisco Escobar + * + * 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 . +*/ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( /* 0: qwerty */ + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_INS, KC_PGUP, + CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_DEL, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, + KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( /* 1: Symbols */ + 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, + MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT( /* 2: Fn */ + 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT( /*3: Media */ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; \ No newline at end of file diff --git a/keyboards/miniashen40/keymaps/via/rules.mk b/keyboards/miniashen40/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/miniashen40/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/miniashen40/miniashen40.c b/keyboards/miniashen40/miniashen40.c index 0fd51bf85748..2e570fa6f38d 100644 --- a/keyboards/miniashen40/miniashen40.c +++ b/keyboards/miniashen40/miniashen40.c @@ -12,4 +12,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "miniashen40.h"; \ No newline at end of file +#include "miniashen40.h" \ No newline at end of file diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/miniashen40/miniashen40.h index c453bcf72419..c44419d3d8fe 100644 --- a/keyboards/miniashen40/miniashen40.h +++ b/keyboards/miniashen40/miniashen40.h @@ -18,15 +18,25 @@ #include "quantum.h" +#define XXX KC_NO + +/* 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D \ - K30, K31, K33, K37, K3A, K3B, K3C, K3D, K3E \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ + K31, K32, K34, K38, K39, K3A, K3B, K3C, K3D \ ) \ { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D, K1E } \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ - { K30, K31, KC_NO, K33, KC_NO, KC_NO, KC_NO, K37, KC_NO, KC_NO, K3A, K38, K3C, K3D, K3E, }, \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, XXX }, \ + { XXX, K31, K32, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, K3B, K3C, K3D } \ } diff --git a/keyboards/miniashen40/miniashen40.json b/keyboards/miniashen40/miniashen40.json deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/miniashen40/rules.mk b/keyboards/miniashen40/rules.mk index e69de29bb2d1..e8f42342c35d 100644 --- a/keyboards/miniashen40/rules.mk +++ b/keyboards/miniashen40/rules.mk @@ -0,0 +1,32 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +LTO_ENABLE = yes \ No newline at end of file From 74b59ba39997f6bf457714aa469b91baa0f483bd Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Tue, 10 Aug 2021 02:31:09 -0500 Subject: [PATCH 04/15] Styles fixed --- keyboards/miniashen40/config.h | 31 ++++++++++--------- .../miniashen40/keymaps/default/keymap.c | 2 +- keyboards/miniashen40/keymaps/via/keymap.c | 2 +- keyboards/miniashen40/miniashen40.c | 30 +++++++++--------- keyboards/miniashen40/miniashen40.h | 2 +- keyboards/miniashen40/rules.mk | 17 +++------- 6 files changed, 40 insertions(+), 44 deletions(-) diff --git a/keyboards/miniashen40/config.h b/keyboards/miniashen40/config.h index f65cbf8c792d..211c8fbe4667 100644 --- a/keyboards/miniashen40/config.h +++ b/keyboards/miniashen40/config.h @@ -1,21 +1,24 @@ -/* -Copyright 2021 Franciso Escobar -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 . +/* Copyright 2021 Francisco Escobar + * + * 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 #include "config_common.h" +/* USB Device descriptor parameter */ #define VENDOR_ID 0x4D4B // MechanicKeys #define PRODUCT_ID 0x6D6E #define DEVICE_VER 0x0001 @@ -36,10 +39,8 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -/* R0 R1 R2 R3*/ #define MATRIX_ROW_PINS { B1, B2, B3, B4 } -/* COL0 COL1 COL2 COL3 COL4 COL5 COL6 COL7 COL8 COL9 COL10 COL11 COL12*/ -#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5} +#define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5 } #define UNUSED_PINS /* COL2ROW or ROW2COL */ diff --git a/keyboards/miniashen40/keymaps/default/keymap.c b/keyboards/miniashen40/keymaps/default/keymap.c index ac90e3da3324..2dcb3c0068f4 100644 --- a/keyboards/miniashen40/keymaps/default/keymap.c +++ b/keyboards/miniashen40/keymaps/default/keymap.c @@ -44,4 +44,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -}; \ No newline at end of file +}; diff --git a/keyboards/miniashen40/keymaps/via/keymap.c b/keyboards/miniashen40/keymaps/via/keymap.c index ac90e3da3324..2dcb3c0068f4 100644 --- a/keyboards/miniashen40/keymaps/via/keymap.c +++ b/keyboards/miniashen40/keymaps/via/keymap.c @@ -44,4 +44,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -}; \ No newline at end of file +}; diff --git a/keyboards/miniashen40/miniashen40.c b/keyboards/miniashen40/miniashen40.c index 2e570fa6f38d..d20c36104f1d 100644 --- a/keyboards/miniashen40/miniashen40.c +++ b/keyboards/miniashen40/miniashen40.c @@ -1,15 +1,17 @@ -/* -Copyright 2021 Franciso Escobar -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 . -*/ +/* Copyright 2021 Francisco Escobar + * + * 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 . +*/ -#include "miniashen40.h" \ No newline at end of file +#include "miniashen40.h" diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/miniashen40/miniashen40.h index c44419d3d8fe..8d924523b4f4 100644 --- a/keyboards/miniashen40/miniashen40.h +++ b/keyboards/miniashen40/miniashen40.h @@ -12,7 +12,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ +*/ #pragma once diff --git a/keyboards/miniashen40/rules.mk b/keyboards/miniashen40/rules.mk index e8f42342c35d..a0f03a5a2fc1 100644 --- a/keyboards/miniashen40/rules.mk +++ b/keyboards/miniashen40/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options @@ -25,8 +18,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -LTO_ENABLE = yes \ No newline at end of file +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +KEYBOARD_LOCK_ENABLE = yes +ENCODER_ENABLE = no +LTO_ENABLE = yes From 870739875e73c8a7ba17ad625c4d42cd9eba4592 Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Mon, 30 Aug 2021 01:57:00 -0500 Subject: [PATCH 05/15] keymap fixed --- keyboards/miniashen40/config.h | 2 +- .../miniashen40/keymaps/default/keymap.c | 26 +++++++++---------- keyboards/miniashen40/keymaps/via/keymap.c | 26 +++++++++---------- keyboards/miniashen40/keymaps/via/rules.mk | 3 ++- keyboards/miniashen40/miniashen40.h | 16 ++++++------ keyboards/miniashen40/rules.mk | 20 +++++++++----- 6 files changed, 50 insertions(+), 43 deletions(-) diff --git a/keyboards/miniashen40/config.h b/keyboards/miniashen40/config.h index 211c8fbe4667..a8e10e32783e 100644 --- a/keyboards/miniashen40/config.h +++ b/keyboards/miniashen40/config.h @@ -27,7 +27,7 @@ /* key matrix size */ #define MATRIX_ROWS 4 -#define MATRIX_COLS 14 +#define MATRIX_COLS 13 /* * Keyboard Matrix Assignments diff --git a/keyboards/miniashen40/keymaps/default/keymap.c b/keyboards/miniashen40/keymaps/default/keymap.c index 2dcb3c0068f4..0aa9476b4edf 100644 --- a/keyboards/miniashen40/keymaps/default/keymap.c +++ b/keyboards/miniashen40/keymaps/default/keymap.c @@ -18,30 +18,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* 0: qwerty */ - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_INS, KC_PGUP, - CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_DEL, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MPRV, KC_MNXT, + CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_MUTE, KC_MPLY, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, KC_BSPC, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( /* 1: Symbols */ - 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, - MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TRNS, KC_TRNS, + MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_EQL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT( /* 2: Fn */ - 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_TRNS, KC_TRNS, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( /*3: Media */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + [3] = LAYOUT( /*3: Empty */ + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/miniashen40/keymaps/via/keymap.c b/keyboards/miniashen40/keymaps/via/keymap.c index 2dcb3c0068f4..0aa9476b4edf 100644 --- a/keyboards/miniashen40/keymaps/via/keymap.c +++ b/keyboards/miniashen40/keymaps/via/keymap.c @@ -18,30 +18,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* 0: qwerty */ - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_INS, KC_PGUP, - CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_DEL, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, + KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MPRV, KC_MNXT, + CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_MUTE, KC_MPLY, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MO(1), KC_UP, KC_BSPC, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( /* 1: Symbols */ - 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_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, - MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_TRNS, KC_TRNS, + MO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSLS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS, KC_TRNS, KC_EQL, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT( /* 2: Fn */ - 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_TRNS, KC_TRNS, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( /*3: Media */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + [3] = LAYOUT( /*3: Empty */ + RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/miniashen40/keymaps/via/rules.mk b/keyboards/miniashen40/keymaps/via/rules.mk index 036bd6d1c3ec..36b7ba9cbc98 100644 --- a/keyboards/miniashen40/keymaps/via/rules.mk +++ b/keyboards/miniashen40/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/miniashen40/miniashen40.h index 8d924523b4f4..cfeb92913418 100644 --- a/keyboards/miniashen40/miniashen40.h +++ b/keyboards/miniashen40/miniashen40.h @@ -29,14 +29,14 @@ * represents the switch matrix. */ #define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \ - K31, K32, K34, K38, K39, K3A, K3B, K3C, K3D \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ + K30, K31, K33, K36, K38, K39, K3A, K3B, K3C \ ) \ { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, XXX }, \ - { XXX, K31, K32, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, K3B, K3C, K3D } \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ + { K30, K31, XXX, K33, XXX, XXX, K36, XXX, K38, K39, K3A, K3B, K3C } \ } diff --git a/keyboards/miniashen40/rules.mk b/keyboards/miniashen40/rules.mk index a0f03a5a2fc1..51d0b1ef7339 100644 --- a/keyboards/miniashen40/rules.mk +++ b/keyboards/miniashen40/rules.mk @@ -1,8 +1,15 @@ # MCU name -MCU = atmega32u4 +MCU = atmega328p # Bootloader selection -BOOTLOADER = atmel-dfu +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = USBasp # Build Options # change yes to no to disable @@ -18,8 +25,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output -KEYBOARD_LOCK_ENABLE = yes -ENCODER_ENABLE = no -LTO_ENABLE = yes +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 From 1b00c85ae5a1163b483ed72cf9de55583d39a6b9 Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Mon, 30 Aug 2021 02:36:54 -0500 Subject: [PATCH 06/15] Mini Ashen 40 docs added --- keyboards/{ => mechanickeys}/miniashen40/README.md | 8 ++++---- keyboards/{ => mechanickeys}/miniashen40/config.h | 2 +- keyboards/{ => mechanickeys}/miniashen40/info.json | 0 .../miniashen40/keymaps/default}/keymap.c | 4 ++-- .../miniashen40/keymaps/via}/keymap.c | 0 .../{ => mechanickeys}/miniashen40/keymaps/via/rules.mk | 0 keyboards/{ => mechanickeys}/miniashen40/miniashen40.c | 4 ++-- keyboards/{ => mechanickeys}/miniashen40/miniashen40.h | 2 +- keyboards/{ => mechanickeys}/miniashen40/rules.mk | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename keyboards/{ => mechanickeys}/miniashen40/README.md (78%) rename keyboards/{ => mechanickeys}/miniashen40/config.h (97%) rename keyboards/{ => mechanickeys}/miniashen40/info.json (100%) rename keyboards/{miniashen40/keymaps/via => mechanickeys/miniashen40/keymaps/default}/keymap.c (98%) rename keyboards/{miniashen40/keymaps/default => mechanickeys/miniashen40/keymaps/via}/keymap.c (100%) rename keyboards/{ => mechanickeys}/miniashen40/keymaps/via/rules.mk (100%) rename keyboards/{ => mechanickeys}/miniashen40/miniashen40.c (94%) rename keyboards/{ => mechanickeys}/miniashen40/miniashen40.h (97%) rename keyboards/{ => mechanickeys}/miniashen40/rules.mk (100%) diff --git a/keyboards/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/README.md similarity index 78% rename from keyboards/miniashen40/README.md rename to keyboards/mechanickeys/miniashen40/README.md index a8106f02337e..16413b063529 100644 --- a/keyboards/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/README.md @@ -1,10 +1,10 @@ # Mini Ashen 40 -![Mini Ashen 40](https://i.imgur.com/0EWBzNt.jpeg) +![Mini Ashen 40](https://i.imgur.com/0k3gFZCh.jpeg) -![Mini Ashen 40](https://i.imgur.com/m8z1kMV.jpeg) +![Mini Ashen 40](https://i.imgur.com/B1w8qwPh.jpeg) -![Mini Ashen 40](https://i.imgur.com/AZIfVzN.jpeg) +![Mini Ashen 40](https://i.imgur.com/LqxXW0Rh.jpeg) A 40% keyboard with some extras - Arrows @@ -12,7 +12,7 @@ A 40% keyboard with some extras - Full assembly with only through hole components * Keyboard Maintainer: [jfescobar18](https://github.com/jfescobar18) -* Hardware Supported: Mini Ashen 40 PCB +* Hardware Supported: Mini Ashen 40 PCB and Case * Hardware Availability: [MechanicKeys](https://www.facebook.com/MechanicKeys-104963764775280) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/miniashen40/config.h b/keyboards/mechanickeys/miniashen40/config.h similarity index 97% rename from keyboards/miniashen40/config.h rename to keyboards/mechanickeys/miniashen40/config.h index a8e10e32783e..bf2ea6e00f97 100644 --- a/keyboards/miniashen40/config.h +++ b/keyboards/mechanickeys/miniashen40/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Francisco Escobar +/* Copyright 2021 jfescobar18 * * 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 diff --git a/keyboards/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json similarity index 100% rename from keyboards/miniashen40/info.json rename to keyboards/mechanickeys/miniashen40/info.json diff --git a/keyboards/miniashen40/keymaps/via/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c similarity index 98% rename from keyboards/miniashen40/keymaps/via/keymap.c rename to keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c index 0aa9476b4edf..b49b5882fadf 100644 --- a/keyboards/miniashen40/keymaps/via/keymap.c +++ b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Francisco Escobar +/* Copyright 2021 jfescobar18 * * 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 @@ -12,7 +12,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ +*/ #include QMK_KEYBOARD_H diff --git a/keyboards/miniashen40/keymaps/default/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c similarity index 100% rename from keyboards/miniashen40/keymaps/default/keymap.c rename to keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c diff --git a/keyboards/miniashen40/keymaps/via/rules.mk b/keyboards/mechanickeys/miniashen40/keymaps/via/rules.mk similarity index 100% rename from keyboards/miniashen40/keymaps/via/rules.mk rename to keyboards/mechanickeys/miniashen40/keymaps/via/rules.mk diff --git a/keyboards/miniashen40/miniashen40.c b/keyboards/mechanickeys/miniashen40/miniashen40.c similarity index 94% rename from keyboards/miniashen40/miniashen40.c rename to keyboards/mechanickeys/miniashen40/miniashen40.c index d20c36104f1d..9c740e117e90 100644 --- a/keyboards/miniashen40/miniashen40.c +++ b/keyboards/mechanickeys/miniashen40/miniashen40.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Francisco Escobar +/* Copyright 2021 jfescobar18 * * 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 @@ -12,6 +12,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ +*/ #include "miniashen40.h" diff --git a/keyboards/miniashen40/miniashen40.h b/keyboards/mechanickeys/miniashen40/miniashen40.h similarity index 97% rename from keyboards/miniashen40/miniashen40.h rename to keyboards/mechanickeys/miniashen40/miniashen40.h index cfeb92913418..4430396b4116 100644 --- a/keyboards/miniashen40/miniashen40.h +++ b/keyboards/mechanickeys/miniashen40/miniashen40.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Francisco Escobar +/* Copyright 2021 jfescobar18 * * 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 diff --git a/keyboards/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk similarity index 100% rename from keyboards/miniashen40/rules.mk rename to keyboards/mechanickeys/miniashen40/rules.mk From e3f551f5804f3266539706378e88f1a6d656c005 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 30 Aug 2021 15:06:46 -0500 Subject: [PATCH 07/15] Update keyboards/mechanickeys/miniashen40/rules.mk Co-authored-by: Joel Challis --- keyboards/mechanickeys/miniashen40/rules.mk | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/keyboards/mechanickeys/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk index 51d0b1ef7339..b00440937553 100644 --- a/keyboards/mechanickeys/miniashen40/rules.mk +++ b/keyboards/mechanickeys/miniashen40/rules.mk @@ -2,19 +2,12 @@ MCU = atmega328p # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = USBasp # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug @@ -25,7 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From 7ecddef0a31a3fa0f88ef2735c5729db1c231d26 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 30 Aug 2021 15:06:57 -0500 Subject: [PATCH 08/15] Update keyboards/mechanickeys/miniashen40/README.md Co-authored-by: Joel Challis --- keyboards/mechanickeys/miniashen40/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechanickeys/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/README.md index 16413b063529..b9fa2e3fc08f 100644 --- a/keyboards/mechanickeys/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/README.md @@ -21,6 +21,6 @@ Make example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - make miniashen40:default:flash + make mechanickeys/miniashen40:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file From bce091836db0477e38e0ee0832b4c53a34db8c33 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 30 Aug 2021 15:07:21 -0500 Subject: [PATCH 09/15] Update keyboards/mechanickeys/miniashen40/README.md Co-authored-by: Joel Challis --- keyboards/mechanickeys/miniashen40/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechanickeys/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/README.md index b9fa2e3fc08f..97706a5e4790 100644 --- a/keyboards/mechanickeys/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/README.md @@ -17,7 +17,7 @@ A 40% keyboard with some extras Make example for this keyboard (after setting up your build environment): - make miniashen40/:default + make mechanickeys/miniashen40:default Flashing example for this keyboard: From b17d0602c074818087ddc3321391649f46df5051 Mon Sep 17 00:00:00 2001 From: Francisco Escobar Date: Wed, 1 Sep 2021 01:41:38 -0500 Subject: [PATCH 10/15] how to enter bootloader instructions added --- keyboards/mechanickeys/miniashen40/README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/keyboards/mechanickeys/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/README.md index 16413b063529..8a8e5919576a 100644 --- a/keyboards/mechanickeys/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/README.md @@ -17,10 +17,24 @@ A 40% keyboard with some extras Make example for this keyboard (after setting up your build environment): - make miniashen40/:default + make mechanickeys/miniashen40:default Flashing example for this keyboard: - make miniashen40:default:flash + make mechanickeys/miniashen40:default:flash -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical**: + 1. Press and hold ```BOOT``` switch + 2. Tap ```RESET``` switch + 3. Release ```BOOT``` switch +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + +## Flash bootloader +* [Follow this instructions](https://github.com/jfescobar18/USBaspLoader) \ No newline at end of file From 95517238b9ee586aa5ad170b390c233170eb682f Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Wed, 1 Sep 2021 23:28:06 -0500 Subject: [PATCH 11/15] Update keyboards/mechanickeys/miniashen40/info.json Co-authored-by: Ryan --- keyboards/mechanickeys/miniashen40/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json index 24bb7e34a738..6a6b1e951a4c 100644 --- a/keyboards/mechanickeys/miniashen40/info.json +++ b/keyboards/mechanickeys/miniashen40/info.json @@ -2,8 +2,6 @@ "keyboard_name": "Mini Ashen 40", "url": "", "maintainer": "qmk", - "width": 14.25, - "height": 4.25, "layouts": { "LAYOUT": { "layout": [ From 34d3e0aad848625d02c9cad66e65e8d2d04f6348 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 25 Oct 2021 01:16:57 -0500 Subject: [PATCH 12/15] Update keyboards/mechanickeys/miniashen40/README.md Co-authored-by: Ryan --- keyboards/mechanickeys/miniashen40/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mechanickeys/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/README.md index 8a8e5919576a..a84357f81c21 100644 --- a/keyboards/mechanickeys/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/README.md @@ -31,9 +31,9 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical**: - 1. Press and hold ```BOOT``` switch - 2. Tap ```RESET``` switch - 3. Release ```BOOT``` switch + 1. Press and hold `BOOT` switch + 2. Tap `RESET` switch + 3. Release `BOOT` switch * **Keycode in layout**: Press the key mapped to `RESET` if it is available ## Flash bootloader From 8f676f7fb1346d3eb0dd9642e9d13e7352f84794 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 25 Oct 2021 01:18:57 -0500 Subject: [PATCH 13/15] Update keyboards/mechanickeys/miniashen40/rules.mk Co-authored-by: Ryan --- keyboards/mechanickeys/miniashen40/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechanickeys/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk index b00440937553..fc21dd62ba87 100644 --- a/keyboards/mechanickeys/miniashen40/rules.mk +++ b/keyboards/mechanickeys/miniashen40/rules.mk @@ -2,7 +2,7 @@ MCU = atmega328p # Bootloader selection -BOOTLOADER = USBasp +BOOTLOADER = usbasploader # Build Options # change yes to no to disable From bb0e6091613e9f346fa781a603c72f71005f2ef3 Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 25 Oct 2021 01:19:04 -0500 Subject: [PATCH 14/15] Update keyboards/mechanickeys/miniashen40/rules.mk Co-authored-by: Ryan --- keyboards/mechanickeys/miniashen40/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mechanickeys/miniashen40/rules.mk b/keyboards/mechanickeys/miniashen40/rules.mk index fc21dd62ba87..2057d9c93990 100644 --- a/keyboards/mechanickeys/miniashen40/rules.mk +++ b/keyboards/mechanickeys/miniashen40/rules.mk @@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output From 9cb77620e1ffdbf6ef45f9972a4276f6003dd96f Mon Sep 17 00:00:00 2001 From: jfescobar18 <81986725+jfescobar18@users.noreply.github.com> Date: Mon, 25 Oct 2021 01:19:34 -0500 Subject: [PATCH 15/15] Rename README.md to readme.md --- keyboards/mechanickeys/miniashen40/{README.md => readme.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename keyboards/mechanickeys/miniashen40/{README.md => readme.md} (99%) diff --git a/keyboards/mechanickeys/miniashen40/README.md b/keyboards/mechanickeys/miniashen40/readme.md similarity index 99% rename from keyboards/mechanickeys/miniashen40/README.md rename to keyboards/mechanickeys/miniashen40/readme.md index a84357f81c21..29f7b68fd109 100644 --- a/keyboards/mechanickeys/miniashen40/README.md +++ b/keyboards/mechanickeys/miniashen40/readme.md @@ -37,4 +37,4 @@ Enter the bootloader in 3 ways: * **Keycode in layout**: Press the key mapped to `RESET` if it is available ## Flash bootloader -* [Follow this instructions](https://github.com/jfescobar18/USBaspLoader) \ No newline at end of file +* [Follow this instructions](https://github.com/jfescobar18/USBaspLoader)