arne/vial-qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qmk/master' into merge-2022-07-11

Browse Source
This commit is contained in:
Ilya Zhuravlev
2022-07-11 18:29:50 -06:00
parent b37649af36 2714c70bd7
commit fde0c10bae
7121 changed files with 170388 additions and 28118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/maple_computing/c39/config.h
View File

@@ -72,5 +72,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

4
keyboards/maple_computing/c39/keymaps/drashna/keymap.c
View File

@@ -75,8 +75,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_ADJUST] = LAYOUT_wrapper(
KC_MAKE, _________________ADJUST_L1_________________, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
VRSN, _________________ADJUST_L2_________________, MG_NKRO, _________________ADJUST_R2_________________, EEP_RST,
QK_MAKE, _________________ADJUST_L1_________________, KC_NUKE, _________________ADJUST_R1_________________, QK_BOOT,
VRSN, _________________ADJUST_L2_________________, MG_NKRO, _________________ADJUST_R2_________________, EE_CLR,
TG_MODS, _________________ADJUST_L3_________________, KC_RGB_T,_________________ADJUST_R3_________________, RGB_IDL
)
};

4
keyboards/maple_computing/christmas_tree/keymaps/default/keymap.c
View File

@@ -50,13 +50,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,------+------.
* | 8 | 9 |
* ,------+------+------.
* | 0 | FUNC | RESET|
* | 0 | FUNC | QK_BOOT|
* `--------------------'
*/
[_FUNC] = LAYOUT(
BACKLIT,
KC_8, KC_9,
KC_0, _______, RESET
KC_0, _______, QK_BOOT
)

2
keyboards/maple_computing/ivy/config.h
View File

@@ -62,5 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

4
keyboards/maple_computing/jnao/keymaps/default/keymap.c
View File

@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |RESET |
* | | | | | | | | | | | |QK_BOOT |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_5x12(
@@ -101,7 +101,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),
/* Function

4
keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
View File

@@ -82,14 +82,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | RESET|
* | | | | | | | | | | | | QK_BOOT|
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12(
TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),
/* Function

4
keyboards/maple_computing/jnao/keymaps/via/keymap.c
View File

@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |RESET |
* | | | | | | | | | | | |QK_BOOT |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_5x12(
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
)
};

2
keyboards/maple_computing/launchpad/config.h
View File

@@ -58,8 +58,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
#ifdef SUBPROJECT_rev1
#include "rev1/config.h"

2
keyboards/maple_computing/launchpad/keymaps/drashna/keymap.c
View File

@@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Q, CALTDEL, \
KC_A, TSKMGR, \
KC_Z, KC_X, \
_______, RESET \
_______, QK_BOOT \
)
};

7
keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
View File

@@ -1,7 +0,0 @@
# Lets Split Eh Layout
Check out [user readme](../../../../users/bbaserdem/README.md) for more info.
# Usage
Fill in after flashing

4
keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
View File

@@ -1,4 +0,0 @@
#ifndef CONFIG_KEYMAP_H
#define CONFIG_KEYMAP_H
#include "../../config.h"
#endif

27
keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
View File

@@ -1,27 +0,0 @@
#include "lets_split_eh.h"
#include "bbaserdem.h"
void matrix_init_keymap (void) {
}
uint32_t layer_state_set_keymap(uint32_t state) {
return state;
}
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Main Dvorak layer
[_DV] = LAYOUT_letssplit_wrapper(DVORAK),
// Turkish and special character overlay
[_AL] = LAYOUT_letssplit_wrapper(ALTCHAR),
// Gaming layer
[_GA] = LAYOUT_letssplit_wrapper(GAME),
// Numbers layer
[_NU] = LAYOUT_letssplit_wrapper(NUMBERS),
// Settings layer
[_SE] = LAYOUT_letssplit_wrapper(SETTINGS),
// Mouse emulation layer
[_MO] = LAYOUT_letssplit_wrapper(MOUSE),
// Music layer
[_MU] = LAYOUT_letssplit_wrapper(MUSIC),
};

8
keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
View File

@@ -1,8 +0,0 @@
# Build options
BACKLIGHT_ENABLE = no # Switch LEDs
MOUSEKEY_ENABLE = yes # Emulates mouse key using keypresses
RGBLIGHT_ENABLE = yes # LED strips
TAP_DANCE_ENABLE = no # Use multi-tap features
AUDIO_ENABLE = no # Audio stuff

4
keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c
View File

@@ -85,14 +85,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | | | | | | | | | | |BLSTEP|
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | | RESET|
* | | | | | | | | | | | | QK_BOOT|
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT(
TSKMGR, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
_______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),
/* Function

2
keyboards/maple_computing/minidox/config.h
View File

@@ -57,5 +57,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

2
keyboards/maple_computing/minidox/keymaps/default/keymap.c
View File

@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_split_3x5_3(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL,
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______
)
};

2
keyboards/maple_computing/the_ruler/config.h
View File

@@ -96,8 +96,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
#define RGB_DI_PIN E6 // The pin your RGB strip is wired to
#define RGBLED_NUM 1 // Number of LEDs

4
keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
View File

@@ -41,11 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* FN 2 Layer
* ,-----------------------------------------------.
* | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | RESET |
* | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | QK_BOOT |
* `-----------------------------------------------'
*/
[_FN_2] = LAYOUT(
_______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, RESET
_______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, QK_BOOT
)
};