TheWanderingCrow/vial-qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmk/master' into merge-2022-09-10

Browse source
This commit is contained in:
Ilya Zhuravlev 2022-09-10 04:10:44 -06:00
commit d4fa6703b8
9866 changed files with 143396 additions and 44465 deletions
Download patch file Download diff file Expand all files Collapse all files

8
keyboards/m10a/config.h
View file

@ -20,13 +20,6 @@
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x5241 // "RA"
#define PRODUCT_ID 0x00AA // 10-A
#define DEVICE_VER 0x0001
#define MANUFACTURER RAMA WORKS
#define PRODUCT M10-A
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3
@ -34,7 +27,6 @@
/* Planck PCB default pin-out */
#define MATRIX_ROW_PINS { B6, F7, F6, D6 }
#define MATRIX_COL_PINS { F5, F1, F0 }
#define UNUSED_PINS
#define BACKLIGHT_PIN B7

8
keyboards/m10a/info.json
View file

@ -1,7 +1,13 @@
{
"keyboard_name": "Rama Works X Machine Industries M10-A Macropad",
"keyboard_name": "M10-A",
"manufacturer": "RAMA WORKS",
"url": "",
"maintainer": "qmk",
"usb": {
"vid": "0x5241",
"pid": "0x00AA",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT": {
"layout": [

4
keyboards/m10a/keymaps/gam3cat/keymap.c
View file

@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_L5] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
[_L6] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
[_L7] = {{KC_DMP1, _______, KC_DMP2}, {_______, KC_DMRS, _______}, {KC_DMR1, _______, KC_DMR2}, {XXXXXXX, XXXXXXX, MO(_L9)}},
[_L8] = {{_______, _______, RESET }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
[_L8] = {{_______, _______, QK_BOOT }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
[_L9] = {{DF(_L6), DF(_L7), DF(_L8)}, {DF(_L3), DF(_L4), DF(_L5)}, {DF(_L0), DF(_L1), DF(_L2)}, {XXXXXXX, XXXXXXX, _______}},
};
@ -115,7 +115,7 @@ void matrix_scan_user(void) {
}
layer_state_t layer_state_set_user(layer_state_t state) {
switch (biton32(state)) {
switch (get_highest_layer(state)) {
case _L0:
custom_backlight_level(0);
break;