Projectkk2glider/issue 4479 slow joystick (#4569)

* Missing debug timer * USB driver cleanup * Re #4479: Joystick update called from mixer thread every 10ms * Cosmetics * Compilation fix * Cosmetics * Another compilation fix
2025-07-20 14:55:13 +03:00 · 2017-03-07 22:59:32 +01:00 · 2017-03-07 22:59:32 +01:00 · 03b65b06b6
commit 03b65b06b6
parent 15a373c1cd
12 changed files with 136 additions and 161 deletions
--- a/radio/src/targets/common/arm/stm32/usb_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/usb_driver.cpp
@ -0,0 +1,139 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+#include "usb_dcd_int.h"
+#include "usb_bsp.h"
+#if defined(__cplusplus)
+}
+#endif
+
+#include "opentx.h"
+#include "debug.h"
+
+static bool usbDriverStarted = false;
+
+int usbPlugged()
+{
+  // debounce
+  static uint8_t debounced_state = 0;
+  static uint8_t last_state = 0;
+
+  if (GPIO_ReadInputDataBit(USB_GPIO, USB_GPIO_PIN_VBUS)) {
+    if (last_state) {
+      debounced_state = 1;
+    }
+    last_state = 1;
+  }
+  else {
+    if (!last_state) {
+      debounced_state = 0;
+    }
+    last_state = 0;
+  }
+  return debounced_state;
+}
+
+USB_OTG_CORE_HANDLE USB_OTG_dev;
+
+extern "C" void OTG_FS_IRQHandler()
+{
+  DEBUG_INTERRUPT(INT_OTG_FS);
+  USBD_OTG_ISR_Handler(&USB_OTG_dev);
+}
+
+void usbInit()
+{
+  // Initialize hardware
+  USB_OTG_BSP_Init(&USB_OTG_dev);
+  usbDriverStarted = false;
+}
+
+void usbStart()
+{
+#if defined(USB_JOYSTICK)
+  // initialize USB as HID device
+  USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_HID_cb, &USR_cb);
+#elif defined(USB_SERIAL)
+  // initialize USB as CDC device (virtual serial port)
+  USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_CDC_cb, &USR_cb);
+#elif defined(USB_MASS_STORAGE)
+  // initialize USB as MSC device
+  USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
+#endif
+  usbDriverStarted = true;
+}
+
+void usbStop()
+{
+  usbDriverStarted = false;
+  USBD_DeInit(&USB_OTG_dev);
+}
+
+uint8_t usbStarted()
+{
+  return usbDriverStarted;
+}
+
+#if defined(USB_JOYSTICK)
+/*
+  Prepare and send new USB data packet
+
+  The format of HID_Buffer is defined by
+  USB endpoint description can be found in
+  file usb_hid_joystick.c, variable HID_JOYSTICK_ReportDesc
+*/
+void usbJoystickUpdate()
+{
+  static uint8_t HID_Buffer[HID_IN_PACKET];
+
+  // test to se if TX buffer is free
+  if (USBD_HID_SendReport(&USB_OTG_dev, 0, 0) == USBD_OK) {
+    //buttons
+    HID_Buffer[0] = 0;
+    HID_Buffer[1] = 0;
+    HID_Buffer[2] = 0;
+    for (int i = 0; i < 8; ++i) {
+      if ( channelOutputs[i+8] > 0 ) {
+        HID_Buffer[0] |= (1 << i);
+      }
+      if ( channelOutputs[i+16] > 0 ) {
+        HID_Buffer[1] |= (1 << i);
+      }
+      if ( channelOutputs[i+24] > 0 ) {
+        HID_Buffer[2] |= (1 << i);
+      }
+    }
+
+    //analog values
+    //uint8_t * p = HID_Buffer + 1;
+    for (int i = 0; i < 8; ++i) {
+      int16_t value = channelOutputs[i] / 8;
+      if ( value > 127 ) value = 127;
+      else if ( value < -127 ) value = -127;
+      HID_Buffer[i+3] = static_cast<int8_t>(value);
+    }
+    USBD_HID_SendReport(&USB_OTG_dev, HID_Buffer, HID_IN_PACKET);
+  }
+}
+
+#endif // #defined(USB_JOYSTICK)