diff options
60 files changed, 968 insertions, 957 deletions
diff --git a/keyboards/amj40/amj40.c b/keyboards/amj40/amj40.c index 20742c3252..f0f3121c6a 100755 --- a/keyboards/amj40/amj40.c +++ b/keyboards/amj40/amj40.c @@ -1 +1,17 @@ +/* Copyright 2017 Fabian Topfstedt + * + * 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 <http://www.gnu.org/licenses/>. + */ + #include "amj40.h" diff --git a/keyboards/amj40/amj40.h b/keyboards/amj40/amj40.h index 613f3740f9..14ea383811 100755 --- a/keyboards/amj40/amj40.h +++ b/keyboards/amj40/amj40.h @@ -1,26 +1,52 @@ -#ifndef AMJ40_H -#define AMJ40_H +/* Copyright 2017 Fabian Topfstedt + * Copyright 2021 James Young (@noroadsleft) + * + * 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 <http://www.gnu.org/licenses/>. + */ + +#pragma once #include "quantum.h" -// readability #define XXX KC_NO -/* AMJ40 ver2.0 layout1 ι
εδΈ - * ,-----------------------------------------------------------. - * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 0B | - * |-----------------------------------------------------------| - * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1B | - * |-----------------------------------------------------------| - * | 20 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | 2B | - * |-----------------------------------------------------------| - * | 30 | 31 | 32 | 34 | 35 | 39 | 3A | 3B | - * `-----------------------------------------------------------' +/* AMJ40 ver2.0 staggered layouts + * ,-----------------------------------------------. + * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b | + * |-----------------------------------------------| + * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1b | + * |-----------------------------------------------| + * |20 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b | + * |-----------------------------------------------| + * |30 |31 |32 | 34 |35 |39 |3a |3b | Layout 1 Bottom Row + * `-----------------------------------------------' + * ,-----------------------------------------------. + * |30 |31 |32 | 35 |3a |3b | Layout 2 + * `-----------------------------------------------' + * ,-----------------------------------------------. + * |30 |31 |32 | 34 | 35 |39 |3a |3b | Layout 3 + * `-----------------------------------------------' + * ,-----------------------------------------------. + * |30 |31 |32 | 35 |3a |3b | Layout 4 + * `-----------------------------------------------' */ + +// a.k.a. Layout 1 or Layout 3 (matrix is the same for both) #define LAYOUT( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ k30, k31, k32, k34, k35, k39, k3a, k3b \ ) { \ {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b}, \ @@ -29,10 +55,55 @@ {k30, k31, k32, XXX, k34, k35, XXX, XXX, XXX, k39, k3a, k3b} \ } +// a.k.a. Layout 2 or Layout 4 (matrix is the same for both) +#define LAYOUT_625u_space( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b, \ + k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k35, k3a, k3b \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1b }, \ + { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, XXX, XXX, k35, XXX, XXX, XXX, XXX, k3a, k3b } \ +} +/* AMJ40 ver2.0 ortholinear layouts + * ,-----------------------------------------------. + * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0a |0b | + * |-----------------------------------------------| + * |10 |11 |12 |13 |14 |15 |16 |17 |18 |19 |1a |1b | + * |-----------------------------------------------| + * |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |2a |2b | + * |-----------------------------------------------| + * |30 |31 |32 |33 |34 | 35 |38 |39 |3a |3b | 2.75u Spacebar + * `-----------------------------------------------' + * ,-----------------------------------------------. + * |30 |31 |32 | 35 |39 |3a |3b | 6u Spacebar + * `-----------------------------------------------' + */ +// equivalent to LAYOUT_all +#define LAYOUT_ortho_275u_space( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k33, k34, k35, k38, k39, k3a, k3b \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, k33, k34, k35, XXX, XXX, k38, k39, k3a, k3b } \ +} -void matrix_init_user(void); -void matrix_scan_user(void); - -#endif +#define LAYOUT_ortho_600u_space( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ + k30, k31, k32, k35, k39, k3a, k3b \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ + { k30, k31, k32, XXX, XXX, k35, XXX, XXX, XXX, k39, k3a, k3b } \ +} diff --git a/keyboards/amj40/config.h b/keyboards/amj40/config.h index f445107eee..7fce438337 100755 --- a/keyboards/amj40/config.h +++ b/keyboards/amj40/config.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include "config_common.h" @@ -87,5 +86,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/amj40/info.json b/keyboards/amj40/info.json index 1b25106e0c..780369c1b0 100644 --- a/keyboards/amj40/info.json +++ b/keyboards/amj40/info.json @@ -1,11 +1,208 @@ { - "keyboard_name": "AMJ40", - "maintainer": "qmk", - "width": 12, - "height": 4, - "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2, "w":1.25}, {"x":11, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3, "w":2.75}, {"x":8.5, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3, "w":1.25}] + "keyboard_name": "AMJ40", + "url": "", + "maintainer": "qmk", + "width": 12, + "height": 4, + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + + {"x":0, "y":1, "w":1.25}, + {"x":1.25, "y":1}, + {"x":2.25, "y":1}, + {"x":3.25, "y":1}, + {"x":4.25, "y":1}, + {"x":5.25, "y":1}, + {"x":6.25, "y":1}, + {"x":7.25, "y":1}, + {"x":8.25, "y":1}, + {"x":9.25, "y":1}, + {"x":10.25, "y":1, "w":1.75}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2, "w":1.25}, + {"x":11, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3, "w":1.25}, + {"x":3.5, "y":3, "w":2.25}, + {"x":5.75, "y":3, "w":2.75}, + {"x":8.5, "y":3, "w":1.25}, + {"x":9.75, "y":3}, + {"x":10.75, "y":3, "w":1.25} + ] + }, + "LAYOUT_625u_space": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + {"x":10, "y":0}, + {"x":11, "y":0}, + + {"x":0, "y":1, "w":1.25}, + {"x":1.25, "y":1}, + {"x":2.25, "y":1}, + {"x":3.25, "y":1}, + {"x":4.25, "y":1}, + {"x":5.25, "y":1}, + {"x":6.25, "y":1}, + {"x":7.25, "y":1}, + {"x":8.25, "y":1}, + {"x":9.25, "y":1}, + {"x":10.25, "y":1, "w":1.75}, + + {"x":0, "y":2, "w":1.75}, + {"x":1.75, "y":2}, + {"x":2.75, "y":2}, + {"x":3.75, "y":2}, + {"x":4.75, "y":2}, + {"x":5.75, "y":2}, + {"x":6.75, "y":2}, + {"x":7.75, "y":2}, + {"x":8.75, "y":2}, + {"x":9.75, "y":2, "w":1.25}, + {"x":11, "y":2}, + + {"x":0, "y":3, "w":1.25}, + {"x":1.25, "y":3}, + {"x":2.25, "y":3}, + {"x":3.25, "y":3, "w":6.25}, + {"x":9.5, "y":3, "w":1.25}, + {"x":10.75, "y":3, "w":1.25} + ] + }, + "LAYOUT_ortho_600u_space": { + "layout": [ + {"label":"K00 (F4,F1)", "x":0, "y":0}, + {"label":"K01 (F4,F0)", "x":1, "y":0}, + {"label":"K02 (F4,E6)", "x":2, "y":0}, + {"label":"K03 (F4,C7)", "x":3, "y":0}, + {"label":"K04 (F4,C6)", "x":4, "y":0}, + {"label":"K05 (F4,B0)", "x":5, "y":0}, + {"label":"K06 (F4,D4)", "x":6, "y":0}, + {"label":"K07 (F4,B1)", "x":7, "y":0}, + {"label":"K08 (F4,B7)", "x":8, "y":0}, + {"label":"K09 (F4,B5)", "x":9, "y":0}, + {"label":"K0A (F4,B4)", "x":10, "y":0}, + {"label":"K0B (F4,D7)", "x":11, "y":0}, + + {"label":"K10 (F5,F1)", "x":0, "y":1}, + {"label":"K11 (F5,F0)", "x":1, "y":1}, + {"label":"K12 (F5,E6)", "x":2, "y":1}, + {"label":"K13 (F5,C7)", "x":3, "y":1}, + {"label":"K14 (F5,C6)", "x":4, "y":1}, + {"label":"K15 (F5,B0)", "x":5, "y":1}, + {"label":"K16 (F5,D4)", "x":6, "y":1}, + {"label":"K17 (F5,B1)", "x":7, "y":1}, + {"label":"K18 (F5,B7)", "x":8, "y":1}, + {"label":"K19 (F5,B5)", "x":9, "y":1}, + {"label":"K1A (F5,B4)", "x":10, "y":1}, + {"label":"K1B (F5,D7)", "x":11, "y":1}, + + {"label":"K20 (F6,F1)", "x":0, "y":2}, + {"label":"K21 (F6,F0)", "x":1, "y":2}, + {"label":"K22 (F6,E6)", "x":2, "y":2}, + {"label":"K23 (F6,C7)", "x":3, "y":2}, + {"label":"K24 (F6,C6)", "x":4, "y":2}, + {"label":"K25 (F6,B0)", "x":5, "y":2}, + {"label":"K26 (F6,D4)", "x":6, "y":2}, + {"label":"K27 (F6,B1)", "x":7, "y":2}, + {"label":"K28 (F6,B7)", "x":8, "y":2}, + {"label":"K29 (F6,B5)", "x":9, "y":2}, + {"label":"K2A (F6,B4)", "x":10, "y":2}, + {"label":"K2B (F6,D7)", "x":11, "y":2}, + + {"label":"K30 (F7,F1)", "x":0, "y":3}, + {"label":"K31 (F7,F0)", "x":1, "y":3}, + {"label":"K32 (F7,E6)", "x":2, "y":3}, + {"label":"K35 (F7,B0)", "x":3, "y":3, "w":6}, + {"label":"K39 (F7,B5)", "x":9, "y":3}, + {"label":"K3A (F7,B4)", "x":10, "y":3}, + {"label":"K3B (F7,D7)", "x":11, "y":3} + ] + }, + "LAYOUT_ortho_275u_space": { + "layout": [ + {"label":"K00 (F4,F1)", "x":0, "y":0}, + {"label":"K01 (F4,F0)", "x":1, "y":0}, + {"label":"K02 (F4,E6)", "x":2, "y":0}, + {"label":"K03 (F4,C7)", "x":3, "y":0}, + {"label":"K04 (F4,C6)", "x":4, "y":0}, + {"label":"K05 (F4,B0)", "x":5, "y":0}, + {"label":"K06 (F4,D4)", "x":6, "y":0}, + {"label":"K07 (F4,B1)", "x":7, "y":0}, + {"label":"K08 (F4,B7)", "x":8, "y":0}, + {"label":"K09 (F4,B5)", "x":9, "y":0}, + {"label":"K0A (F4,B4)", "x":10, "y":0}, + {"label":"K0B (F4,D7)", "x":11, "y":0}, + + {"label":"K10 (F5,F1)", "x":0, "y":1}, + {"label":"K11 (F5,F0)", "x":1, "y":1}, + {"label":"K12 (F5,E6)", "x":2, "y":1}, + {"label":"K13 (F5,C7)", "x":3, "y":1}, + {"label":"K14 (F5,C6)", "x":4, "y":1}, + {"label":"K15 (F5,B0)", "x":5, "y":1}, + {"label":"K16 (F5,D4)", "x":6, "y":1}, + {"label":"K17 (F5,B1)", "x":7, "y":1}, + {"label":"K18 (F5,B7)", "x":8, "y":1}, + {"label":"K19 (F5,B5)", "x":9, "y":1}, + {"label":"K1A (F5,B4)", "x":10, "y":1}, + {"label":"K1B (F5,D7)", "x":11, "y":1}, + + {"label":"K20 (F6,F1)", "x":0, "y":2}, + {"label":"K21 (F6,F0)", "x":1, "y":2}, + {"label":"K22 (F6,E6)", "x":2, "y":2}, + {"label":"K23 (F6,C7)", "x":3, "y":2}, + {"label":"K24 (F6,C6)", "x":4, "y":2}, + {"label":"K25 (F6,B0)", "x":5, "y":2}, + {"label":"K26 (F6,D4)", "x":6, "y":2}, + {"label":"K27 (F6,B1)", "x":7, "y":2}, + {"label":"K28 (F6,B7)", "x":8, "y":2}, + {"label":"K29 (F6,B5)", "x":9, "y":2}, + {"label":"K2A (F6,B4)", "x":10, "y":2}, + {"label":"K2B (F6,D7)", "x":11, "y":2}, + + {"label":"K30 (F7,F1)", "x":0, "y":3}, + {"label":"K31 (F7,F0)", "x":1, "y":3}, + {"label":"K32 (F7,E6)", "x":2, "y":3}, + {"label":"K33 (F7,C7)", "x":3, "y":3}, + {"label":"K34 (F7,C6)", "x":4, "y":3}, + {"label":"K35 (F7,B0)", "x":5, "y":3, "w":2.75}, + {"label":"K38 (F7,B7)", "x":7.75, "y":3, "w":1.25}, + {"label":"K39 (F7,B5)", "x":9, "y":3}, + {"label":"K3A (F7,B4)", "x":10, "y":3}, + {"label":"K3B (F7,D7)", "x":11, "y":3} + ] + } } - } } diff --git a/keyboards/amj40/keymaps/default/build.sh b/keyboards/amj40/keymaps/default/build.sh deleted file mode 100755 index 6b4b4568f5..0000000000 --- a/keyboards/amj40/keymaps/default/build.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# adjust for cpu -# -j 16 gave best result on a hyperthreaded quad core core i7 - -LIMIT=10 -THREADS="-j 16" -KMAP=iso_split_rshift - -echo "We need sudo later" -sudo ls 2>&1 /dev/null - -function wait_bootloader { - echo "Waiting for Bootloader..." - local STARTTIME=$(date +"%s") - local REMIND=0 - local EXEC=dfu-programmer - local TARGET=atmega32u4 - while true - do - sudo $EXEC $TARGET get > /dev/null 2>&1 - [ $? -eq 0 ] && break - ENDTIME=$(date +"%s") - DURATION=$(($ENDTIME-$STARTTIME)) - if [ $REMIND -eq 0 -a $DURATION -gt $LIMIT ] - then - echo "Did you forget to press the reset button?" - REMIND=1 - fi - sleep 1 - done -} -make clean -make KEYMAP=${KMAP} ${THREADS} -if [[ $? -eq 0 ]] -then - echo "please trigger flashing!" - wait_bootloader - sudo make KEYMAP=${KMAP} dfu ${THREADS} -else - echo "make failed" - exit 77 -fi diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amj40/keymaps/default/keymap.c index 951857de82..658b4b3c55 100755 --- a/keyboards/amj40/keymaps/default/keymap.c +++ b/keyboards/amj40/keymaps/default/keymap.c @@ -1,135 +1,143 @@ - - +/* Copyright 2017 Fabian Topfstedt + * + * 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 <http://www.gnu.org/licenses/>. + */ #include QMK_KEYBOARD_H -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbe |