Disable uart interrupt in uart_debug_write

benwaffle · fpistm · commit a04106f347c6 · 2019-04-17T18:54:43.000+02:00
Re-enable Serial Rx
diff --git a/cores/arduino/stm32/uart.c b/cores/arduino/stm32/uart.c
@@ -605,12 +605,21 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)
     }
   }
 
+  HAL_NVIC_DisableIRQ(serial_debug.irq);
+
   while (HAL_UART_Transmit(uart_handlers[serial_debug.index], data, size, TX_TIMEOUT) != HAL_OK) {
     if ((HAL_GetTick() - tickstart) >=  TX_TIMEOUT) {
-      return 0;
+      size = 0;
+      break;
     }
   }
 
+  serial_t *obj = rx_callback_obj[serial_debug.index];
+  if (obj && !serial_rx_active(obj)) {
+    HAL_UART_Receive_IT(uart_handlers[obj->index], &(obj->recv), 1);
+  }
+  HAL_NVIC_EnableIRQ(serial_debug.irq);
+
   return size;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -605,12 +605,21 @@ size_t uart_debug_write(uint8_t *data, uint32_t size)`
`605`	`605`	`}`
`606`	`606`	`}`
`607`	`607`
	`608`	`+ HAL_NVIC_DisableIRQ(serial_debug.irq);`
	`609`	`+`
`608`	`610`	`while (HAL_UART_Transmit(uart_handlers[serial_debug.index], data, size, TX_TIMEOUT) != HAL_OK) {`
`609`	`611`	`if ((HAL_GetTick() - tickstart) >= TX_TIMEOUT) {`
`610`		`- return 0;`
	`612`	`+ size = 0;`
	`613`	`+ break;`
`611`	`614`	`}`
`612`	`615`	`}`
`613`	`616`
	`617`	`+ serial_t *obj = rx_callback_obj[serial_debug.index];`
	`618`	`+ if (obj && !serial_rx_active(obj)) {`
	`619`	`+ HAL_UART_Receive_IT(uart_handlers[obj->index], &(obj->recv), 1);`
	`620`	`+ }`
	`621`	`+ HAL_NVIC_EnableIRQ(serial_debug.irq);`
	`622`	`+`
`614`	`623`	`return size;`
`615`	`624`	`}`
`616`	`625`