mh
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware/
1
0
Fork 0
Code Issues 0 Projects 0 Releases 1.6k Wiki Activity
Browse Source

EEconfig implementation

pull/14484/head^2
Batuhan Başerdem 2 years ago
parent
c1189961e0
commit
daa678b20a
3 changed files with 146 additions and 31 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +126
    -27
      users/bbaserdem/bb-encoder.c
  2. +2
    -0
      users/bbaserdem/bb-macro.c
  3. +18
    -4
      users/bbaserdem/bbaserdem.h

+ 126
- 27
users/bbaserdem/bb-encoder.c View File

@ -36,12 +36,12 @@
// Default state for the encoders
void reset_encoder_state(void) {
// for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
for (int i = 0; i < 2; i++) {
userspace_config.encoder[i].base = i;
userspace_config.encoder[i].rgb = i;
userspace_config.encoder[i].point = i;
}
userspace_config.e0base = 0;
userspace_config.e0point = 0;
userspace_config.e0rgb = 0;
userspace_config.e1base = 1;
userspace_config.e1point = 1;
userspace_config.e1rgb = 1;
}
// Initialize the encoder state beginning
@ -51,11 +51,20 @@ void keyboard_post_init_encoder(void) {
// Encoder scroll functionality
bool encoder_update_user(uint8_t index, bool clockwise) {
uint8_t this_number;
// Differentiate layer roles
switch (get_highest_layer(layer_state)) {
# ifdef RGB_MATRIX_ENABLE
case _MEDI:
switch(userspace_config.encoder[index].rgb) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0rgb;
} else if (index == 1) {
this_number = userspace_config.e1rgb;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Effect the RGB mode
if (clockwise) {
rgb_matrix_step_noeeprom();
@ -96,7 +105,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
# endif // RGB_MATRIX_ENABLE
# ifdef MOUSEKEY_ENABLE
case _MOUS:
switch(userspace_config.encoder[index].point) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0point;
} else if (index == 1) {
this_number = userspace_config.e1point;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Move mouse on horizontal axis
if (clockwise) {
tap_code(KC_MS_R);
@ -129,7 +146,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
break;
# endif // MOUSEKEY_ENABLE
default:
switch(userspace_config.encoder[index].base) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0base;
} else if (index == 1) {
this_number = userspace_config.e1base;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Volume
if (clockwise) {
tap_code16(KC_VOLU);
@ -200,11 +225,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
void encoder_click_action(uint8_t index) {
uint8_t this_number;
// Differentiate layer roles
switch (get_highest_layer(layer_state)) {
# ifdef RGB_MATRIX_ENABLE
case _MEDI:
switch(userspace_config.encoder[index].rgb) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0rgb;
} else if (index == 1) {
this_number = userspace_config.e1rgb;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Return to no animation
rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
break;
@ -223,7 +257,15 @@ void encoder_click_action(uint8_t index) {
# endif // RGB_MATRIX_ENABLE
# ifdef MOUSEKEY_ENABLE
case _MOUS:
switch(userspace_config.encoder[index].point) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0point;
} else if (index == 1) {
this_number = userspace_config.e1point;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Left click
tap_code16(KC_BTN1);
break;
@ -238,7 +280,15 @@ void encoder_click_action(uint8_t index) {
break;
# endif // MOUSEKEY_ENABLE
default:
switch(userspace_config.encoder[index].base) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0base;
} else if (index == 1) {
this_number = userspace_config.e1base;
} else {
this_number = 128;
}
switch(this_number) {
case 0: // Toggle mute
case 2:
tap_code16(KC_MUTE);
@ -270,6 +320,7 @@ void encoder_click_action(uint8_t index) {
bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
// Check if and which encoder
int encoder_index = -1;
switch (keycode) {
case BB_ENC0:
encoder_index = 0;
@ -285,44 +336,67 @@ bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
switch (get_highest_layer(layer_state)) {
# ifdef RGB_MATRIX_ENABLE
case _MEDI:
userspace_config.encoder[encoder_index].rgb =
(userspace_config.encoder[encoder_index].rgb + 1) % 5;
if (encoder_index == 0) {
userspace_config.e0rgb = (userspace_config.e0rgb + 1) % 5;
} else {
userspace_config.e1rgb = (userspace_config.e1rgb + 1) % 5;
}
break;
# endif // RGB_MATRIX_ENABLE
# ifdef MOUSEKEY_ENABLE
case _MOUS:
userspace_config.encoder[encoder_index].point =
(userspace_config.encoder[encoder_index].point + 1) % 4;
if (encoder_index == 0) {
userspace_config.e0point = (userspace_config.e0point + 1) % 4;
} else {
userspace_config.e1point = (userspace_config.e1point + 1) % 4;
}
break;
# endif // MOUSEKEY_ENABLE
default:
userspace_config.encoder[encoder_index].base =
(userspace_config.encoder[encoder_index].base + 1) % 9;
if (encoder_index == 0) {
userspace_config.e0base = (userspace_config.e0base + 1) % 9;
} else {
userspace_config.e1base = (userspace_config.e1base + 1) % 9;
}
break;
}
// Write the change to EEPROM
eeconfig_update_user(userspace_config.raw);
// If ctrl is active, move mode one point backwards
} else if (get_mods() & MOD_MASK_CTRL) {
switch (get_highest_layer(layer_state)) {
# ifdef RGB_MATRIX_ENABLE
case _MEDI:
userspace_config.encoder[encoder_index].rgb =
(userspace_config.encoder[encoder_index].rgb + 5 - 1) % 5;
if (encoder_index == 0) {
userspace_config.e0rgb = (userspace_config.e0rgb + 5 - 1) % 5;
} else {
userspace_config.e1rgb = (userspace_config.e1rgb + 5 - 1) % 5;
}
break;
# endif // RGB_MATRIX_ENABLE
# ifdef MOUSEKEY_ENABLE
case _MOUS:
userspace_config.encoder[encoder_index].point =
(userspace_config.encoder[encoder_index].point + 4 - 1) % 4;
if (encoder_index == 0) {
userspace_config.e0point = (userspace_config.e0point + 4 - 1) % 4;
} else {
userspace_config.e1point = (userspace_config.e1point + 4 - 1) % 4;
}
break;
# endif // MOUSEKEY_ENABLE
default:
userspace_config.encoder[encoder_index].base =
(userspace_config.encoder[encoder_index].base + 9 - 1) % 9;
if (encoder_index == 0) {
userspace_config.e0base = (userspace_config.e0base + 9 - 1) % 9;
} else {
userspace_config.e1base = (userspace_config.e1base + 9 - 1) % 9;
}
break;
}
// Write the change to EEPROM
eeconfig_update_user(userspace_config.raw);
// If meta is active, reset the encoder states
} else if (get_mods() & MOD_MASK_GUI) {
reset_encoder_state();
eeconfig_update_user(userspace_config.raw);
// If nothing else; just perform the click action
} else {
encoder_click_action(encoder_index);
@ -334,12 +408,21 @@ bool process_record_encoder(uint16_t keycode, keyrecord_t *record) {
// For printing status to OLED
#ifdef OLED_ENABLE
void encoder_state_string(uint8_t index, uint8_t layer, char* buffer) {
uint8_t this_number;
// Get the layer straight from the main function
switch (layer) {
// If RGB control mode is enabled
# ifdef RGB_MATRIX_ENABLE
case _MEDI:
switch (userspace_config.encoder[index].rgb) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0rgb;
} else if (index == 1) {
this_number = userspace_config.e1rgb;
} else {
this_number = 128;
}
switch (this_number) {
case 0:
strcpy(buffer, "ani mode");
break;
@ -364,7 +447,15 @@ void encoder_state_string(uint8_t index, uint8_t layer, char* buffer) {
// If pointer control is enabled
# ifdef MOUSEKEY_ENABLE
case _MOUS:
switch (userspace_config.encoder[index].point) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0point;
} else if (index == 1) {
this_number = userspace_config.e1point;
} else {
this_number = 128;
}
switch (this_number) {
case 0:
strcpy(buffer, "Lateral ");
break;
@ -384,7 +475,15 @@ void encoder_state_string(uint8_t index, uint8_t layer, char* buffer) {
break;
# endif // MOUSEKEY_ENABLE
default:
switch (userspace_config.encoder[index].base) {
// Get correct index
if (index == 0) {
this_number = userspace_config.e0base;
} else if (index == 1) {
this_number = userspace_config.e1base;
} else {
this_number = 128;
}
switch (this_number) {
case 0:
strcpy(buffer, "Volume ");
break;


+ 2
- 0
users/bbaserdem/bb-macro.c View File

@ -84,6 +84,7 @@ bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
if (get_mods() & MOD_BIT(KC_RALT)) {
userspace_config.layout = (userspace_config.layout + 1) % 3;
eeconfig_update_user(userspace_config.raw);
}
}
return true;
@ -96,6 +97,7 @@ bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
} else {
userspace_config.layout = (userspace_config.layout + 1) % 3;
}
eeconfig_update_user(userspace_config.raw);
}
return false;
break;


+ 18
- 4
users/bbaserdem/bbaserdem.h View File

@ -14,7 +14,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include QMK_KEYBOARD_H
#include "quantum.h"
@ -54,12 +53,13 @@
#endif // OLED_ENABLE
// Structure to keep runtime info on encoder state
/*
typedef union {
uint16_t raw;
struct {
uint8_t base :4; // (9) The encoder state on most layers; regular function
uint8_t rgb :4; // (5) The encoder state on media layer; controls light
uint8_t point :4; // (4) The encoder state on mouse layer; moves pointer
uint8_t base :4; // (9:4) The encoder state on most layers; regular function
uint8_t rgb :4; // (5:3) The encoder state on media layer; controls light
uint8_t point :4; // (4:2) The encoder state on mouse layer; moves pointer
uint8_t :4; // Padding
};
} encoder_state_t;
@ -72,6 +72,20 @@ typedef union {
uint8_t layout;
};
} userspace_config_t;
*/
typedef union {
uint32_t raw;
struct {
uint8_t e0base :4; // ( 4:0) The encoder state on most layers; regular function
uint8_t e1base :4; // ( 8:1) 9 states for this; 4 bits
uint8_t e0point :2; // (10:1) The encoder state on mouse layer; moves pointer
uint8_t e1point :2; // (12:1) 4 states for this; 2 bits
uint8_t e0rgb :4; // (16:2) The encoder state on media layer; controls light
uint8_t e1rgb :4; // (20:2) 5 states for this; 3 bits but 4 is better
uint8_t layout :2; // (22:2) Stores keymap layout; 3 states is good on 2 bits
uint16_t :10; // (32:3) Padding here
};
} userspace_config_t;
// Broadcast us to everyone else
extern userspace_config_t userspace_config;


Write Preview
Loading…
Cancel
Save