aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregorio <38576492+ohchiko@users.noreply.github.com>2020-06-22 04:59:43 +0700
committerGitHub <noreply@github.com>2020-06-21 22:59:43 +0100
commitaf4bc251f9d4032abf12d0377b5e948701e82713 (patch)
treeb2c77469fe2aef4ca4d4c6938020b6c85617275a
parente79fb2c26e62b8820c8bdf7e142a605ccefe24ad (diff)
downloadqmk_firmware-af4bc251f9d4032abf12d0377b5e948701e82713.tar.gz
qmk_firmware-af4bc251f9d4032abf12d0377b5e948701e82713.zip
Updates on Mixi default keymaps and fixes on configuration (#9467)
Diffstat
-rw-r--r--keyboards/mixi/config.h4
-rw-r--r--keyboards/mixi/keymaps/default/keymap.c43
-rw-r--r--keyboards/mixi/keymaps/default/readme.md2
-rw-r--r--keyboards/mixi/keymaps/via/keymap.c60
-rw-r--r--keyboards/mixi/mixi.c3
-rw-r--r--keyboards/mixi/readme.md2
6 files changed, 67 insertions, 47 deletions
diff --git a/keyboards/mixi/config.h b/keyboards/mixi/config.h
index cb89dd2cb..aed57f324 100644
--- a/keyboards/mixi/config.h
+++ b/keyboards/mixi/config.h
@@ -21,8 +21,8 @@
21 { C6, F7, B6 } \ 21 { C6, F7, B6 } \
22} 22}
23 23
24#define ENCODERS_PAD_A { F5 } 24#define ENCODERS_PAD_A { D7, B1 }
25#define ENCODERS_PAD_B { F4 } 25#define ENCODERS_PAD_B { E6, B3 }
26 26
27/* Set 0 if debouncing isn't needed */ 27/* Set 0 if debouncing isn't needed */
28#define DEBOUNCE 5 28#define DEBOUNCE 5
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
index 806a7a924..21c3c669a 100644
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ b/keyboards/mixi/keymaps/default/keymap.c
@@ -6,36 +6,37 @@
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 7
8 /* 8 /*
9 * | Knob: Layer +/- | 9 * | Knob: Layer +/- |
10 * .---------------------------------------. 10 * .------------------------------------------------.
11 * | Mute | Play/Pause | Hold: Layer 2 | 11 * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
12 * |----------|------------|---------------| 12 * |-------------|------------------|---------------|
13 * | Previous | Up | Next | 13 * | Media Prev | Up | Media Next |
14 * |----------|------------|---------------| 14 * |-------------|------------------|---------------|
15 * | Left | Down | Right | 15 * | Left | Down | Right |
16 * '---------------------------------------' 16 * '------------------------------------------------'
17 */ 17 */
18 [0] = 18 [0] =
19 LAYOUT( 19 LAYOUT(
20 KC_MUTE, KC_MPLY, MO(2), 20 KC_MUTE, KC_MPLY, MO(2) ,
21 KC_MNXT, KC_UP , KC_MPRV , 21 KC_MPRV, KC_UP , KC_MNXT,
22 KC_LEFT, KC_DOWN , KC_RGHT 22 KC_LEFT, KC_DOWN , KC_RGHT
23 ), 23 ),
24 24
25 /* 25 /*
26 * .-----------------------. 26 * | Knob: Layer +/- |
27 * | NUM 7 | NUM 8 | NUM 9 | 27 * .---------------------------------------------------.
28 * |-------|-------|-------| 28 * | RGB Toggle | Media Play/Pause | Hold: Layer 2 |
29 * | NUM 4 | NUM 5 | NUM 6 | 29 * |----------------|------------------|---------------|
30 * |-------|-------|-------| 30 * | Media Previous | RGB Bright+ | Media Next |
31 * | NUM 1 | NUM 2 | NUM 3 | 31 * |----------------|------------------|---------------|
32 * '-----------------------' 32 * | RGB Anim- | RGB Bright- | RGB Anim+ |
33 * '---------------------------------------------------'
33 */ 34 */
34 [1] = 35 [1] =
35 LAYOUT( 36 LAYOUT(
36 KC_P7, KC_P8, KC_P8, 37 RGB_TOG , KC_TRNS, KC_TRNS,
37 KC_P4, KC_P5, KC_P6, 38 KC_TRNS , RGB_VAI, KC_TRNS,
38 KC_P1, KC_P2, KC_P3 39 RGB_RMOD, RGB_VAD, RGB_MOD
39 ), 40 ),
40 41
41 /* 42 /*
@@ -58,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
58}; 59};
59 60
60const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS( 61const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
61 {0, RGBLED_NUM, HSV_WHITE} 62 {0, RGBLED_NUM, HSV_BLUE}
62 ); 63 );
63const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS( 64const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
64 {0, RGBLED_NUM, HSV_GREEN} 65 {0, RGBLED_NUM, HSV_GREEN}
diff --git a/keyboards/mixi/keymaps/default/readme.md b/keyboards/mixi/keymaps/default/readme.md
index 863fa6f5d..c780eb5f4 100644
--- a/keyboards/mixi/keymaps/default/readme.md
+++ b/keyboards/mixi/keymaps/default/readme.md
@@ -1,4 +1,4 @@
1![Mixi Layout Image](https://i.imgur.com/UIXj9O6.png) 1![Mixi Layout Image](https://i.imgur.com/WCtQ6GG.jpg)
2 2
3# Default Mixi Layout 3# Default Mixi Layout
4 4
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
index 806a7a924..4ffaf111d 100644
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ b/keyboards/mixi/keymaps/via/keymap.c
@@ -6,36 +6,37 @@
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 7
8 /* 8 /*
9 * | Knob: Layer +/- | 9 * | Knob: Layer +/- |
10 * .---------------------------------------. 10 * .------------------------------------------------.
11 * | Mute | Play/Pause | Hold: Layer 2 | 11 * | Volume Mute | Media Play/Pause | Hold: Layer 2 |
12 * |----------|------------|---------------| 12 * |-------------|------------------|---------------|
13 * | Previous | Up | Next | 13 * | Media Prev | Up | Media Next |
14 * |----------|------------|---------------| 14 * |-------------|------------------|---------------|
15 * | Left | Down | Right | 15 * | Left | Down | Right |
16 * '---------------------------------------' 16 * '------------------------------------------------'
17 */ 17 */
18 [0] = 18 [0] =
19 LAYOUT( 19 LAYOUT(
20 KC_MUTE, KC_MPLY, MO(2), 20 KC_MUTE, KC_MPLY, MO(2) ,
21 KC_MNXT, KC_UP , KC_MPRV , 21 KC_MPRV, KC_UP , KC_MNXT,
22 KC_LEFT, KC_DOWN , KC_RGHT 22 KC_LEFT, KC_DOWN , KC_RGHT
23 ), 23 ),
24 24
25 /* 25 /*
26 * .-----------------------. 26 * | Knob: Layer +/- |
27 * | NUM 7 | NUM 8 | NUM 9 | 27 * .---------------------------------------------------.
28 * |-------|-------|-------| 28 * | RGB Toggle | Media Play/Pause | Hold: Layer 2 |
29 * | NUM 4 | NUM 5 | NUM 6 | 29 * |----------------|------------------|---------------|
30 * |-------|-------|-------| 30 * | Media Previous | RGB Bright+ | Media Next |
31 * | NUM 1 | NUM 2 | NUM 3 | 31 * |----------------|------------------|---------------|
32 * '-----------------------' 32 * | RGB Anim- | RGB Bright- | RGB Anim+ |
33 * '---------------------------------------------------'
33 */ 34 */
34 [1] = 35 [1] =
35 LAYOUT( 36 LAYOUT(
36 KC_P7, KC_P8, KC_P8, 37 RGB_TOG , KC_TRNS, KC_TRNS,
37 KC_P4, KC_P5, KC_P6, 38 KC_TRNS , RGB_VAI, KC_TRNS,
38 KC_P1, KC_P2, KC_P3 39 RGB_RMOD, RGB_VAD, RGB_MOD
39 ), 40 ),
40 41
41 /* 42 /*
@@ -53,12 +54,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
53 KC_NO , KC_NO, KC_TRNS, 54 KC_NO , KC_NO, KC_TRNS,
54 EEP_RST, RESET, DEBUG , 55 EEP_RST, RESET, DEBUG ,
55 KC_NO , KC_NO, KC_NO 56 KC_NO , KC_NO, KC_NO
57 ),
58
59 /*
60 * | Knob: N/A |
61 * .-----------------.
62 * | N/A | N/A | N/A |
63 * |-----------------|
64 * | N/A | N/A | N/A |
65 * |-----------------|
66 * | N/A | N/A | N/A |
67 * '-----------------'
68 */
69 [3] =
70 LAYOUT(
71 KC_NO, KC_NO, KC_NO,
72 KC_NO, KC_NO, KC_NO,
73 KC_NO, KC_NO, KC_NO
56 ) 74 )
57 75
58}; 76};
59 77
60const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS( 78const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
61 {0, RGBLED_NUM, HSV_WHITE} 79 {0, RGBLED_NUM, HSV_BLUE}
62 ); 80 );
63const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS( 81const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
64 {0, RGBLED_NUM, HSV_GREEN} 82 {0, RGBLED_NUM, HSV_GREEN}
diff --git a/keyboards/mixi/mixi.c b/keyboards/mixi/mixi.c
index 533cf3b88..43625bcd5 100644
--- a/keyboards/mixi/mixi.c
+++ b/keyboards/mixi/mixi.c
@@ -3,8 +3,9 @@
3void eeconfig_init_kb(void) { 3void eeconfig_init_kb(void) {
4#ifdef RGBLIGHT_ENABLE 4#ifdef RGBLIGHT_ENABLE
5 rgblight_enable(); // Enable RGB underglow by default 5 rgblight_enable(); // Enable RGB underglow by default
6 rgblight_sethsv(0, 255, 255);
6#ifdef RGBLIGHT_ANIMATIONS 7#ifdef RGBLIGHT_ANIMATIONS
7 rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5); // Set to RGB_TWINKLE animation by default 8 rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
8#endif 9#endif
9#endif 10#endif
10 11
diff --git a/keyboards/mixi/readme.md b/keyboards/mixi/readme.md
index 4c911db57..e89308094 100644
--- a/keyboards/mixi/readme.md
+++ b/keyboards/mixi/readme.md
@@ -1,6 +1,6 @@
1# Mixi 1# Mixi
2 2
3![Mixi](https://i.imgur.com/GPO6Khu.jpg) 3![Mixi](https://i.imgur.com/f6hHXKZ.jpg)
4 4
5A mini 3x3 macropad with rotary encoders support and RGB underglow and also tray mount support. Currently the PCB and kits can only be purchased in Indonesia. 5A mini 3x3 macropad with rotary encoders support and RGB underglow and also tray mount support. Currently the PCB and kits can only be purchased in Indonesia.
6 6
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 22:02:18 +0000