diff options
author | QMK Bot <hello@qmk.fm> | 2022-06-21 12:23:46 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-06-21 12:23:46 +0000 |
commit | 65fcf951d3c7997f223c97f1ab8352070afcdf05 (patch) | |
tree | 14473a395178c241f991ed4b30ee3d843ba3746f /keyboards | |
parent | d116cf5e9a189a4f44f3c5c705b2a41575602b84 (diff) | |
parent | 03d0182541dec8cf85eb1817bd5e3255a7684648 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/alt34/keymaps/default/config.h | 27 | ||||
-rw-r--r-- | keyboards/alt34/rev1/config.h | 9 | ||||
-rw-r--r-- | keyboards/alt34/rev1/rules.mk | 1 |
3 files changed, 9 insertions, 28 deletions
diff --git a/keyboards/alt34/keymaps/default/config.h b/keyboards/alt34/keymaps/default/config.h deleted file mode 100644 index da63234575..0000000000 --- a/keyboards/alt34/keymaps/default/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -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 <http://www.gnu.org/licenses/>. -*/ - -#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/rev1/config.h b/keyboards/alt34/rev1/config.h index f599d62935..7ea63954b0 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -44,3 +44,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE + +/* 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/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk index a57c3ad606..e1186febe7 100644 --- a/keyboards/alt34/rev1/rules.mk +++ b/keyboards/alt34/rev1/rules.mk @@ -19,4 +19,3 @@ AUDIO_ENABLE = no # Audio output SPLIT_KEYBOARD = yes LAYOUTS = split_3x5_2 -DEFAULT_FOLDER = alt34/rev1 |