Browse Source

Updates on Mixi default keymaps and fixes on configuration (#9467)

pull/9500/head
Gregorio 3 years ago
committed by GitHub
parent
commit
af4bc251f9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 47 deletions
  1. +2
    -2
      keyboards/mixi/config.h
  2. +22
    -21
      keyboards/mixi/keymaps/default/keymap.c
  3. +1
    -1
      keyboards/mixi/keymaps/default/readme.md
  4. +39
    -21
      keyboards/mixi/keymaps/via/keymap.c
  5. +2
    -1
      keyboards/mixi/mixi.c
  6. +1
    -1
      keyboards/mixi/readme.md

+ 2
- 2
keyboards/mixi/config.h View File

@ -21,8 +21,8 @@
{ C6, F7, B6 } \
}
#define ENCODERS_PAD_A { F5 }
#define ENCODERS_PAD_B { F4 }
#define ENCODERS_PAD_A { D7, B1 }
#define ENCODERS_PAD_B { E6, B3 }
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5


+ 22
- 21
keyboards/mixi/keymaps/default/keymap.c View File

@ -6,36 +6,37 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* | Knob: Layer +/- |
* .---------------------------------------.
* | Mute | Play/Pause | Hold: Layer 2 |
* |----------|------------|---------------|
* | Previous | Up | Next |
* |----------|------------|---------------|
* | Left | Down | Right |
* '---------------------------------------'
* | Knob: Layer +/- |
* .------------------------------------------------.
* | Volume Mute | Media Play/Pause | Hold: Layer 2 |
* |-------------|------------------|---------------|
* | Media Prev | Up | Media Next |
* |-------------|------------------|---------------|
* | Left | Down | Right |
* '------------------------------------------------'
*/
[0] =
LAYOUT(
KC_MUTE, KC_MPLY, MO(2),
KC_MNXT, KC_UP , KC_MPRV ,
KC_MUTE, KC_MPLY, MO(2) ,
KC_MPRV, KC_UP , KC_MNXT,
KC_LEFT, KC_DOWN , KC_RGHT
),
/*
* .-----------------------.
* | NUM 7 | NUM 8 | NUM 9 |
* |-------|-------|-------|
* | NUM 4 | NUM 5 | NUM 6 |
* |-------|-------|-------|
* | NUM 1 | NUM 2 | NUM 3 |
* '-----------------------'
* | Knob: Layer +/- |
* .---------------------------------------------------.
* | RGB Toggle | Media Play/Pause | Hold: Layer 2 |
* |----------------|------------------|---------------|
* | Media Previous | RGB Bright+ | Media Next |
* |----------------|------------------|---------------|
* | RGB Anim- | RGB Bright- | RGB Anim+ |
* '---------------------------------------------------'
*/
[1] =
LAYOUT(
KC_P7, KC_P8, KC_P8,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3
RGB_TOG , KC_TRNS, KC_TRNS,
KC_TRNS , RGB_VAI, KC_TRNS,
RGB_RMOD, RGB_VAD, RGB_MOD
),
/*
@ -58,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, RGBLED_NUM, HSV_WHITE}
{0, RGBLED_NUM, HSV_BLUE}
);
const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, RGBLED_NUM, HSV_GREEN}


+ 1
- 1
keyboards/mixi/keymaps/default/readme.md View File

@ -1,4 +1,4 @@
![Mixi Layout Image](https://i.imgur.com/UIXj9O6.png)
![Mixi Layout Image](https://i.imgur.com/WCtQ6GG.jpg)
# Default Mixi Layout


+ 39
- 21
keyboards/mixi/keymaps/via/keymap.c View File

@ -6,36 +6,37 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* | Knob: Layer +/- |
* .---------------------------------------.
* | Mute | Play/Pause | Hold: Layer 2 |
* |----------|------------|---------------|
* | Previous | Up | Next |
* |----------|------------|---------------|
* | Left | Down | Right |
* '---------------------------------------'
* | Knob: Layer +/- |
* .------------------------------------------------.
* | Volume Mute | Media Play/Pause | Hold: Layer 2 |
* |-------------|------------------|---------------|
* | Media Prev | Up | Media Next |
* |-------------|------------------|---------------|
* | Left | Down | Right |
* '------------------------------------------------'
*/
[0] =
LAYOUT(
KC_MUTE, KC_MPLY, MO(2),
KC_MNXT, KC_UP , KC_MPRV ,
KC_MUTE, KC_MPLY, MO(2) ,
KC_MPRV, KC_UP , KC_MNXT,
KC_LEFT, KC_DOWN , KC_RGHT
),
/*
* .-----------------------.
* | NUM 7 | NUM 8 | NUM 9 |
* |-------|-------|-------|
* | NUM 4 | NUM 5 | NUM 6 |
* |-------|-------|-------|
* | NUM 1 | NUM 2 | NUM 3 |
* '-----------------------'
* | Knob: Layer +/- |
* .---------------------------------------------------.
* | RGB Toggle | Media Play/Pause | Hold: Layer 2 |
* |----------------|------------------|---------------|
* | Media Previous | RGB Bright+ | Media Next |
* |----------------|------------------|---------------|
* | RGB Anim- | RGB Bright- | RGB Anim+ |
* '---------------------------------------------------'
*/
[1] =
LAYOUT(
KC_P7, KC_P8, KC_P8,
KC_P4, KC_P5, KC_P6,
KC_P1, KC_P2, KC_P3
RGB_TOG , KC_TRNS, KC_TRNS,
KC_TRNS , RGB_VAI, KC_TRNS,
RGB_RMOD, RGB_VAD, RGB_MOD
),
/*
@ -53,12 +54,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO , KC_NO, KC_TRNS,
EEP_RST, RESET, DEBUG ,
KC_NO , KC_NO, KC_NO
),
/*
* | Knob: N/A |
* .-----------------.
* | N/A | N/A | N/A |
* |-----------------|
* | N/A | N/A | N/A |
* |-----------------|
* | N/A | N/A | N/A |
* '-----------------'
*/
[3] =
LAYOUT(
KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO
)
};
const rgblight_segment_t PROGMEM _base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, RGBLED_NUM, HSV_WHITE}
{0, RGBLED_NUM, HSV_BLUE}
);
const rgblight_segment_t PROGMEM _middle_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, RGBLED_NUM, HSV_GREEN}


+ 2
- 1
keyboards/mixi/mixi.c View File

@ -3,8 +3,9 @@
void eeconfig_init_kb(void) {
#ifdef RGBLIGHT_ENABLE
rgblight_enable(); // Enable RGB underglow by default
rgblight_sethsv(0, 255, 255);
#ifdef RGBLIGHT_ANIMATIONS
rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5); // Set to RGB_TWINKLE animation by default
rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // Set to RGB_RAINBOW_SWIRL animation by default
#endif
#endif


+ 1
- 1
keyboards/mixi/readme.md View File

@ -1,6 +1,6 @@
# Mixi
![Mixi](https://i.imgur.com/GPO6Khu.jpg)
![Mixi](https://i.imgur.com/f6hHXKZ.jpg)
A 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.


Loading…
Cancel
Save