From ef7a7bf320a24c4168c052dafb5f2a701437ff26 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 27 Apr 2020 17:11:36 -0500 Subject: [PATCH] Clean up shift/shiftlock cruft * firmware/asdf/src/asdf_modifiers.h: C --- firmware/asdf/src/asdf_modifiers.c | 2 +- firmware/asdf/src/asdf_modifiers.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/firmware/asdf/src/asdf_modifiers.c b/firmware/asdf/src/asdf_modifiers.c index e5f4614..c4f49ef 100644 --- a/firmware/asdf/src/asdf_modifiers.c +++ b/firmware/asdf/src/asdf_modifiers.c @@ -64,7 +64,7 @@ static const modifier_index_t modifier_mapping[] = { void asdf_modifier_set_shift_state(uint8_t new_state) { shift_state = new_state; - asdf_virtual_action(VSHIFT_LED, (shift_state ? V_SET_HI : V_SET_LO)); + asdf_virtual_action(VSHIFT_LED, ((shift_state & SHIFT_LOCKED_ST) ? V_SET_HI : V_SET_LO)); } // PROCEDURE: asdf_modifier_shift_activate diff --git a/firmware/asdf/src/asdf_modifiers.h b/firmware/asdf/src/asdf_modifiers.h index b846c2c..6ff782a 100644 --- a/firmware/asdf/src/asdf_modifiers.h +++ b/firmware/asdf/src/asdf_modifiers.h @@ -55,9 +55,7 @@ typedef enum { // Define the legal CAPS and CAPSLOCK states typedef enum { CAPS_OFF_ST = 0, - CAPS_ON_ST = 1, - CAPS_LOCKED_ST = 2, - CAPS_BOTH_ST = 3 // Never explicitly set. CAPS and CAPSLOCK together. + CAPS_LOCKED_ST = 1, } caps_state_t; // Define the legal CTRL states