code quality improvements and performance optimization

Author: lingex

Inc/matrix_led.h

@@ -26,11 +26,12 @@ extern "C"
 #define SPI_TIMEOUT_PA 		1
 
 #define MAX_EFFECT_TASK		16
-#define MAX_EFFECT_STEP		20
+#define MAX_EFFECT_STEP		30
 #define MAX_EFFECT_INTERVAL	60
 #define EFFECT_STEP_VAL		((EFFECT_VAL_HI - brightness)/MAX_EFFECT_STEP)
 #define EFFECT_VAL_HI		0xfe
 #define EFFECT_VAL_LO		0x0a
+#define MAX_MATRIX_TASK		MAX_EFFECT_TASK + 2
 
 
 #define ST524_ADDR_SWCTL 0x00
@@ -194,6 +195,13 @@ typedef struct
 	uint8_t dotIndex;
 }WaveEffectTypeDef;
 
+typedef struct
+{
+	uint8_t x;
+	uint8_t y;
+	uint8_t keyVal;
+}MatrixTaskTypeDef;
+
 	enum BRIGHTNESS_VALS
 	{
 		BL_VAL_0 = 0,
@@ -243,6 +251,10 @@ typedef struct
 
 	void MatrixEffectNextMove(WaveEffectTypeDef* pEffect, uint32_t timeTick);
 
+	bool MatrixTaskPush(uint8_t x, uint8_t y, uint8_t keyVal);
+
+	void MatrixTaskTimer(uint32_t timeTick);
+
 	void SpiTransmit(uint8_t* pData, uint16_t len);
 
 #ifdef __cplusplus

Src/keyboard.c

@@ -24,34 +24,29 @@ void KeyCheck(void)
 	{
 		KeyColPrepare(x);
 		portVal = ~ReadGpioPort(ROW_GPIO_Port);
-		//if (portVal > 0)
+		for (uint8_t y = 0; y < MAX_ROW; y++)
 		{
-			for (uint8_t y = 0; y < MAX_ROW; y++)
+			checkingRow = 0x8000 >> y;
+			debounce = &(debounceCount[x][y]);
+			keyVal = KEYBOARD_Value_Map[x][y];
+			if (checkingRow & portVal)
 			{
-				checkingRow = 0x8000 >> y;
-				debounce = &(debounceCount[x][y]);
-				keyVal = KEYBOARD_Value_Map[x][y];
-				if (checkingRow & portVal)
+				if (*debounce < 100)
 				{
-					if (*debounce < 100)
-					{
-						(*debounce)++;
-					}
-					if (*debounce == DEBOUNCE_MS) //debounce
-					{
-						//MatrixOnKeyPressed(x, y, keyVal);
-						OnKeyDown(x, y, keyVal);
-					}
+					(*debounce)++;
 				}
-				else
+				if (*debounce == DEBOUNCE_MS) //debounce
 				{
-					if (keyVal > 0 && *debounce >= DEBOUNCE_MS)
-					{
-						OnKeyUp(x, y, keyVal);
-					}
-
-					*debounce = 0;
+					OnKeyDown(x, y, keyVal);
+				}
+			}
+			else
+			{
+				if (keyVal > 0 && *debounce >= DEBOUNCE_MS)
+				{
+					OnKeyUp(x, y, keyVal);
 				}
+				*debounce = 0;
 			}
 		}
 	}
@@ -142,7 +137,6 @@ void OnKeyDown(uint8_t x, uint8_t y, uint8_t keyVal)
 		}
 		else
 		{
-			//MatrixBrightnessChange();
 			brightnessChange = 1;
 		}
 	}
@@ -188,7 +182,7 @@ void OnKeyDown(uint8_t x, uint8_t y, uint8_t keyVal)
 			if (keyFnDown)
 			{
 				InsertEnableSw();
-				MatrixOnKeyPressed(x, y, KC_INSERT_SW);
+				MatrixTaskPush(x, y, KC_INSERT_SW);
 				break;
 			}
 			else if (insertEnable < 1 && kbReport.modify == 0)
@@ -241,7 +235,7 @@ void OnKeyDown(uint8_t x, uint8_t y, uint8_t keyVal)
 	}
 	break;
 	}
-	MatrixOnKeyPressed(x, y, keyVal);
+	MatrixTaskPush(x, y, keyVal);
 	//sprintf(debugBuff, "x=%u,y=%u,val=%x\n", x, y, keyVal);
 	//HAL_UART_Transmit(&huart1, (uint8_t *)debugBuff, 64, 100);
 }

Src/main.c

@@ -233,8 +233,10 @@ int main(void)
 	zt_bind(EncoderCheck, 10, 1);
 	zt_bind(KeyCheck, 1, 1);
 
+  zt_bind(MatrixTaskTimer, 1, 1);
+
 	//zt_bind(MatrixTimer, 10, 1);
-	zt_bind(MatrixTimer, 1, 1);
+	zt_bind(MatrixTimer, 2, 1);
 
 	kbReport.id = 1;		//report id
 	nkroReport.id = NKRO_REPORT_ID;		//report id

Src/matrix_led.c

@@ -6,6 +6,9 @@
 static uint8_t gCmdBuff[255] = {0};
 static uint8_t* matrixBuff = &gCmdBuff[2]; //led buff
 
+static MatrixTaskTypeDef matrixTask[MAX_MATRIX_TASK] = {0};
+
+
 /*
 	about the STLED524 led driver
 
@@ -323,6 +326,41 @@ void MatrixEffectNextMove(WaveEffectTypeDef* pEffect, uint32_t timeTick)
 	}
 }
 
+bool MatrixTaskPush(uint8_t x, uint8_t y, uint8_t keyVal)
+{
+	MatrixTaskTypeDef* pTask = NULL;
+
+	for (uint8_t i = 0; i < MAX_MATRIX_TASK; i++)
+	{
+		pTask = &matrixTask[i];
+		if (pTask->keyVal == 0)	//first free task
+		{
+			pTask->x = x;
+			pTask->y = y;
+			pTask->keyVal = keyVal;
+			return true;
+			break;
+		}
+	}
+	return false;
+}
+
+void MatrixTaskTimer(uint32_t timeTick)
+{
+	static uint8_t taskIndex;
+	MatrixTaskTypeDef* pTask = &matrixTask[taskIndex];
+
+	if (pTask->keyVal > 0 && timeTick >= pTask->keyVal)
+	{
+		MatrixOnKeyPressed(pTask->x, pTask->y, pTask->keyVal);
+		pTask->keyVal = 0;	//free this task
+	}
+
+	if (++taskIndex >= MAX_MATRIX_TASK)
+	{
+		taskIndex = 0;
+	}
+}
 
 void SpiTransmit(uint8_t* pData, uint16_t len)
 {