g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
QMK Bot 2021-09-23 08:32:00 +00:00
parent c679911f3d 66857b919b
commit d7e61e56bb
6 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyboards/wuque/mammoth20x/info.json
View File

@ -2,13 +2,18 @@
"keyboard_name": "mammoth20x", "keyboard_name": "mammoth20x",
"url": "https://shop.wuquestudio.com/", "url": "https://shop.wuquestudio.com/",
"maintainer": "spbgzh", "maintainer": "spbgzh",
"layout_aliases": {
"LAYOUT_default": "LAYOUT"
},
"layouts": { "layouts": {
"LAYOUT_default": { "LAYOUT": {
"layout": [ "layout": [
{ "label": "Esc", "x": 0, "y": 0 }, { "label": "Esc", "x": 0, "y": 0 },
{ "label": "Pause", "x": 1, "y": 0 }, { "label": "Pause", "x": 1, "y": 0 },
{ "label": "Delete", "x": 2, "y": 0 }, { "label": "Delete", "x": 2, "y": 0 },
{ "label": "E", "x": 3.5, "y": 0 }, { "label": "LeftEncode", "x": 3, "y": 0, "w": 0.5 },
{ "label": "EncoderClick", "x": 3.5, "y": 0 },
{ "label": "RightEncode", "x": 4.5, "y": 0, "w" : 0.5 },
{ "label": "Num", "x": 0, "y": 1 }, { "label": "Num", "x": 0, "y": 1 },
{ "label": "/", "x": 1, "y": 1 }, { "label": "/", "x": 1, "y": 1 },
@ -18,7 +23,6 @@
{ "label": "7", "x": 0, "y": 2 }, { "label": "7", "x": 0, "y": 2 },
{ "label": "8", "x": 1, "y": 2 }, { "label": "8", "x": 1, "y": 2 },
{ "label": "9", "x": 2, "y": 2 }, { "label": "9", "x": 2, "y": 2 },
{ "label": "LeftEncode", "x": 3, "y": 0, "w": 0.5 },
{ "label": "4", "x": 0, "y": 3 }, { "label": "4", "x": 0, "y": 3 },
{ "label": "5", "x": 1, "y": 3 }, { "label": "5", "x": 1, "y": 3 },
@ -28,7 +32,6 @@
{ "label": "1", "x": 0, "y": 4 }, { "label": "1", "x": 0, "y": 4 },
{ "label": "2", "x": 1, "y": 4 }, { "label": "2", "x": 1, "y": 4 },
{ "label": "3", "x": 2, "y": 4 }, { "label": "3", "x": 2, "y": 4 },
{ "label": "RightEncode", "x": 4.5, "y": 0, "w" : 0.25 },
{ "label": "0", "x": 0, "y": 5, "w": 2 }, { "label": "0", "x": 0, "y": 5, "w": 2 },
{ "label": ".", "x": 2, "y": 5 }, { "label": ".", "x": 2, "y": 5 },

16
keyboards/wuque/mammoth20x/keymaps/default/keymap.c
View File

@ -17,20 +17,20 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_default( [0] = LAYOUT(
KC_ESC, KC_PAUS, KC_DEL, KC_MUTE, KC_ESC, KC_PAUS, KC_DEL, KC_VOLU, KC_MUTE, KC_VOLD,
KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_VOLU, KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3, KC_VOLD, KC_P1, KC_P2, KC_P3,
KC_P0, KC_PDOT, KC_PENT KC_P0, KC_PDOT, KC_PENT
), ),
[1] = LAYOUT_default( [1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
}; };

32
keyboards/wuque/mammoth20x/keymaps/via/keymap.c
View File

@ -17,36 +17,36 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_default( [0] = LAYOUT(
KC_ESC, KC_PAUS, KC_DEL, KC_MUTE, KC_ESC, KC_PAUS, KC_DEL, KC_VOLU, KC_MUTE, KC_VOLD,
KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_VOLU, KC_P7, KC_P8, KC_P9,
KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3, KC_VOLD, KC_P1, KC_P2, KC_P3,
KC_P0, KC_PDOT, KC_PENT KC_P0, KC_PDOT, KC_PENT
), ),
[1] = LAYOUT_default( [1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
[2] = LAYOUT_default( [2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
[3] = LAYOUT_default( [3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______,
_______, _______, _______ _______, _______, _______
), ),
}; };

9
keyboards/wuque/mammoth20x/mammoth20x.h
View File

@ -18,12 +18,12 @@
#include "quantum.h" #include "quantum.h"
#define LAYOUT_default( \ #define LAYOUT( \
K00, K01, K02, K03, \ K00, K01, K02, K23, K03, K43, \
K10, K11, K12, K13, \ K10, K11, K12, K13, \
K20, K21, K22, K23, \ K20, K21, K22, \
K30, K31, K32, K33, \ K30, K31, K32, K33, \
K40, K41, K42, K43, \ K40, K41, K42, \
K50, K52, K53 \ K50, K52, K53 \
) { \ ) { \
{ K00, K01, K02, K03 }, \ { K00, K01, K02, K03 }, \
@ -33,4 +33,3 @@
{ K40, K41, K42, K43 }, \ { K40, K41, K42, K43 }, \
{ K50, KC_NO, K52, K53 }, \ { K50, KC_NO, K52, K53 }, \
} }

10
keyboards/wuque/mammoth20x/readme.md
View File

@ -1,11 +1,11 @@
# mammoth20x # mammoth20x
​
More Info at[wuquestudio](https://shop.wuquestudio.com/). More info at [Wuque Studio](https://shop.wuquestudio.com/).
​
* Keyboard Maintainer: [spbgzh](https://github.com/spbgzh) * Keyboard Maintainer: [spbgzh](https://github.com/spbgzh)
* Hardware Supported: mammoth20x Standard * Hardware Supported: mammoth20x Standard
* Hardware Availability: [mammoth20x](https://shop.wuquestudio.com/) * Hardware Availability: [Wuque Studio](https://shop.wuquestudio.com/)
​
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):
make wuque/mammoth20x:default make wuque/mammoth20x:default

2
keyboards/wuque/mammoth20x/rules.mk
View File

@ -19,5 +19,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Enable Encoder
ENCODER_ENABLE = yes # Enable Encoder