limit retries

Author: sfoster1

stm32-modules/heater-shaker/firmware/host_comms_task/freertos_comms_task.cpp

@@ -158,10 +158,14 @@ void run(void *param) {  // NOLINT(misc-unused-parameters)
                 vTaskDelay(1);
                 tx_result = USBD_CDC_TransmitPacket(&_local_task.usb_handle);
             }
-
-            while (((USBD_CDC_HandleTypeDef *)_local_task.usb_handle.pClassData)
-                       ->TxState == 1) {
-                vTaskDelay(1);
+            if (tx_result != USBD_FAIL) {
+                uint8_t retries = 0;
+                while ((((USBD_CDC_HandleTypeDef *)
+                             _local_task.usb_handle.pClassData)
+                            ->TxState == 1) &&
+                       retries++ < 10) {
+                    vTaskDelay(1);
+                }
             }
             if (UartReady) {
                 UartReady = false;

stm32-modules/include/thermocycler-gen2/thermocycler-gen2/gcodes.hpp

@@ -162,7 +162,7 @@ struct GetResetReason {
         int res = 0;
         // print a hexadecimal representation of the reset flags
         res = snprintf(&*buf, (limit - buf),
-                       "M114 Last Reset Reason: %X h OK\n", reason);
+                       "M114 Last Reset Reason: %X OK\n", reason);
         if (res <= 0) {
             return buf;
         }

stm32-modules/thermocycler-gen2/firmware/host_comms_task/usb_hardware.c

@@ -220,8 +220,12 @@ void usb_hw_send(uint8_t *buf, uint16_t len) {
         vTaskDelay(1);
         tx_result = USBD_CDC_TransmitPacket(&_local_config.usb_handle);
     }
+    if (tx_result == USBD_FAIL) {
+        return;
+    }
+    uint8_t retries = 0;
 
-    while (((USBD_CDC_HandleTypeDef*)_local_config.usb_handle.pClassData)->TxState == 1) {
+    while ((((USBD_CDC_HandleTypeDef*)_local_config.usb_handle.pClassData)->TxState == 1) && retries++ < 10) {
         vTaskDelay(1);
     }
 }