use 2bits for eeprom handedness

Author: daskygit

keyboards/vitamins_included/rev2/rev2.c

@@ -8,5 +8,9 @@ bool is_keyboard_left(void) {
         gpio_set_pin_input(SPLIT_HAND_PIN);
         return x;
     #endif
-    return eeprom_read_byte(EECONFIG_HANDEDNESS);
+    if (eeconfig_read_handedness() == EEHANDS_UNSET){
+        return is_keyboard_master();
+    } else {
+        return eeconfig_read_handedness() == EEHANDS_LEFT ? true : false;
+    }
 }

quantum/eeconfig.c

@@ -63,6 +63,8 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_STENOMODE, 0);
     eeprom_write_qword(EECONFIG_RGB_MATRIX, 0);
     eeprom_update_dword(EECONFIG_HAPTIC, 0);
+    eeprom_update_byte(EECONFIG_HANDEDNESS, EEHANDS_UNSET);
+
 #if defined(HAPTIC_ENABLE)
     haptic_reset();
 #endif
@@ -254,15 +256,15 @@ void eeconfig_update_haptic(uint32_t val) {
  *
  * FIXME: needs doc
  */
-bool eeconfig_read_handedness(void) {
-    return !!eeprom_read_byte(EECONFIG_HANDEDNESS);
+eehands_t eeconfig_read_handedness(void) {
+    return eeprom_read_byte(EECONFIG_HANDEDNESS);
 }
 /** \brief eeconfig update split handedness
  *
  * FIXME: needs doc
  */
-void eeconfig_update_handedness(bool val) {
-    eeprom_update_byte(EECONFIG_HANDEDNESS, !!val);
+void eeconfig_update_handedness(eehands_t val) {
+    eeprom_update_byte(EECONFIG_HANDEDNESS, val);
 }
 
 #if (EECONFIG_KB_DATA_SIZE) > 0

quantum/eeconfig.h

@@ -28,6 +28,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
 
+typedef enum {
+    EEHANDS_LEFT,
+    EEHANDS_RIGHT,
+    EEHANDS_UNSET,
+} eehands_t;
+
 // Dummy struct only used to calculate offsets
 typedef struct PACKED {
     uint16_t magic;
@@ -148,8 +154,8 @@ uint32_t eeconfig_read_haptic(void);
 void     eeconfig_update_haptic(uint32_t val);
 #endif
 
-bool eeconfig_read_handedness(void);
-void eeconfig_update_handedness(bool val);
+eehands_t eeconfig_read_handedness(void);
+void eeconfig_update_handedness(eehands_t val);
 
 #if (EECONFIG_KB_DATA_SIZE) > 0
 bool eeconfig_is_kb_datablock_valid(void);

quantum/split_common/split_util.c

@@ -157,17 +157,21 @@ __attribute__((weak)) bool is_keyboard_left_impl(void) {
 #    if defined(INIT_EE_HANDS_LEFT) || defined(INIT_EE_HANDS_RIGHT)
 #        if defined(INIT_EE_HANDS_LEFT)
 #            pragma message "Forcing EEPROM setting for left hand"
-    const bool should_be_left = true;
+    const eehands_t eehands_forced = EEHANDS_LEFT;
 #        else
 #            pragma message "Forcing EEPROM setting for right hand"
-    const bool should_be_left = false;
+    const eehands_t eehands_forced = EEHANDS_RIGHT;
 #        endif
-    bool       is_left        = eeconfig_read_handedness();
-    if (is_left != should_be_left) {
-        eeconfig_update_handedness(should_be_left);
+    if (eehands_forced != eeconfig_read_handedness()) {
+        eeconfig_update_handedness(eehands_forced);
     }
 #    endif // defined(INIT_EE_HANDS_LEFT) || defined(INIT_EE_HANDS_RIGHT)
-    return eeconfig_read_handedness();
+
+    if (eeconfig_read_handedness() == EEHANDS_UNSET){
+        return is_keyboard_master();
+    } else {
+        return eeconfig_read_handedness() == EEHANDS_LEFT ? true : false;
+    }
 #endif
 }