Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b28d8fcb07
3 changed files with 30 additions and 10 deletions
|
@ -40,8 +40,8 @@ led_config_t g_led_config = { {
|
||||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8,
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8,
|
||||||
4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
|
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||||
4, 4, 4, 1, 1, 4, 1, 1, 1,
|
4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||||
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
|
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
|
||||||
} };
|
} };
|
||||||
#endif
|
#endif
|
||||||
|
@ -52,9 +52,30 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (clockwise) {
|
if (clockwise) {
|
||||||
tap_code(KC_VOLD);
|
switch (get_highest_layer(layer_state)) {
|
||||||
} else {
|
case 0:
|
||||||
tap_code(KC_VOLU);
|
tap_code(KC_VOLU);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
rgb_matrix_step();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
tap_code(KC_VOLU);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
switch (get_highest_layer(layer_state)) {
|
||||||
|
case 0:
|
||||||
|
tap_code(KC_VOLD);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
rgb_matrix_step_reverse();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
tap_code(KC_VOLD);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
#include "encoder_actions.h"
|
|
||||||
|
|
||||||
#define LAYOUT( \
|
#define LAYOUT( \
|
||||||
K000, K001, K002, K003, K004, K005, K006, K007, K008, K010, K011, K012, K013, K014, \
|
K000, K001, K002, K003, K004, K005, K006, K007, K008, K010, K011, K012, K013, K014, \
|
||||||
|
|
|
@ -35,12 +35,12 @@
|
||||||
#define UNUSED_PINS
|
#define UNUSED_PINS
|
||||||
|
|
||||||
/* Encoder pins */
|
/* Encoder pins */
|
||||||
#define ENCODERS_PAD_A { B0 }
|
#define ENCODERS_PAD_A { E6 }
|
||||||
#define ENCODERS_PAD_B { E6 }
|
#define ENCODERS_PAD_B { B0 }
|
||||||
#define ENCODER_RESOLUTION 4
|
#define ENCODER_RESOLUTION 4
|
||||||
#define ENCODERS 1
|
#define ENCODERS 1
|
||||||
#define ENCODERS_CCW_KEY { { 3, 5 } } // Note: array is { col, row )
|
#define ENCODERS_CCW_KEY { { 4, 5 } } // Note: array is { col, row )
|
||||||
#define ENCODERS_CW_KEY { { 4, 5 } } // Note: array is { col, row )
|
#define ENCODERS_CW_KEY { { 3, 5 } } // Note: array is { col, row )
|
||||||
|
|
||||||
/* LED pins */
|
/* LED pins */
|
||||||
#define LED_CAPS_LOCK_PIN D4
|
#define LED_CAPS_LOCK_PIN D4
|
||||||
|
|
Loading…
Reference in a new issue