megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-07-07 12:43:20 +00:00
parent 643f6367a1 e724801d33
commit b0c3d61c17
17 changed files with 14 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h
View file

@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/4x5/4x5.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
View file

@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "../../config.h"
/* Use I2C or Serial, not both */ /* Use I2C or Serial, not both */
#define USE_SERIAL #define USE_SERIAL

4
keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
View file

@ -1,6 +1,4 @@
#include "dactyl_manuform.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
#include "eeconfig.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;

2
keyboards/handwired/dactyl_manuform/4x6/4x6.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/5x6/5x6.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h
View file

@ -16,7 +16,7 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/5x7/5x7.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/6x6/6x6.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

2
keyboards/handwired/dactyl_manuform/6x7/6x7.h
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
#define XXX KC_NO #define XXX KC_NO

1
keyboards/handwired/dactyl_manuform/dactyl_manuform.c
View file

@ -1 +0,0 @@
#include "dactyl_manuform.h"

31
keyboards/handwired/dactyl_manuform/dactyl_manuform.h
View file

@ -1,31 +0,0 @@
#pragma once
#if defined(KEYBOARD_handwired_dactyl_manuform_4x5)
# include "4x5.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6)
# include "4x6.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6_5)
# include "4x6_5.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6)
# include "5x6.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_5)
# include "5x6_5.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_2_5)
# include "5x6_2_5.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_5x7)
# include "5x7.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
# include "6x6.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_4)
# include "6x6_4.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_kinesis)
# include "6x6_kinesis.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
# include "6x7.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_3x5_3)
# include "3x5_3.h"
#elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
# include "62key.h"
#endif
#include "quantum.h"

2
keyboards/handwired/dactyl_manuform/dmote/62key/62key.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "dactyl_manuform.h" #include "quantum.h"
// This uses the same coordinate system as the program that defines // This uses the same coordinate system as the program that defines
// the case model, but not the same coordinates. // the case model, but not the same coordinates.