Add KEY_ARRAY_TYPE_{NONE,VECTOR,MATRIX} in the newly added module/mod…

…ule.h
giulianob · Dec 30, 2019 · 2ee803f · 2ee803f
1 parent 9b78297
commit 2ee803f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/keycluster/src/module.h b/keycluster/src/module.h
@@ -3,6 +3,7 @@
 
 // Includes:
 
+    #include "module/module.h"
     #include "key_vector.h"
     #include "slave_protocol.h"
 
@@ -21,7 +22,7 @@
     #define TEST_LED_CLOCK kCLOCK_PortB
     #define TEST_LED_PIN   1
 
-    #define KEY_ARRAY_TYPE 1
+    #define KEY_ARRAY_TYPE KEY_ARRAY_TYPE_VECTOR
     #define KEYBOARD_VECTOR_ITEMS_NUM 6
 
 // Variables:

diff --git a/keycluster/src/slave_protocol_handler.c b/keycluster/src/slave_protocol_handler.c
@@ -91,9 +91,9 @@ void SlaveTxHandler(void)
             break;
         }
         case SlaveCommand_RequestKeyStates: {
-            #if KEY_ARRAY_TYPE == 1
+            #if KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_VECTOR
                 BoolBytesToBits(keyVector.keyStates, TxMessage.data, MODULE_KEY_COUNT);
-            #elif KEY_ARRAY_TYPE == 2
+            #elif KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_MATRIX
                 BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, MODULE_KEY_COUNT);
             #endif
             uint8_t messageLength = BOOL_BYTES_TO_BITS_COUNT(MODULE_KEY_COUNT);

diff --git a/left/src/module.h b/left/src/module.h
@@ -3,6 +3,7 @@
 
 // Includes:
 
+    #include "module/module.h"
     #include "key_matrix.h"
     #include "slave_protocol_handler.h"
 
@@ -21,7 +22,7 @@
     #define TEST_LED_CLOCK kCLOCK_PortB
     #define TEST_LED_PIN   13
 
-    #define KEY_ARRAY_TYPE 2
+    #define KEY_ARRAY_TYPE KEY_ARRAY_TYPE_MATRIX
     #define KEYBOARD_MATRIX_COLS_NUM 7
     #define KEYBOARD_MATRIX_ROWS_NUM 5
 

diff --git a/left/src/slave_protocol_handler.c b/left/src/slave_protocol_handler.c
@@ -91,9 +91,9 @@ void SlaveTxHandler(void)
             break;
         }
         case SlaveCommand_RequestKeyStates: {
-            #if KEY_ARRAY_TYPE == 1
+            #if KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_VECTOR
                 BoolBytesToBits(keyVector.keyStates, TxMessage.data, MODULE_KEY_COUNT);
-            #elif KEY_ARRAY_TYPE == 2
+            #elif KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_MATRIX
                 BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, MODULE_KEY_COUNT);
             #endif
             uint8_t messageLength = BOOL_BYTES_TO_BITS_COUNT(MODULE_KEY_COUNT);

diff --git a/shared/module/module.h b/shared/module/module.h
@@ -0,0 +1,10 @@
+#ifndef __SHARED_MODULE_H__
+#define __SHARED_MODULE_H__
+
+// Macros:
+
+    #define KEY_ARRAY_TYPE_NONE 0
+    #define KEY_ARRAY_TYPE_VECTOR 1
+    #define KEY_ARRAY_TYPE_MATRIX 2
+
+#endif
diff --git a/trackball/src/module.h b/trackball/src/module.h
@@ -3,6 +3,7 @@
 
 // Includes:
 
+    #include "module/module.h"
     #include "key_vector.h"
     #include "slave_protocol_handler.h"
 
@@ -21,7 +22,7 @@
     #define TEST_LED_CLOCK kCLOCK_PortB
     #define TEST_LED_PIN   2
 
-    #define KEY_ARRAY_TYPE 1
+    #define KEY_ARRAY_TYPE KEY_ARRAY_TYPE_VECTOR
     #define KEYBOARD_VECTOR_ITEMS_NUM 2
 
 // Variables:

diff --git a/trackball/src/slave_protocol_handler.c b/trackball/src/slave_protocol_handler.c
@@ -91,9 +91,9 @@ void SlaveTxHandler(void)
             break;
         }
         case SlaveCommand_RequestKeyStates: {
-            #if KEY_ARRAY_TYPE == 1
+            #if KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_VECTOR
                 BoolBytesToBits(keyVector.keyStates, TxMessage.data, MODULE_KEY_COUNT);
-            #elif KEY_ARRAY_TYPE == 2
+            #elif KEY_ARRAY_TYPE == KEY_ARRAY_TYPE_MATRIX
                 BoolBytesToBits(keyMatrix.keyStates, TxMessage.data, MODULE_KEY_COUNT);
             #endif
             uint8_t messageLength = BOOL_BYTES_TO_BITS_COUNT(MODULE_KEY_COUNT);