Fix issue #478 (2/2)

fpistm · fpistm · commit 16b8a83fc798 · 2019-03-26T07:32:48.000+01:00
Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cores/arduino/stm32/usb/cdc/usbd_cdc_if.c b/cores/arduino/stm32/usb/cdc/usbd_cdc_if.c
@@ -263,10 +263,10 @@ void CDC_deInit(void)
 
 bool CDC_connected()
 {
-  // Save the transmitStart value in a local variable - fix #478
+  /* Save the transmitStart value in a local variable to avoid twice reading - fix #478 */
   uint32_t transmitTime = transmitStart;
   if (transmitTime) {
-    transmitTime = HAL_GetTick() - transmitStart;
+    transmitTime = HAL_GetTick() - transmitTime;
   }
   return hUSBD_Device_CDC.dev_state == USBD_STATE_CONFIGURED
          && transmitTime < USB_CDC_TRANSMIT_TIMEOUT

Original file line number	Diff line number	Diff line change
`@@ -263,10 +263,10 @@ void CDC_deInit(void)`
`263`	`263`
`264`	`264`	`bool CDC_connected()`
`265`	`265`	`{`
`266`		`- // Save the transmitStart value in a local variable - fix #478`
	`266`	`+ /* Save the transmitStart value in a local variable to avoid twice reading - fix #478 */`
`267`	`267`	`uint32_t transmitTime = transmitStart;`
`268`	`268`	`if (transmitTime) {`
`269`		`- transmitTime = HAL_GetTick() - transmitStart;`
	`269`	`+ transmitTime = HAL_GetTick() - transmitTime;`
`270`	`270`	`}`
`271`	`271`	`return hUSBD_Device_CDC.dev_state == USBD_STATE_CONFIGURED`
`272`	`272`	`&& transmitTime < USB_CDC_TRANSMIT_TIMEOUT`