From ea71253d6ae4fdebecb33041721adeb865077fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Sat, 30 Sep 2017 00:57:10 +0200
Subject: [PATCH] Remove KEY_STATE_SIZE in favor of the more general
 BOOL_BYTES_TO_BITS_COUNT() macro.

---
 left/src/slave_protocol_handler.c           | 2 +-
 left/src/slave_protocol_handler.h           | 2 --
 right/src/slave_drivers/uhk_module_driver.h | 1 -
 shared/bool_array_converter.h               | 4 ++++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/left/src/slave_protocol_handler.c b/left/src/slave_protocol_handler.c
index 8f7598e..b3afc24 100644
--- a/left/src/slave_protocol_handler.c
+++ b/left/src/slave_protocol_handler.c
@@ -72,7 +72,7 @@ void SlaveTxHandler(void)
         }
         case SlaveCommand_RequestKeyStates:
             BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, MODULE_KEY_COUNT);
-            TxMessage.length = KEY_STATE_SIZE;
+            TxMessage.length = BOOL_BYTES_TO_BITS_COUNT(MODULE_KEY_COUNT);
             break;
     }
 
diff --git a/left/src/slave_protocol_handler.h b/left/src/slave_protocol_handler.h
index 997e225..dd3f1c5 100644
--- a/left/src/slave_protocol_handler.h
+++ b/left/src/slave_protocol_handler.h
@@ -12,8 +12,6 @@
     #define PROTOCOL_RESPONSE_SUCCESS       0
     #define PROTOCOL_RESPONSE_GENERIC_ERROR 1
 
-    #define KEY_STATE_SIZE (MODULE_KEY_COUNT/8 + (MODULE_KEY_COUNT % 8 ? 1 : 0))
-
 // Variables:
 
     extern i2c_message_t RxMessage;
diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h
index 8816cb4..5156801 100644
--- a/right/src/slave_drivers/uhk_module_driver.h
+++ b/right/src/slave_drivers/uhk_module_driver.h
@@ -9,7 +9,6 @@
 // Macros:
 
     #define UHK_MODULE_MAX_COUNT 3
-    #define KEY_STATE_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + (LEFT_KEYBOARD_HALF_KEY_COUNT % 8 ? 1 : 0))
     #define MAX_PWM_BRIGHTNESS 0x64
 
 // Typedefs:
diff --git a/shared/bool_array_converter.h b/shared/bool_array_converter.h
index 584254a..b05a74c 100644
--- a/shared/bool_array_converter.h
+++ b/shared/bool_array_converter.h
@@ -5,6 +5,10 @@
 
     #include <stdint.h>
 
+// Macros:
+
+    #define BOOL_BYTES_TO_BITS_COUNT(BYTE_COUNT) (BYTE_COUNT/8 + (BYTE_COUNT % 8 ? 1 : 0))
+
 // Functions:
 
     void BoolBytesToBits(uint8_t *srcBytes, uint8_t *dstBits, uint8_t byteCount);