From 5f3376b3ffd5eb7d62f2c1f571778857198819d2 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Sun, 22 May 2022 19:50:04 +0200 Subject: [PATCH 01/12] Add files for alt34 keyboard --- keyboards/alt34/.noci | 0 keyboards/alt34/alt34.c | 1 + keyboards/alt34/alt34.h | 7 +++ keyboards/alt34/config.h | 20 ++++++++ keyboards/alt34/info.json | 52 ++++++++++++++++++++ keyboards/alt34/keymaps/default/config.h | 29 +++++++++++ keyboards/alt34/keymaps/default/keymap.c | 15 ++++++ keyboards/alt34/readme.md | 62 ++++++++++++++++++++++++ keyboards/alt34/rev1/config.h | 46 ++++++++++++++++++ keyboards/alt34/rev1/rev1.c | 1 + keyboards/alt34/rev1/rev1.h | 33 +++++++++++++ keyboards/alt34/rev1/rules.mk | 2 + keyboards/alt34/rules.mk | 28 +++++++++++ 13 files changed, 296 insertions(+) create mode 100644 keyboards/alt34/.noci create mode 100644 keyboards/alt34/alt34.c create mode 100644 keyboards/alt34/alt34.h create mode 100644 keyboards/alt34/config.h create mode 100644 keyboards/alt34/info.json create mode 100644 keyboards/alt34/keymaps/default/config.h create mode 100644 keyboards/alt34/keymaps/default/keymap.c create mode 100644 keyboards/alt34/readme.md create mode 100644 keyboards/alt34/rev1/config.h create mode 100644 keyboards/alt34/rev1/rev1.c create mode 100644 keyboards/alt34/rev1/rev1.h create mode 100644 keyboards/alt34/rev1/rules.mk create mode 100644 keyboards/alt34/rules.mk diff --git a/keyboards/alt34/.noci b/keyboards/alt34/.noci new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/alt34/alt34.c b/keyboards/alt34/alt34.c new file mode 100644 index 000000000000..5c0fd7fd60c8 --- /dev/null +++ b/keyboards/alt34/alt34.c @@ -0,0 +1 @@ +#include "alt34.h" diff --git a/keyboards/alt34/alt34.h b/keyboards/alt34/alt34.h new file mode 100644 index 000000000000..a708c535dae0 --- /dev/null +++ b/keyboards/alt34/alt34.h @@ -0,0 +1,7 @@ +#pragma once + +#include "quantum.h" + +#ifdef KEYBOARD_alt34_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/alt34/config.h b/keyboards/alt34/config.h new file mode 100644 index 000000000000..09c44de973d1 --- /dev/null +++ b/keyboards/alt34/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2021 Tommy Alatalo + +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" diff --git a/keyboards/alt34/info.json b/keyboards/alt34/info.json new file mode 100644 index 000000000000..647c853136a9 --- /dev/null +++ b/keyboards/alt34/info.json @@ -0,0 +1,52 @@ +{ + "keyboard_name": "alt34", + "url": "https://gitlab.com/altosys/alt34", + "maintainer": "@altosys", + "layouts": { + "LAYOUT_split_3x5_2": { + "layout": [ + {"x": 0, "y": 0.93}, + {"x": 1, "y": 0.31}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0.28}, + {"x": 4, "y": 0.42}, + + {"x": 7, "y": 0.42}, + {"x": 8, "y": 0.28}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0.31}, + {"x": 11, "y": 0.93}, + + {"x": 0, "y": 1.93}, + {"x": 1, "y": 1.31}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1.28}, + {"x": 4, "y": 1.42}, + + {"x": 7, "y": 1.42}, + {"x": 8, "y": 1.28}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1.31}, + {"x": 11, "y": 1.93}, + + {"x": 0, "y": 2.93}, + {"x": 1, "y": 2.31}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2.28}, + {"x": 4, "y": 2.42}, + + {"x": 7, "y": 2.42}, + {"x": 8, "y": 2.28}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2.31}, + {"x": 11, "y": 2.93}, + + {"x": 3.5, "y": 3.45}, + {"x": 4.5, "y": 3.7}, + + {"x": 6.5, "y": 3.7}, + {"x": 7.5, "y": 3.45} + ] + } + } +} diff --git a/keyboards/alt34/keymaps/default/config.h b/keyboards/alt34/keymaps/default/config.h new file mode 100644 index 000000000000..1d587b071bbd --- /dev/null +++ b/keyboards/alt34/keymaps/default/config.h @@ -0,0 +1,29 @@ +/* +This is the c configuration file for the keymap + +Copyright 2022 Tommy Alatalo + +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 + +/* Use I2C or Serial, not both */ +#define USE_I2C +/* #define USE_SERIAL */ + +/* Select hand configuration */ +#define EE_HANDS +/* #define MASTER_LEFT */ +/* #define MASTER_RIGHT */ diff --git a/keyboards/alt34/keymaps/default/keymap.c b/keyboards/alt34/keymaps/default/keymap.c new file mode 100644 index 000000000000..1a41f951dc1c --- /dev/null +++ b/keyboards/alt34/keymaps/default/keymap.c @@ -0,0 +1,15 @@ +#include QMK_KEYBOARD_H + +// Define aliases for layers +enum layers { + BASE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[BASE] = LAYOUT_split_3x5_2( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_SPC, KC_TAB, KC_BSPC, KC_ENT + ) +}; diff --git a/keyboards/alt34/readme.md b/keyboards/alt34/readme.md new file mode 100644 index 000000000000..18d598c95bf9 --- /dev/null +++ b/keyboards/alt34/readme.md @@ -0,0 +1,62 @@ +# alt34 + +![alt34](https://gitlab.com/altosys/alt34/-/raw/main/images/alt34_profile.png) + +alt34 was designed as a minimalistic, 'no frills' workhorse keyboard with focus on efficiency and ergonomics. +This breaks down into the following priorities in the design: + +* Keyboard Maintainer: [Tommy Alatalo](https://github.com/altosys) +* Hardware Supported: + * Compact 34 key split layout with two thumb keys per hand + * Orthogonal layout with a somewhat aggressive column stagger + * Compatibility with standard controllers (Elite-C, Pro Micro etc.) + * Cherry MX switch support + * Kailh hotswap socket support + * Tenting puck support + +## 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 reset jumper**: Briefly short the pads just below the TRRS connector on the PCB +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + +Latest updates and information for alt34 is found at https://gitlab.com/altosys/alt34 + +## Build Guide + +There is no dedicated build guide for alt34. If you are a novice builder and need guidance then suggested reading would be build guides for the Corne keyboard (aka. crkbd), they will cover the usual installation of the controller, diodes and hotswap sockets, which is essentially all there is to assembling the alt34. + +## Flashing QMK Firmware + +Set up your build environment according to the QMK documentation, then after cloning the `qmk_firmware` repository you can run the below commands in the repo root to build and flash the firmware onto your controller. + +Note that this method enables `EE_HANDS` mode which allows you to connect the USB cable to either half of alt34 when using the keyboard. + + +Flash `EE_HANDS` to the left hand half, this updates the persistent EEPROM storage along with the firmware. +Run the below command and then set the board into bootloader mode by bridging the reset pads below the TRRS connector with a paper clip or similar. +``` +make alt34/rev1:default:dfu-split-left +``` + +Do the same for the right hand side: +``` +make alt34/rev1:default:dfu-split-right +``` + +Now you should be able to connect the USB cable to either side of the split and it should work the same. + +For any further changes it is enough to flash only the firmware and not the EEPROM: +``` +make alt34/rev1:default:flash +``` + +It is still recommended to do this for both sides of the split when updating keymaps etc. + +**Note I:** the above examples are using an Elite-C controller with an `atmel-dfu` bootloader, adjust this according to your own hardware. + +**Note II:** the included keymap is rudimentary, the recommended layout to use with alt34 is `miryoku`, see the [miryoku docs](https://github.com/manna-harbour/miryoku) for instructions. + +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/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h new file mode 100644 index 000000000000..559231165975 --- /dev/null +++ b/keyboards/alt34/rev1/config.h @@ -0,0 +1,46 @@ +/* +Copyright 2022 Tommy Alatalo + +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 + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x1ABC +#define PRODUCT_ID 0x0001 +#define DEVICE_VER 0x0001 +#define MANUFACTURER altosys +#define PRODUCT alt34 + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 5 + +// wiring of each half +#define MATRIX_ROW_PINS { D7, E6, B4, B5 } +#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 } +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* serial.c configuration for split keyboard */ +/* #define SOFT_SERIAL_PIN D0 */ + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/alt34/rev1/rev1.c b/keyboards/alt34/rev1/rev1.c new file mode 100644 index 000000000000..5c0fd7fd60c8 --- /dev/null +++ b/keyboards/alt34/rev1/rev1.c @@ -0,0 +1 @@ +#include "alt34.h" diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h new file mode 100644 index 000000000000..eed9bfb63109 --- /dev/null +++ b/keyboards/alt34/rev1/rev1.h @@ -0,0 +1,33 @@ +#pragma once + +#include "alt34.h" +#include "quantum.h" + +#ifdef USE_I2C +#include +#ifdef __AVR__ + #include + #include +#endif +#endif + +#define ____ KC_NO + +/* left hand right hand */ +#define LAYOUT_split_3x5_2(\ + K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ + K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ + K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ + K3_2, K3_3, K3_4, K3_5 )\ +/* matrix positions */\ +{\ + {K0_0, K0_1, K0_2, K0_3, K0_4},\ + {K1_0, K1_1, K1_2, K1_3, K1_4},\ + {K2_0, K2_1, K2_2, K2_3, K2_4},\ + {____, ____, ____, K3_2, K3_3},\ + \ + {K0_9, K0_8, K0_7, K0_6, K0_5},\ + {K1_9, K1_8, K1_7, K1_6, K1_5},\ + {K2_9, K2_8, K2_7, K2_6, K2_5},\ + {____, ____, ____, K3_5, K3_4} \ +} diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk new file mode 100644 index 000000000000..271780b75ecd --- /dev/null +++ b/keyboards/alt34/rev1/rules.mk @@ -0,0 +1,2 @@ +# Disable unsupported hardware +AUDIO_SUPPORTED = no diff --git a/keyboards/alt34/rules.mk b/keyboards/alt34/rules.mk new file mode 100644 index 000000000000..b07a247a2e5e --- /dev/null +++ b/keyboards/alt34/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. + +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +SPLIT_KEYBOARD = yes +LAYOUTS = split_3x5_2 +DEFAULT_FOLDER = alt34/rev1 From b7bba30fecab45386b808a3aadf0e5a4ba0415bb Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 30 May 2022 09:09:38 +0200 Subject: [PATCH 02/12] Add link to hardware bill of materials for alt34 --- keyboards/alt34/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/alt34/readme.md b/keyboards/alt34/readme.md index 18d598c95bf9..5f8f29bf66ab 100644 --- a/keyboards/alt34/readme.md +++ b/keyboards/alt34/readme.md @@ -14,6 +14,10 @@ This breaks down into the following priorities in the design: * Kailh hotswap socket support * Tenting puck support +## Hardware + +A bill of materials for building alt34 is found in [the alt34 git repo](https://gitlab.com/altosys/alt34) + ## Bootloader Enter the bootloader in 3 ways: From 3e70d059c4f109537882ab5ea4e61c0732a4d9cf Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 30 May 2022 19:42:11 +0200 Subject: [PATCH 03/12] Change keyboard image link to imgur --- keyboards/alt34/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alt34/readme.md b/keyboards/alt34/readme.md index 5f8f29bf66ab..6f65bdcdb871 100644 --- a/keyboards/alt34/readme.md +++ b/keyboards/alt34/readme.md @@ -1,6 +1,6 @@ # alt34 -![alt34](https://gitlab.com/altosys/alt34/-/raw/main/images/alt34_profile.png) +![alt34](https://i.imgur.com/GDv0dL0.png) alt34 was designed as a minimalistic, 'no frills' workhorse keyboard with focus on efficiency and ergonomics. This breaks down into the following priorities in the design: From aeb2dadfa251e4afd1dfb9787fc608ad0c53957c Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 30 May 2022 19:43:50 +0200 Subject: [PATCH 04/12] Remove platform specific defines from rev1.h --- keyboards/alt34/rev1/rev1.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h index eed9bfb63109..d0366cce1c4d 100644 --- a/keyboards/alt34/rev1/rev1.h +++ b/keyboards/alt34/rev1/rev1.h @@ -3,14 +3,6 @@ #include "alt34.h" #include "quantum.h" -#ifdef USE_I2C -#include -#ifdef __AVR__ - #include - #include -#endif -#endif - #define ____ KC_NO /* left hand right hand */ From 71ca7738837976ff82b9bd72f09e63afb9595046 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 30 May 2022 19:47:36 +0200 Subject: [PATCH 05/12] Remove bluetooth and sleep led rules etc --- keyboards/alt34/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/alt34/rules.mk b/keyboards/alt34/rules.mk index b07a247a2e5e..8816f51fea9e 100644 --- a/keyboards/alt34/rules.mk +++ b/keyboards/alt34/rules.mk @@ -14,14 +14,7 @@ EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend SPLIT_KEYBOARD = yes LAYOUTS = split_3x5_2 From 43cd16090189b957ab34dcb7672c9a9d0040552c Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 30 May 2022 19:52:40 +0200 Subject: [PATCH 06/12] Add GPL license header to all source code files --- keyboards/alt34/alt34.c | 17 +++++++++++++++++ keyboards/alt34/alt34.h | 17 +++++++++++++++++ keyboards/alt34/config.h | 2 +- keyboards/alt34/keymaps/default/config.h | 4 +--- keyboards/alt34/keymaps/default/keymap.c | 17 +++++++++++++++++ keyboards/alt34/rev1/config.h | 2 +- keyboards/alt34/rev1/rev1.c | 17 +++++++++++++++++ keyboards/alt34/rev1/rev1.h | 17 +++++++++++++++++ 8 files changed, 88 insertions(+), 5 deletions(-) diff --git a/keyboards/alt34/alt34.c b/keyboards/alt34/alt34.c index 5c0fd7fd60c8..f71f8092c973 100644 --- a/keyboards/alt34/alt34.c +++ b/keyboards/alt34/alt34.c @@ -1 +1,18 @@ +/* +Copyright 2022 Tommy Alatalo <@altosys> + +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 "alt34.h" diff --git a/keyboards/alt34/alt34.h b/keyboards/alt34/alt34.h index a708c535dae0..0d0bdd3fd4af 100644 --- a/keyboards/alt34/alt34.h +++ b/keyboards/alt34/alt34.h @@ -1,3 +1,20 @@ +/* +Copyright 2022 Tommy Alatalo <@altosys> + +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" diff --git a/keyboards/alt34/config.h b/keyboards/alt34/config.h index 09c44de973d1..44ee245fe437 100644 --- a/keyboards/alt34/config.h +++ b/keyboards/alt34/config.h @@ -1,5 +1,5 @@ /* -Copyright 2021 Tommy Alatalo +Copyright 2022 Tommy Alatalo <@altosys> 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/alt34/keymaps/default/config.h b/keyboards/alt34/keymaps/default/config.h index 1d587b071bbd..da632345757b 100644 --- a/keyboards/alt34/keymaps/default/config.h +++ b/keyboards/alt34/keymaps/default/config.h @@ -1,7 +1,5 @@ /* -This is the c configuration file for the keymap - -Copyright 2022 Tommy Alatalo +Copyright 2022 Tommy Alatalo <@altosys> 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/alt34/keymaps/default/keymap.c b/keyboards/alt34/keymaps/default/keymap.c index 1a41f951dc1c..dda792166571 100644 --- a/keyboards/alt34/keymaps/default/keymap.c +++ b/keyboards/alt34/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2022 Tommy Alatalo <@altosys> + +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 // Define aliases for layers diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index 559231165975..f599d6293508 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -1,5 +1,5 @@ /* -Copyright 2022 Tommy Alatalo +Copyright 2022 Tommy Alatalo <@altosys> 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/alt34/rev1/rev1.c b/keyboards/alt34/rev1/rev1.c index 5c0fd7fd60c8..f71f8092c973 100644 --- a/keyboards/alt34/rev1/rev1.c +++ b/keyboards/alt34/rev1/rev1.c @@ -1 +1,18 @@ +/* +Copyright 2022 Tommy Alatalo <@altosys> + +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 "alt34.h" diff --git a/keyboards/alt34/rev1/rev1.h b/keyboards/alt34/rev1/rev1.h index d0366cce1c4d..5600b0d5ad01 100644 --- a/keyboards/alt34/rev1/rev1.h +++ b/keyboards/alt34/rev1/rev1.h @@ -1,3 +1,20 @@ +/* +Copyright 2022 Tommy Alatalo <@altosys> + +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 "alt34.h" From 92e0b411c334360b78aeda7e477b479d3b429d5e Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Tue, 31 May 2022 09:05:46 +0200 Subject: [PATCH 07/12] Shorten comment for NKRO_ENABLE Co-authored-by: Drashna Jaelre --- keyboards/alt34/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alt34/rules.mk b/keyboards/alt34/rules.mk index 8816f51fea9e..156201079dae 100644 --- a/keyboards/alt34/rules.mk +++ b/keyboards/alt34/rules.mk @@ -13,7 +13,7 @@ MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = no # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # Enable N-Key Rollover UNICODE_ENABLE = no # Unicode SPLIT_KEYBOARD = yes From dccc1d27991c69abff7394f3bc31c50c2bb366c8 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Tue, 31 May 2022 09:08:20 +0200 Subject: [PATCH 08/12] Simplify option usage comment in rules.mk Co-authored-by: Drashna Jaelre --- keyboards/alt34/rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/alt34/rules.mk b/keyboards/alt34/rules.mk index 156201079dae..af55457baff7 100644 --- a/keyboards/alt34/rules.mk +++ b/keyboards/alt34/rules.mk @@ -5,8 +5,7 @@ MCU = atmega32u4 BOOTLOADER = atmel-dfu # Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically +# change to "no" to disable the options BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys From ecf9d1ad4bfb291c35c325f5d5f7542564347bec Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Tue, 31 May 2022 09:16:39 +0200 Subject: [PATCH 09/12] Set imgur link to largest size option Co-authored-by: Drashna Jaelre --- keyboards/alt34/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alt34/readme.md b/keyboards/alt34/readme.md index 6f65bdcdb871..14c1e28c7a19 100644 --- a/keyboards/alt34/readme.md +++ b/keyboards/alt34/readme.md @@ -1,6 +1,6 @@ # alt34 -![alt34](https://i.imgur.com/GDv0dL0.png) +![alt34](https://i.imgur.com/GDv0dL0h.png) alt34 was designed as a minimalistic, 'no frills' workhorse keyboard with focus on efficiency and ergonomics. This breaks down into the following priorities in the design: From 7c718ac4038170a2d4ced715bfd0a2fa73d07809 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Tue, 31 May 2022 17:30:21 +0200 Subject: [PATCH 10/12] Move rules.mk into rev1 folder entirely --- keyboards/alt34/rev1/rules.mk | 22 ++++++++++++++++++++-- keyboards/alt34/rules.mk | 20 -------------------- 2 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 keyboards/alt34/rules.mk diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk index 271780b75ecd..af55457baff7 100644 --- a/keyboards/alt34/rev1/rules.mk +++ b/keyboards/alt34/rev1/rules.mk @@ -1,2 +1,20 @@ -# Disable unsupported hardware -AUDIO_SUPPORTED = no +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change to "no" to disable the options + +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +UNICODE_ENABLE = no # Unicode + +SPLIT_KEYBOARD = yes +LAYOUTS = split_3x5_2 +DEFAULT_FOLDER = alt34/rev1 diff --git a/keyboards/alt34/rules.mk b/keyboards/alt34/rules.mk deleted file mode 100644 index af55457baff7..000000000000 --- a/keyboards/alt34/rules.mk +++ /dev/null @@ -1,20 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change to "no" to disable the options - -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -UNICODE_ENABLE = no # Unicode - -SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_2 -DEFAULT_FOLDER = alt34/rev1 From b1b6d4dc224db6fbe7ce43050029158ed20555c2 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Fri, 3 Jun 2022 12:40:38 +0200 Subject: [PATCH 11/12] Remove .noci file --- keyboards/alt34/.noci | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/alt34/.noci diff --git a/keyboards/alt34/.noci b/keyboards/alt34/.noci deleted file mode 100644 index e69de29bb2d1..000000000000 From 3d5d27fe1a20976931d2cc12c3a40efc6687a812 Mon Sep 17 00:00:00 2001 From: Tommy Alatalo Date: Mon, 6 Jun 2022 12:47:47 +0200 Subject: [PATCH 12/12] Update keyboards/alt34/rev1/rules.mk Co-authored-by: Ryan --- keyboards/alt34/rev1/rules.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk index af55457baff7..a57c3ad6065c 100644 --- a/keyboards/alt34/rev1/rules.mk +++ b/keyboards/alt34/rev1/rules.mk @@ -6,14 +6,16 @@ BOOTLOADER = atmel-dfu # Build Options # change to "no" to disable the options - -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -UNICODE_ENABLE = no # Unicode +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +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 SPLIT_KEYBOARD = yes LAYOUTS = split_3x5_2