diff options
| author | tmk <nobody@nowhere> | 2013-03-11 01:55:41 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-11 01:55:41 +0900 |
| commit | e4fbaf30be00d73a3fab2aee24c7a522a0ecdd31 (patch) | |
| tree | 8186ded1924f5420a972540c3780a49aa683e051 | |
| parent | 09bd1aef12e42b44f90b8275ae95b578294957c0 (diff) | |
| download | qmk_firmware-e4fbaf30be00d73a3fab2aee24c7a522a0ecdd31.tar.gz qmk_firmware-e4fbaf30be00d73a3fab2aee24c7a522a0ecdd31.zip | |
Add keyconf in eeconfig.c
| -rw-r--r-- | common/command.c | 9 | ||||
| -rw-r--r-- | common/eeconfig.h | 15 |
2 files changed, 24 insertions, 0 deletions
diff --git a/common/command.c b/common/command.c index a18eb7800..d7ba3f232 100644 --- a/common/command.c +++ b/common/command.c | |||
| @@ -135,6 +135,15 @@ static void print_eeprom_config(void) | |||
| 135 | 135 | ||
| 136 | eebyte = eeconfig_read_keyconf(); | 136 | eebyte = eeconfig_read_keyconf(); |
| 137 | print("keyconf: "); print_hex8(eebyte); print("\n"); | 137 | print("keyconf: "); print_hex8(eebyte); print("\n"); |
| 138 | |||
| 139 | keyconf kc = (keyconf){ .raw = eebyte }; | ||
| 140 | print("keyconf.swap_control_capslock: "); print_hex8(kc.swap_control_capslock); print("\n"); | ||
| 141 | print("keyconf.capslock_to_control: "); print_hex8(kc.capslock_to_control); print("\n"); | ||
| 142 | print("keyconf.swap_lalt_lgui: "); print_hex8(kc.swap_lalt_lgui); print("\n"); | ||
| 143 | print("keyconf.swap_ralt_rgui: "); print_hex8(kc.swap_ralt_rgui); print("\n"); | ||
| 144 | print("keyconf.no_gui: "); print_hex8(kc.no_gui); print("\n"); | ||
| 145 | print("keyconf.swap_grave_esc: "); print_hex8(kc.swap_grave_esc); print("\n"); | ||
| 146 | print("keyconf.swap_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n"); | ||
| 138 | } | 147 | } |
| 139 | 148 | ||
| 140 | static bool command_common(uint8_t code) | 149 | static bool command_common(uint8_t code) |
diff --git a/common/eeconfig.h b/common/eeconfig.h index 9cf2ff680..2786995a2 100644 --- a/common/eeconfig.h +++ b/common/eeconfig.h | |||
| @@ -46,6 +46,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 46 | #define EECONFIG_KEYCONF_SWAP_BACKSLASH_BACKSPACE (1<<6) | 46 | #define EECONFIG_KEYCONF_SWAP_BACKSLASH_BACKSPACE (1<<6) |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | /* XXX: Not portable. Bit field order depends on implementation */ | ||
| 50 | typedef union { | ||
| 51 | uint8_t raw; | ||
| 52 | struct { | ||
| 53 | bool swap_control_capslock:1; | ||
| 54 | bool capslock_to_control:1; | ||
| 55 | bool swap_lalt_lgui:1; | ||
| 56 | bool swap_ralt_rgui:1; | ||
| 57 | bool no_gui:1; | ||
| 58 | bool swap_grave_esc:1; | ||
| 59 | bool swap_backslash_backspace:1; | ||
| 60 | bool reserved:1; | ||
| 61 | }; | ||
| 62 | } keyconf; | ||
| 63 | |||
| 49 | bool eeconfig_initialized(void); | 64 | bool eeconfig_initialized(void); |
| 50 | 65 | ||
| 51 | void eeconfig_init(void); | 66 | void eeconfig_init(void); |
