minor stuff

firmware/modularkbd/Core/Src/main.c

@@ -187,6 +187,7 @@ int main(void)
   HAL_UART_Receive_DMA(&huart2, (uint8_t*)&RX2Msg, sizeof(UARTMessage));
   HAL_UART_Receive_DMA(&huart4, (uint8_t*)&RX4Msg, sizeof(UARTMessage));
   HAL_UART_Receive_DMA(&huart5, (uint8_t*)&RX5Msg, sizeof(UARTMessage));
+  HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -368,6 +369,11 @@ void handleUARTMessages(uint8_t *data, UART_HandleTypeDef *sender) {
 
         case 0xEE:
         	//TODO: Append message to the thingy
+        	if(MODE!=MODE_INACTIVE){
+        		 for (int i = 0; i < sizeof(REPORT.KEYPRESS); i++) {
+        			 REPORT.KEYPRESS[i] |= msg.KEYPRESS[i]; // bitwise merge keys
+        		 }
+        	}
         	break;
 
         default:

firmware/modularkbd/Debug/Core/Src/main.cyclo

@@ -1,9 +1,9 @@
 ../Core/Src/main.c:149:5:main	6
-../Core/Src/main.c:252:6:SystemClock_Config	3
+../Core/Src/main.c:253:6:SystemClock_Config	3
-../Core/Src/main.c:296:6:HAL_UART_RxCpltCallback	5
+../Core/Src/main.c:297:6:HAL_UART_RxCpltCallback	5
-../Core/Src/main.c:316:6:findBestParent	4
+../Core/Src/main.c:317:6:findBestParent	4
-../Core/Src/main.c:337:6:handleUARTMessages	10
+../Core/Src/main.c:338:6:handleUARTMessages	12
-../Core/Src/main.c:380:6:addUSBReport	3
+../Core/Src/main.c:386:6:addUSBReport	3
-../Core/Src/main.c:388:6:matrixScan	4
+../Core/Src/main.c:394:6:matrixScan	4
-../Core/Src/main.c:401:6:resetReport	1
+../Core/Src/main.c:407:6:resetReport	1
-../Core/Src/main.c:412:6:Error_Handler	1
+../Core/Src/main.c:418:6:Error_Handler	1

firmware/modularkbd/Debug/Core/Src/main.su

@@ -1,9 +1,9 @@
 ../Core/Src/main.c:149:5:main	40	static
-../Core/Src/main.c:252:6:SystemClock_Config	88	static
+../Core/Src/main.c:253:6:SystemClock_Config	88	static
-../Core/Src/main.c:296:6:HAL_UART_RxCpltCallback	16	static
+../Core/Src/main.c:297:6:HAL_UART_RxCpltCallback	16	static
-../Core/Src/main.c:316:6:findBestParent	24	static
+../Core/Src/main.c:317:6:findBestParent	24	static
-../Core/Src/main.c:337:6:handleUARTMessages	48	static
+../Core/Src/main.c:338:6:handleUARTMessages	56	static
-../Core/Src/main.c:380:6:addUSBReport	24	static
+../Core/Src/main.c:386:6:addUSBReport	24	static
-../Core/Src/main.c:388:6:matrixScan	16	static
+../Core/Src/main.c:394:6:matrixScan	16	static
-../Core/Src/main.c:401:6:resetReport	8	static
+../Core/Src/main.c:407:6:resetReport	8	static
-../Core/Src/main.c:412:6:Error_Handler	4	static,ignoring_inline_asm
+../Core/Src/main.c:418:6:Error_Handler	4	static,ignoring_inline_asm