Merge with latest 2.3

radio/src/targets/common/arm/stm32/heartbeat_driver.cpp

@@ -20,9 +20,9 @@
 
 #include "opentx.h"
 
+#if defined(INTMODULE_HEARTBEAT_GPIO)
 volatile HeartbeatCapture heartbeatCapture;
 
-#if defined(INTMODULE_HEARTBEAT_GPIO)
 void init_intmodule_heartbeat()
 {
   GPIO_InitTypeDef GPIO_InitStructure;
@@ -69,11 +69,13 @@ void check_intmodule_heartbeat()
 {
   if (EXTI_GetITStatus(INTMODULE_HEARTBEAT_EXTI_LINE) != RESET) {
 #if defined(INTMODULE_USART)
-    heartbeatCapture.timestamp = RTOS_GET_MS();
+    nextMixerTime[INTERNAL_MODULE] = RTOS_GET_MS();
 #else
     heartbeatCapture.timestamp = getTmr2MHz();
 #endif
+#if defined(DEBUG_LATENCY)
     heartbeatCapture.count++;
+#endif
     EXTI_ClearITPendingBit(INTMODULE_HEARTBEAT_EXTI_LINE);
   }
 }