From 9e13bd928b71763cd717df21d4236c745b98115d Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 19 Apr 2022 15:20:30 +0900 Subject: [PATCH 01/11] Blaster75 PR --- keyboards/blaster75/blaster75.c | 17 +++ keyboards/blaster75/blaster75.h | 107 ++++++++++++++++++ keyboards/blaster75/config.h | 44 +++++++ keyboards/blaster75/info.json | 12 ++ keyboards/blaster75/keymaps/default/keymap.c | 37 ++++++ keyboards/blaster75/keymaps/default/readme.md | 7 ++ keyboards/blaster75/keymaps/via/keymap.c | 52 +++++++++ keyboards/blaster75/keymaps/via/rules.mk | 1 + keyboards/blaster75/readme.md | 17 +++ keyboards/blaster75/rules.mk | 24 ++++ 10 files changed, 318 insertions(+) create mode 100644 keyboards/blaster75/blaster75.c create mode 100644 keyboards/blaster75/blaster75.h create mode 100644 keyboards/blaster75/config.h create mode 100644 keyboards/blaster75/info.json create mode 100644 keyboards/blaster75/keymaps/default/keymap.c create mode 100644 keyboards/blaster75/keymaps/default/readme.md create mode 100644 keyboards/blaster75/keymaps/via/keymap.c create mode 100644 keyboards/blaster75/keymaps/via/rules.mk create mode 100644 keyboards/blaster75/readme.md create mode 100644 keyboards/blaster75/rules.mk diff --git a/keyboards/blaster75/blaster75.c b/keyboards/blaster75/blaster75.c new file mode 100644 index 000000000000..2b5f60a5664f --- /dev/null +++ b/keyboards/blaster75/blaster75.c @@ -0,0 +1,17 @@ +/* Copyright 2021 Altain + * + * 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 "blaster75.h" \ No newline at end of file diff --git a/keyboards/blaster75/blaster75.h b/keyboards/blaster75/blaster75.h new file mode 100644 index 000000000000..7002a355f520 --- /dev/null +++ b/keyboards/blaster75/blaster75.h @@ -0,0 +1,107 @@ +/* Copyright 2021 Altain + * + * 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" + + +/* This section is to help viewers visually clarify the physical layout of Blaster 75 PCB. + +ANSI Layout : + * ,---------------------------------------------------------------- + * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS| + * ,---------------------------------------------------------------| + * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME| + * |---------------------------------------------------------------| + * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL| + * |---------------------------------------------------------------| + * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END| + * |---------------------------------------------------------------| + * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | | + * |---------------------------------------------------------------| + * |LCTL|LWIN|LALT| SPACE |RALT|RCTL| ← | ↓ | → | + * `---------------------------------------------------------------- + * + * + + +7U Spacebar Layout : + * ,---------------------------------------------------------------- + * | ESC| F1| F2| F3| F4| F5| F6| F7| F8| F9| F10| F11| F12|PSC|INS| + * ,---------------------------------------------------------------| + * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |HOME| + * |---------------------------------------------------------------| + * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | DEL| + * |---------------------------------------------------------------| + * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | ENTER| END| + * |---------------------------------------------------------------| + * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | | + * |---------------------------------------------------------------| + * | LCTL |LWIN| LALT | 7USPACE | RCTL | ← | ↓ | → | + * `---------------------------------------------------------------- + * + * */ + +#define XXX KC_NO + +#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, K1B, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \ + K50, K51, K52, K55, K59, K5B, K5C, K5D, K5E \ +) { \ + { 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, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \ + { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \ +} + +#define LAYOUT_blaster_75_ansi( \ + 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, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \ + K50, K51, K52, K55, K59, K5B, K5C, K5D, K5E \ +) { \ + { 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, K1C, K1D, K1E }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \ + { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \ +} + +#define LAYOUT_blaster_75_7u( \ + 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, K1C, K1D, K1E, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \ + K50, K51, K52, K55, K5B, K5C, K5D, K5E \ +) { \ + { 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, K1C, K1D, K1E }, \ + { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ + { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \ + { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E } \ +} diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h new file mode 100644 index 000000000000..21abd6e4cab8 --- /dev/null +++ b/keyboards/blaster75/config.h @@ -0,0 +1,44 @@ +/* +Copyright 2021 Altain + +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 0xA122 +#define PRODUCT_ID 0xB075 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Altain +#define PRODUCT Blaster75 + +/* Matrix Size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 15 + +/* Matrix Pinouts */ +// 0 1 2 3 4 5 6 7 8 9 A B C D E +#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } +#define MATRIX_COL_PINS { B0, B4, B5, B6, B7, C6, C7, D0, D1, D2, D3, D4, D5, D6, D7 } +#define UNUSED_PINS + +/* Diode Direction */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce Setting */ +#define DEBOUNCE 5 + + diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json new file mode 100644 index 000000000000..b1549c4e1481 --- /dev/null +++ b/keyboards/blaster75/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "Blaster 75", + "url": "", + "maintainer": "Altain", + "width": 16, + "height": 6.5, + "layouts": { + "LAYOUT": { + "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"PSCR", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Home", "x":15, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Del", "x":15, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"End", "x":15, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"\u2190", "x":13, "y":5.5}, {"label":"\u2193", "x":14, "y":5.5}, {"label":"\u2192", "x":15, "y":5.5}] + } + } +} \ No newline at end of file diff --git a/keyboards/blaster75/keymaps/default/keymap.c b/keyboards/blaster75/keymaps/default/keymap.c new file mode 100644 index 000000000000..c07b5c7f020b --- /dev/null +++ b/keyboards/blaster75/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2021 by Altain Studios + * + * 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( + 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_INS, \ + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_HOME, \ + 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_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_END, \ + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP, \ + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/keymaps/default/readme.md b/keyboards/blaster75/keymaps/default/readme.md new file mode 100644 index 000000000000..121bde2fff21 --- /dev/null +++ b/keyboards/blaster75/keymaps/default/readme.md @@ -0,0 +1,7 @@ +![Blaster75 Layout Image](https://i.imgur.com/qrvNWCo.png) + +This is the default keymap intended for Blaster 75 Custom Keyboard by Altain Studio. +This layout overall follows ANSI layout except the bottom rows. +Should the user wishes to, the bottom layout can be configured as the following: +1) 1.25 / 1.25 / 1.25 / 6.26u Spacebar / 1.25 / 1.25 , or +2) 1.5u / 1u / 1.5u / 7u Spacebar / 1.5u \ No newline at end of file diff --git a/keyboards/blaster75/keymaps/via/keymap.c b/keyboards/blaster75/keymaps/via/keymap.c new file mode 100644 index 000000000000..a613c2296df5 --- /dev/null +++ b/keyboards/blaster75/keymaps/via/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2021 by Altain Studios + * + * 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_all( + 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_INS, \ + KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_HOME, \ + 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_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_END, \ + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP, \ + KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RIGHT + ), + [1] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_all( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/keymaps/via/rules.mk b/keyboards/blaster75/keymaps/via/rules.mk new file mode 100644 index 000000000000..a2bcd453ac74 --- /dev/null +++ b/keyboards/blaster75/keymaps/via/rules.mk @@ -0,0 +1 @@ +via = enable \ No newline at end of file diff --git a/keyboards/blaster75/readme.md b/keyboards/blaster75/readme.md new file mode 100644 index 000000000000..4475c4527559 --- /dev/null +++ b/keyboards/blaster75/readme.md @@ -0,0 +1,17 @@ +# Blaster 75 + +Blaster 75 is a 75% ANSI layout Custom Keyboard designed and manufactured by Altain. + +* Keyboard Maintainer : Altain +* Hardware Supported : Blaster 75 +* Hardware Availability : Currently under Development + +Make example for this keyboard (after setting up your build environment): + + make altain/blaster75:default + +Flashing example for this keyboard: + + make altain/blaster75: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). diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk new file mode 100644 index 000000000000..94d42672babc --- /dev/null +++ b/keyboards/blaster75/rules.mk @@ -0,0 +1,24 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = yes # 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 +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = no + +LAYOUTS = blaster_75_ansi From 296b26b39500be21bdb3ce77779d518f5b4b4150 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 19 Apr 2022 15:57:44 +0900 Subject: [PATCH 02/11] Typo Fixes --- keyboards/blaster75/keymaps/default/keymap.c | 2 +- keyboards/blaster75/keymaps/via/keymap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/blaster75/keymaps/default/keymap.c b/keyboards/blaster75/keymaps/default/keymap.c index c07b5c7f020b..4cf0f34865f2 100644 --- a/keyboards/blaster75/keymaps/default/keymap.c +++ b/keyboards/blaster75/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 by Altain Studios +/* Copyright 2021 by Altain * * 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/blaster75/keymaps/via/keymap.c b/keyboards/blaster75/keymaps/via/keymap.c index a613c2296df5..715e1f8b211c 100644 --- a/keyboards/blaster75/keymaps/via/keymap.c +++ b/keyboards/blaster75/keymaps/via/keymap.c @@ -1,5 +1,4 @@ -/* Copyright 2021 by Altain Studios - * +/* Copyright 2021 by Altain * 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 From e4653f41231d928daf7d5d093e9a80463f001211 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Wed, 20 Apr 2022 09:16:07 +0900 Subject: [PATCH 03/11] lint check resolutions --- keyboards/blaster75/keymaps/via/keymap.c | 8 ++++---- keyboards/blaster75/keymaps/via/rules.mk | 2 +- keyboards/blaster75/readme.md | 4 ++-- keyboards/blaster75/rules.mk | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/keyboards/blaster75/keymaps/via/keymap.c b/keyboards/blaster75/keymaps/via/keymap.c index 715e1f8b211c..8e70421ef2db 100644 --- a/keyboards/blaster75/keymaps/via/keymap.c +++ b/keyboards/blaster75/keymaps/via/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( 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_INS, \ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_HOME, \ 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, \ @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP, \ KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ @@ -32,7 +32,7 @@ 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, KC_TRNS ), - [2] = LAYOUT_all( + [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ @@ -40,7 +40,7 @@ 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, KC_TRNS ), - [3] = LAYOUT_all( + [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/keymaps/via/rules.mk b/keyboards/blaster75/keymaps/via/rules.mk index a2bcd453ac74..036bd6d1c3ec 100644 --- a/keyboards/blaster75/keymaps/via/rules.mk +++ b/keyboards/blaster75/keymaps/via/rules.mk @@ -1 +1 @@ -via = enable \ No newline at end of file +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/blaster75/readme.md b/keyboards/blaster75/readme.md index 4475c4527559..2c76d01f94c6 100644 --- a/keyboards/blaster75/readme.md +++ b/keyboards/blaster75/readme.md @@ -8,10 +8,10 @@ Blaster 75 is a 75% ANSI layout Custom Keyboard designed and manufactured by Alt Make example for this keyboard (after setting up your build environment): - make altain/blaster75:default + make blaster75:default Flashing example for this keyboard: - make altain/blaster75:default:flash + make blaster75: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). diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk index 94d42672babc..ec5d1ad971d6 100644 --- a/keyboards/blaster75/rules.mk +++ b/keyboards/blaster75/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = yes # Console for debug @@ -21,4 +21,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = no -LAYOUTS = blaster_75_ansi From bf20a2c7c48984ddb557311f142f99e2c36d8fce Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Wed, 20 Apr 2022 16:37:17 +0900 Subject: [PATCH 04/11] readme.md, info.json, rules.mk fixes --- keyboards/blaster75/info.json | 2 -- keyboards/blaster75/readme.md | 11 +++++++++++ keyboards/blaster75/rules.mk | 5 +---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index b1549c4e1481..218f88b3a9d9 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -2,8 +2,6 @@ "keyboard_name": "Blaster 75", "url": "", "maintainer": "Altain", - "width": 16, - "height": 6.5, "layouts": { "LAYOUT": { "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"PSCR", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Home", "x":15, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Del", "x":15, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"End", "x":15, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"\u2190", "x":13, "y":5.5}, {"label":"\u2193", "x":14, "y":5.5}, {"label":"\u2192", "x":15, "y":5.5}] diff --git a/keyboards/blaster75/readme.md b/keyboards/blaster75/readme.md index 2c76d01f94c6..202afa4cb6d2 100644 --- a/keyboards/blaster75/readme.md +++ b/keyboards/blaster75/readme.md @@ -6,6 +6,17 @@ Blaster 75 is a 75% ANSI layout Custom Keyboard designed and manufactured by Alt * Hardware Supported : Blaster 75 * Hardware Availability : Currently under Development +## How to enter Bootloader Mode + +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. +We strongly recommend this method. If the PCB is not soldered with switches at the moment, use anything that's metal (twizzers for example) +to short the (0,0) key (ESC in our PCB) while plugging the USB. + +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + Make example for this keyboard (after setting up your build environment): make blaster75:default diff --git a/keyboards/blaster75/rules.mk b/keyboards/blaster75/rules.mk index ec5d1ad971d6..71b1f83d0c2c 100644 --- a/keyboards/blaster75/rules.mk +++ b/keyboards/blaster75/rules.mk @@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = yes # 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 +NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output From 9b2c9da081e880c5a223817b40a1f212a3f71f4b Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Thu, 21 Apr 2022 08:41:32 +0900 Subject: [PATCH 05/11] fixes for keymaps, image links and RGB rules --- keyboards/blaster75/keymaps/default/keymap.c | 6 +++--- keyboards/blaster75/keymaps/via/keymap.c | 6 +++--- keyboards/blaster75/rules.mk | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/keyboards/blaster75/keymaps/default/keymap.c b/keyboards/blaster75/keymaps/default/keymap.c index 4cf0f34865f2..408d00dae0ad 100644 --- a/keyboards/blaster75/keymaps/default/keymap.c +++ b/keyboards/blaster75/keymaps/default/keymap.c @@ -19,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( 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_INS, \ - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_HOME, \ + 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_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_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_END, \ - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP, \ - KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RIGHT + 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_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/keymaps/via/keymap.c b/keyboards/blaster75/keymaps/via/keymap.c index 8e70421ef2db..9862baaf5f58 100644 --- a/keyboards/blaster75/keymaps/via/keymap.c +++ b/keyboards/blaster75/keymaps/via/keymap.c @@ -18,11 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( 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_INS, \ - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_HOME, \ + 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_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_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_END, \ - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT, KC_UP, \ - KC_LCTL, KC_LWIN, KC_LALT, KC_SPACE, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RIGHT + 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_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/rules.mk b/keyboards/blaster75/rules.mk index 71b1f83d0c2c..d851baa2c4d8 100644 --- a/keyboards/blaster75/rules.mk +++ b/keyboards/blaster75/rules.mk @@ -16,5 +16,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = no From 51c21ca82fa4b6a51fb118b15767c25194927052 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Thu, 21 Apr 2022 08:46:36 +0900 Subject: [PATCH 06/11] keymap / deletions --- keyboards/blaster75/keymaps/default/keymap.c | 20 +++++----- keyboards/blaster75/keymaps/via/keymap.c | 40 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/keyboards/blaster75/keymaps/default/keymap.c b/keyboards/blaster75/keymaps/default/keymap.c index 408d00dae0ad..e36110ef0257 100644 --- a/keyboards/blaster75/keymaps/default/keymap.c +++ b/keyboards/blaster75/keymaps/default/keymap.c @@ -18,19 +18,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_INS, \ - 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_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_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_END, \ - 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_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_INS, + 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_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_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_END, + 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_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/blaster75/keymaps/via/keymap.c b/keyboards/blaster75/keymaps/via/keymap.c index 9862baaf5f58..a63cfcf8ec15 100644 --- a/keyboards/blaster75/keymaps/via/keymap.c +++ b/keyboards/blaster75/keymaps/via/keymap.c @@ -17,35 +17,35 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - 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_INS, \ - 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_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_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_END, \ - 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_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_INS, + 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_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_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_END, + 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_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), [2] = LAYOUT( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; From 6391f088b4eb482f40ca96905e2aa8384b3b74c1 Mon Sep 17 00:00:00 2001 From: ALTAiN <102286038+Altainworks@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:13:31 +0900 Subject: [PATCH 07/11] Update keyboards/blaster75/keymaps/default/readme.md Co-authored-by: Ryan --- keyboards/blaster75/keymaps/default/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/blaster75/keymaps/default/readme.md b/keyboards/blaster75/keymaps/default/readme.md index 121bde2fff21..9ec253d7aa4c 100644 --- a/keyboards/blaster75/keymaps/default/readme.md +++ b/keyboards/blaster75/keymaps/default/readme.md @@ -1,4 +1,4 @@ -![Blaster75 Layout Image](https://i.imgur.com/qrvNWCo.png) +![Blaster75 Layout Image](https://i.imgur.com/qrvNWCoh.png) This is the default keymap intended for Blaster 75 Custom Keyboard by Altain Studio. This layout overall follows ANSI layout except the bottom rows. From 9c69f9ebfe15425483e03a8c113dbcac3993bf59 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 26 Apr 2022 12:04:25 +0900 Subject: [PATCH 08/11] info.json cleanup --- keyboards/blaster75/info.json | 89 ++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 218f88b3a9d9..0e89f54010dc 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -4,7 +4,94 @@ "maintainer": "Altain", "layouts": { "LAYOUT": { - "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"PSCR", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Home", "x":15, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Del", "x":15, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"End", "x":15, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"\u2191", "x":14, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"\u2190", "x":13, "y":5.5}, {"label":"\u2193", "x":14, "y":5.5}, {"label":"\u2192", "x":15, "y":5.5}] + "layout": [ + {"label":"ESC", "x":0, "y":0}, + {"label":"F1", "x":1.25, "y":0}, + {"label":"F2", "x":2.25, "y":0}, + {"label":"F3", "x":3.25, "y":0}, + {"label":"F4", "x":4.25, "y":0}, + {"label":"F5", "x":5.5, "y":0}, + {"label":"F6", "x":6.5, "y":0}, + {"label":"F7", "x":7.5, "y":0}, + {"label":"F8", "x":8.5, "y":0}, + {"label":"F9", "x":9.75, "y":0}, + {"label":"F10", "x":10.75, "y":0}, + {"label":"F11", "x":11.75, "y":0}, + {"label":"F12", "x":12.75, "y":0}, + {"label":"PSCR", "x":14, "y":0}, + {"label":"Ins", "x":15, "y":0}, + + {"label":"~", "x":0, "y":1.5}, + {"label":"!", "x":1, "y":1.5}, + {"label":"@", "x":2, "y":1.5}, + {"label":"#", "x":3, "y":1.5}, + {"label":"$", "x":4, "y":1.5}, + {"label":"%", "x":5, "y":1.5}, + {"label":"^", "x":6, "y":1.5}, + {"label":"&", "x":7, "y":1.5}, + {"label":"*", "x":8, "y":1.5}, + {"label":"(", "x":9, "y":1.5}, + {"label":")", "x":10, "y":1.5}, + {"label":"_", "x":11, "y":1.5}, + {"label":"+", "x":12, "y":1.5}, + {"label":"Backspace", "x":13, "y":1.5, "w":2}, + {"label":"Home", "x":15, "y":1.5}, + + {"label":"Tab", "x":0, "y":2.5, "w":1.5}, + {"label":"Q", "x":1.5, "y":2.5}, + {"label":"W", "x":2.5, "y":2.5}, + {"label":"E", "x":3.5, "y":2.5}, + {"label":"R", "x":4.5, "y":2.5}, + {"label":"T", "x":5.5, "y":2.5}, + {"label":"Y", "x":6.5, "y":2.5}, + {"label":"U", "x":7.5, "y":2.5}, + {"label":"I", "x":8.5, "y":2.5}, + {"label":"O", "x":9.5, "y":2.5}, + {"label":"P", "x":10.5, "y":2.5}, + {"label":"{", "x":11.5, "y":2.5}, + {"label":"}", "x":12.5, "y":2.5}, + {"label":"|", "x":13.5, "y":2.5, "w":1.5}, + {"label":"Del", "x":15, "y":2.5}, + + {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, + {"label":"A", "x":1.75, "y":3.5}, + {"label":"S", "x":2.75, "y":3.5}, + {"label":"D", "x":3.75, "y":3.5}, + {"label":"F", "x":4.75, "y":3.5}, + {"label":"G", "x":5.75, "y":3.5}, + {"label":"H", "x":6.75, "y":3.5}, + {"label":"J", "x":7.75, "y":3.5}, + {"label":"K", "x":8.75, "y":3.5}, + {"label":"L", "x":9.75, "y":3.5}, + {"label":":", "x":10.75, "y":3.5}, + {"label":"\"", "x":11.75, "y":3.5}, + {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, + {"label":"End", "x":15, "y":3.5}, + + {"label":"Shift", "x":0, "y":4.5, "w":2.25}, + {"label":"Z", "x":2.25, "y":4.5}, + {"label":"X", "x":3.25, "y":4.5}, + {"label":"C", "x":4.25, "y":4.5}, + {"label":"V", "x":5.25, "y":4.5}, + {"label":"B", "x":6.25, "y":4.5}, + {"label":"N", "x":7.25, "y":4.5}, + {"label":"M", "x":8.25, "y":4.5}, + {"label":"<", "x":9.25, "y":4.5}, + {"label":">", "x":10.25, "y":4.5}, + {"label":"?", "x":11.25, "y":4.5}, + {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, + {"label":"\u2191", "x":14, "y":4.5}, + + {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, + {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, + {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, + {"label":"Spacebar", "x":3.75, "y":5.5, "w":6.25}, + {"label":"Alt", "x":10, "y":5.5, "w":1.25}, + {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, + {"label":"\u2190", "x":13, "y":5.5}, + {"label":"\u2193", "x":14, "y":5.5}, + {"label":"\u2192", "x":15, "y":5.5} + ] } } } \ No newline at end of file From f20cab6072912c5dd6a7ff08aeb709c065d03d65 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 26 Apr 2022 12:15:09 +0900 Subject: [PATCH 09/11] text cleanups --- keyboards/blaster75/keymaps/default/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/blaster75/keymaps/default/readme.md b/keyboards/blaster75/keymaps/default/readme.md index 121bde2fff21..9ec253d7aa4c 100644 --- a/keyboards/blaster75/keymaps/default/readme.md +++ b/keyboards/blaster75/keymaps/default/readme.md @@ -1,4 +1,4 @@ -![Blaster75 Layout Image](https://i.imgur.com/qrvNWCo.png) +![Blaster75 Layout Image](https://i.imgur.com/qrvNWCoh.png) This is the default keymap intended for Blaster 75 Custom Keyboard by Altain Studio. This layout overall follows ANSI layout except the bottom rows. From 65c4860df025d0c9b7812565966ed8e54217a1f4 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 24 May 2022 13:22:31 +0900 Subject: [PATCH 10/11] Various Changes and Fixes --- keyboards/blaster75/blaster75.h | 28 +- keyboards/blaster75/config.h | 6 +- keyboards/blaster75/info.json | 261 ++++++++++++------ keyboards/blaster75/keymaps/default/readme.md | 2 +- keyboards/blaster75/readme.md | 7 +- 5 files changed, 193 insertions(+), 111 deletions(-) diff --git a/keyboards/blaster75/blaster75.h b/keyboards/blaster75/blaster75.h index 7002a355f520..b3b6995d3059 100644 --- a/keyboards/blaster75/blaster75.h +++ b/keyboards/blaster75/blaster75.h @@ -33,7 +33,7 @@ ANSI Layout : * |---------------------------------------------------------------| * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | | * |---------------------------------------------------------------| - * |LCTL|LWIN|LALT| SPACE |RALT|RCTL| ← | ↓ | → | + * |LCTL|LWIN|LALT| 6.25U SPACE |RALT|RCTL| ← | ↓ | → | * `---------------------------------------------------------------- * * @@ -51,13 +51,16 @@ ANSI Layout : * |---------------------------------------------------------------| * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT | ↑ | | * |---------------------------------------------------------------| - * | LCTL |LWIN| LALT | 7USPACE | RCTL | ← | ↓ | → | + * | LCTL |LWIN| LALT | 7U SPACE | RCTL | ← | ↓ | → | * `---------------------------------------------------------------- * * */ #define XXX KC_NO +// BLASTER75 DEFAULT ANSI LAYOUT +// 6.25U SPACEBAR +// BOTTOM ROW 1.25 , 1.25 , 1.25 , 6.25 , 1.25 , 1.25 CONFIGURATION #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, K1B, K1C, K1D, K1E, \ @@ -74,23 +77,10 @@ ANSI Layout : { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \ } -#define LAYOUT_blaster_75_ansi( \ - 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, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4B, K4C, K4D, \ - K50, K51, K52, K55, K59, K5B, K5C, K5D, K5E \ -) { \ - { 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, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, XXX, K4B, K4C, K4D, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, XXX, K5B, K5C, K5D, K5E } \ -} - -#define LAYOUT_blaster_75_7u( \ +// BLASTER75 7U LAYOUT +// 7U SPACEBAR +// BOTTOM ROW 1.5 , 1 , 1.5 , 7 , 1.5 CONFIGURATION +#define LAYOUT_7u( \ 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, K1C, K1D, K1E, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ diff --git a/keyboards/blaster75/config.h b/keyboards/blaster75/config.h index 21abd6e4cab8..61a9a754fb30 100644 --- a/keyboards/blaster75/config.h +++ b/keyboards/blaster75/config.h @@ -19,9 +19,9 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xA122 -#define PRODUCT_ID 0xB075 -#define DEVICE_VER 0x0001 +#define VENDOR_ID 0xA122 +#define PRODUCT_ID 0xB075 +#define DEVICE_VER 0x0001 #define MANUFACTURER Altain #define PRODUCT Blaster75 diff --git a/keyboards/blaster75/info.json b/keyboards/blaster75/info.json index 0e89f54010dc..3bedb1b71529 100644 --- a/keyboards/blaster75/info.json +++ b/keyboards/blaster75/info.json @@ -5,92 +5,181 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"PSCR", "x":14, "y":0}, - {"label":"Ins", "x":15, "y":0}, - - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Home", "x":15, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Del", "x":15, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"End", "x":15, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"\u2191", "x":14, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Spacebar", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":13, "y":5.5}, - {"label":"\u2193", "x":14, "y":5.5}, - {"label":"\u2192", "x":15, "y":5.5} + {"label": "ESC", "y": 0,"x": 0}, + {"label": "F1", "y": 0,"x": 1.25}, + {"label": "F2", "y": 0,"x": 2.25}, + {"label": "F3", "y": 0,"x": 3.25}, + {"label": "F4", "y": 0,"x": 4.25}, + {"label": "F5", "y": 0,"x": 5.5}, + {"label": "F6", "y": 0,"x": 6.5}, + {"label": "F7", "y": 0,"x": 7.5}, + {"label": "F8", "y": 0,"x": 8.5}, + {"label": "F9", "y": 0,"x": 9.75}, + {"label": "F10", "y": 0,"x": 10.75}, + {"label": "F11", "y": 0,"x": 11.75}, + {"label": "F12", "y": 0,"x": 12.75}, + {"label": "PrtSc", "y": 0,"x": 14}, + {"label": "INS", "y": 0,"x": 15}, + + {"label": "~", "y": 1.25,"x": 0}, + {"label": "!", "y": 1.25,"x": 1}, + {"label": "@", "y": 1.25,"x": 2}, + {"label": "#", "y": 1.25,"x": 3}, + {"label": "$", "y": 1.25,"x": 4}, + {"label": "%", "y": 1.25,"x": 5}, + {"label": "^", "y": 1.25,"x": 6}, + {"label": "&", "y": 1.25,"x": 7}, + {"label": "*", "y": 1.25,"x": 8}, + {"label": "(", "y": 1.25,"x": 9}, + {"label": ")", "y": 1.25,"x": 10}, + {"label": "_", "y": 1.25,"x": 11}, + {"label": "+", "y": 1.25,"x": 12}, + {"label": "Backspace", "y": 1.5,"x": 13, "w": 2}, + {"label": "Home", "y": 1.5,"x": 15}, + + {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5}, + {"label": "Q", "y": 2.25,"x": 1.5}, + {"label": "W", "y": 2.25,"x": 2.5}, + {"label": "E", "y": 2.25,"x": 3.5}, + {"label": "R", "y": 2.25,"x": 4.5}, + {"label": "T", "y": 2.25,"x": 5.5}, + {"label": "Y", "y": 2.25,"x": 6.5}, + {"label": "U", "y": 2.25,"x": 7.5}, + {"label": "I", "y": 2.25,"x": 8.5}, + {"label": "O", "y": 2.25,"x": 9.5}, + {"label": "P", "y": 2.25,"x": 10.5}, + {"label": "{", "y": 2.25,"x": 11.5}, + {"label": "}", "y": 2.25,"x": 12.5}, + {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5}, + {"label": "Del", "y": 2.25,"x": 15}, + + {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75}, + {"label": "A", "y": 3.25,"x": 1.75}, + {"label": "S", "y": 3.25,"x": 2.75}, + {"label": "D", "y": 3.25,"x": 3.75}, + {"label": "F", "y": 3.25,"x": 4.75}, + {"label": "G", "y": 3.25,"x": 5.75}, + {"label": "H", "y": 3.25,"x": 6.75}, + {"label": "J", "y": 3.25,"x": 7.75}, + {"label": "K", "y": 3.25,"x": 8.75}, + {"label": "L", "y": 3.25,"x": 9.75}, + {"label": ":", "y": 3.25,"x": 10.75}, + {"label": "\"", "y": 3.25,"x": 11.75}, + {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25}, + {"label": "End", "y": 3.25,"x": 15}, + + {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25}, + {"label": "Z", "y": 4.25,"x": 2.25}, + {"label": "X", "y": 4.25,"x": 3.25}, + {"label": "C", "y": 4.25,"x": 4.25}, + {"label": "V", "y": 4.25,"x": 5.25}, + {"label": "B", "y": 4.25,"x": 6.25}, + {"label": "N", "y": 4.25,"x": 7.25}, + {"label": "M", "y": 4.25,"x": 8.25}, + {"label": "<", "y": 4.25,"x": 9.25}, + {"label": ">", "y": 4.25,"x": 10.25}, + {"label": "?", "y": 4.25,"x": 11.25}, + {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75}, + {"label": "\u2191", "y": 4.25,"x": 14}, + + {"label":"Ctrl", "y":5.25, "x":0, "w":1.25}, + {"label":"Win", "y":5.25, "x":1.25, "w": 1.25}, + {"label":"Alt", "y":5.25, "x":2.5, "w":1.25}, + {"label":"Spacebar", "y":5.25, "x":3.75, "w":6.25}, + {"label":"Win", "y":5.25, "x":10, "w":1.25}, + {"label":"Alt", "y":5.25, "x":11.25, "w":1.25}, + {"label":"\u2190", "y":5.25, "x":13}, + {"label":"\u2193", "y":5.25, "x":14}, + {"label":"\u2192", "y":5.25, "x":15} + ] + }, + "LAYOUT_7u": { + "layout": [ + {"label": "ESC", "y": 0,"x": 0}, + {"label": "F1", "y": 0,"x": 1.25}, + {"label": "F2", "y": 0,"x": 2.25}, + {"label": "F3", "y": 0,"x": 3.25}, + {"label": "F4", "y": 0,"x": 4.25}, + {"label": "F5", "y": 0,"x": 5.5}, + {"label": "F6", "y": 0,"x": 6.5}, + {"label": "F7", "y": 0,"x": 7.5}, + {"label": "F8", "y": 0,"x": 8.5}, + {"label": "F9", "y": 0,"x": 9.75}, + {"label": "F10", "y": 0,"x": 10.75}, + {"label": "F11", "y": 0,"x": 11.75}, + {"label": "F12", "y": 0,"x": 12.75}, + {"label": "PrtSc", "y": 0,"x": 14}, + {"label": "INS", "y": 0,"x": 15}, + + {"label": "~", "y": 1.25,"x": 0}, + {"label": "!", "y": 1.25,"x": 1}, + {"label": "@", "y": 1.25,"x": 2}, + {"label": "#", "y": 1.25,"x": 3}, + {"label": "$", "y": 1.25,"x": 4}, + {"label": "%", "y": 1.25,"x": 5}, + {"label": "^", "y": 1.25,"x": 6}, + {"label": "&", "y": 1.25,"x": 7}, + {"label": "*", "y": 1.25,"x": 8}, + {"label": "(", "y": 1.25,"x": 9}, + {"label": ")", "y": 1.25,"x": 10}, + {"label": "_", "y": 1.25,"x": 11}, + {"label": "+", "y": 1.25,"x": 12}, + {"label": "Backspace", "y": 1.5,"x": 13, "w": 2}, + {"label": "Home", "y": 1.5,"x": 15}, + + {"label": "Tab", "y": 2.25,"x": 0, "w": 1.5}, + {"label": "Q", "y": 2.25,"x": 1.5}, + {"label": "W", "y": 2.25,"x": 2.5}, + {"label": "E", "y": 2.25,"x": 3.5}, + {"label": "R", "y": 2.25,"x": 4.5}, + {"label": "T", "y": 2.25,"x": 5.5}, + {"label": "Y", "y": 2.25,"x": 6.5}, + {"label": "U", "y": 2.25,"x": 7.5}, + {"label": "I", "y": 2.25,"x": 8.5}, + {"label": "O", "y": 2.25,"x": 9.5}, + {"label": "P", "y": 2.25,"x": 10.5}, + {"label": "{", "y": 2.25,"x": 11.5}, + {"label": "}", "y": 2.25,"x": 12.5}, + {"label": "|", "y": 2.25,"x": 13.5, "w": 1.5}, + {"label": "Del", "y": 2.25,"x": 15}, + + {"label": "Caps Lock", "y": 3.25,"x": 0, "w": 1.75}, + {"label": "A", "y": 3.25,"x": 1.75}, + {"label": "S", "y": 3.25,"x": 2.75}, + {"label": "D", "y": 3.25,"x": 3.75}, + {"label": "F", "y": 3.25,"x": 4.75}, + {"label": "G", "y": 3.25,"x": 5.75}, + {"label": "H", "y": 3.25,"x": 6.75}, + {"label": "J", "y": 3.25,"x": 7.75}, + {"label": "K", "y": 3.25,"x": 8.75}, + {"label": "L", "y": 3.25,"x": 9.75}, + {"label": ":", "y": 3.25,"x": 10.75}, + {"label": "\"", "y": 3.25,"x": 11.75}, + {"label": "Enter", "y": 3.25,"x": 12.75, "w": 2.25}, + {"label": "End", "y": 3.25,"x": 15}, + + {"label": "Shift", "y": 4.25,"x": 0, "w": 2.25}, + {"label": "Z", "y": 4.25,"x": 2.25}, + {"label": "X", "y": 4.25,"x": 3.25}, + {"label": "C", "y": 4.25,"x": 4.25}, + {"label": "V", "y": 4.25,"x": 5.25}, + {"label": "B", "y": 4.25,"x": 6.25}, + {"label": "N", "y": 4.25,"x": 7.25}, + {"label": "M", "y": 4.25,"x": 8.25}, + {"label": "<", "y": 4.25,"x": 9.25}, + {"label": ">", "y": 4.25,"x": 10.25}, + {"label": "?", "y": 4.25,"x": 11.25}, + {"label": "Shift", "y": 4.25,"x": 12.25, "w": 1.75}, + {"label": "\u2191", "y": 4.25,"x": 14}, + + {"label":"Ctrl", "y":5.25, "x": 0, "w":1.5}, + {"label":"Win", "y":5.25, "x":1.5}, + {"label":"Alt", "y":5.25, "x":2.5, "w":1.5}, + {"label":"Spacebar", "y":5.25, "x":4, "w":7}, + {"label":"Alt", "y":5.25, "x":11, "w":1.5}, + {"label":"\u2190", "y":5.25, "x":13}, + {"label":"\u2193", "y":5.25, "x":14}, + {"label":"\u2192", "y":5.25, "x":15} ] } } diff --git a/keyboards/blaster75/keymaps/default/readme.md b/keyboards/blaster75/keymaps/default/readme.md index 9ec253d7aa4c..16bb7d7124a3 100644 --- a/keyboards/blaster75/keymaps/default/readme.md +++ b/keyboards/blaster75/keymaps/default/readme.md @@ -1,6 +1,6 @@ ![Blaster75 Layout Image](https://i.imgur.com/qrvNWCoh.png) -This is the default keymap intended for Blaster 75 Custom Keyboard by Altain Studio. +This is the default keymap intended for Blaster 75 Custom Keyboard by ALTAiN. This layout overall follows ANSI layout except the bottom rows. Should the user wishes to, the bottom layout can be configured as the following: 1) 1.25 / 1.25 / 1.25 / 6.26u Spacebar / 1.25 / 1.25 , or diff --git a/keyboards/blaster75/readme.md b/keyboards/blaster75/readme.md index 202afa4cb6d2..f63cc3e0b63e 100644 --- a/keyboards/blaster75/readme.md +++ b/keyboards/blaster75/readme.md @@ -4,7 +4,10 @@ Blaster 75 is a 75% ANSI layout Custom Keyboard designed and manufactured by Alt * Keyboard Maintainer : Altain * Hardware Supported : Blaster 75 -* Hardware Availability : Currently under Development +* Hardware Availability : Produced and Sold by ALTAiN +* Mount : Top-Mount System +* Typing Angle : 6 Degree +* Front Height : 20.2mm ## How to enter Bootloader Mode @@ -12,7 +15,7 @@ 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. We strongly recommend this method. If the PCB is not soldered with switches at the moment, use anything that's metal (twizzers for example) -to short the (0,0) key (ESC in our PCB) while plugging the USB. +to short the (0,0) position key ("ESC" in our PCB) while plugging the USB in. * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead * **Keycode in layout**: Press the key mapped to `RESET` if it is available From d57eb14a74086cd26ab4cf9465ca0ae38f839417 Mon Sep 17 00:00:00 2001 From: ALTAiN Date: Tue, 7 Jun 2022 14:49:52 +0900 Subject: [PATCH 11/11] Readme text fix --- keyboards/blaster75/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/blaster75/readme.md b/keyboards/blaster75/readme.md index f63cc3e0b63e..1a03ec5a9f77 100644 --- a/keyboards/blaster75/readme.md +++ b/keyboards/blaster75/readme.md @@ -2,7 +2,7 @@ Blaster 75 is a 75% ANSI layout Custom Keyboard designed and manufactured by Altain. -* Keyboard Maintainer : Altain +* Keyboard Maintainer : ALTAiN * Hardware Supported : Blaster 75 * Hardware Availability : Produced and Sold by ALTAiN * Mount : Top-Mount System