|
@@ -188,15 +188,24 @@ uint16_t muse_counter = 0;
|
|
uint8_t muse_offset = 70;
|
|
uint8_t muse_offset = 70;
|
|
uint16_t muse_tempo = 20;
|
|
uint16_t muse_tempo = 20;
|
|
|
|
|
|
|
|
+extern float clicky_rand;
|
|
|
|
+
|
|
void encoder_update(bool clockwise) {
|
|
void encoder_update(bool clockwise) {
|
|
if (is_clicky_on()) {
|
|
if (is_clicky_on()) {
|
|
- if (clockwise) {
|
|
|
|
- clicky_freq_up();
|
|
|
|
|
|
+ if (IS_LAYER_ON(_RAISE)) {
|
|
|
|
+ if (clockwise) {
|
|
|
|
+ clicky_rand += 0.5f;
|
|
|
|
+ } else {
|
|
|
|
+ clicky_rand -= 0.5f;
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
- clicky_freq_down();
|
|
|
|
|
|
+ if (clockwise) {
|
|
|
|
+ clicky_freq_up();
|
|
|
|
+ } else {
|
|
|
|
+ clicky_freq_down();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- } else
|
|
|
|
- if (muse_mode) {
|
|
|
|
|
|
+ } else if (muse_mode) {
|
|
if (IS_LAYER_ON(_RAISE)) {
|
|
if (IS_LAYER_ON(_RAISE)) {
|
|
if (clockwise) {
|
|
if (clockwise) {
|
|
muse_offset++;
|
|
muse_offset++;
|
|
@@ -255,7 +264,8 @@ void dip_update(uint8_t index, bool active) {
|
|
stop_all_notes();
|
|
stop_all_notes();
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
- case 2:
|
|
|
|
|
|
+ break;
|
|
|
|
+ case 3:
|
|
if (active) {
|
|
if (active) {
|
|
clicky_on();
|
|
clicky_on();
|
|
} else {
|
|
} else {
|