From 7578f74e8cca633d7c4d4635f7bb4f1cb8e43c80 Mon Sep 17 00:00:00 2001 From: gussy Date: Tue, 9 Feb 2010 07:45:25 +0000 Subject: [PATCH] Small fixes. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@181 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/PiOS/STM32F10x/pios_usb_hid.c | 9 ++++----- flight/PiOS/inc/pios_usb_hid.h | 4 +--- flight/PiOS/pios.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flight/PiOS/STM32F10x/pios_usb_hid.c b/flight/PiOS/STM32F10x/pios_usb_hid.c index adfb07285..943b6bbf7 100644 --- a/flight/PiOS/STM32F10x/pios_usb_hid.c +++ b/flight/PiOS/STM32F10x/pios_usb_hid.c @@ -199,22 +199,21 @@ static const uint8_t PIOS_USB_HID_ReportDescriptor[PIOS_USB_HID_SIZ_REPORT_DESC] 0x06, 0x9c, 0xff, /* Usage Page (Vendor Defined) */ 0x09, 0x01, /* Usage (Vendor Defined) */ 0xa1, 0x01, /* Collection (Vendor Defined) */ -#if 1 + 0x09, 0x02, /* Usage (Vendor Defined) */ 0x75, 0x08, /* Report Size (8) */ - 0x95, 8, /* Report Count (64) */ + 0x95, 64, /* Report Count (64) */ 0x15, 0x00, /* Logical Minimum (0) */ 0x25, 0xff, /* Logical Maximum (255) */ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ 0x09, 0x03, /* Usage (Vendor Defined) */ 0x75, 0x08, /* Report Size (8) */ - 0x95, 8, /* Report Count (64) */ + 0x95, 64, /* Report Count (64) */ 0x15, 0x00, /* Logical Minimum (0) */ 0x25, 0xff, /* Logical Maximum (255) */ 0x91, 0x02, /* Output (Data, Variable, Absolute) */ - 0x81, 0x02, /* Input (Data, Variable, Absolute) */ -#endif + 0xc0 /* End Collection */ }; static ONE_DESCRIPTOR PIOS_USB_HID_Report_Descriptor = {(uint8_t *) PIOS_USB_HID_ReportDescriptor, PIOS_USB_HID_SIZ_REPORT_DESC}; diff --git a/flight/PiOS/inc/pios_usb_hid.h b/flight/PiOS/inc/pios_usb_hid.h index eff6c9a36..cda68d454 100644 --- a/flight/PiOS/inc/pios_usb_hid.h +++ b/flight/PiOS/inc/pios_usb_hid.h @@ -31,9 +31,7 @@ //#define PIOS_USB_HID_SIZ_REPORT_DESC 26 //#define PIOS_USB_HID_SIZ_REPORT_DESC 67 //#define PIOS_USB_HID_SIZ_REPORT_DESC 122 -#define PIOS_USB_HID_SIZ_REPORT_DESC 34 -//#define PIOS_USB_HID_SIZ_REPORT_DESC 23 -//#define PIOS_USB_HID_SIZ_REPORT_DESC 28 +#define PIOS_USB_HID_SIZ_REPORT_DESC 32 #define PIOS_USB_HID_REPORT_DESCRIPTOR 0x22 #define PIOS_USB_HID_HID_DESCRIPTOR_TYPE 0x21 diff --git a/flight/PiOS/pios.c b/flight/PiOS/pios.c index c4de7d9fa..4e83b420a 100644 --- a/flight/PiOS/pios.c +++ b/flight/PiOS/pios.c @@ -176,7 +176,7 @@ static void TaskHIDTest(void *pvParameters) for(;;) { - Send_Buffer[0] = 0x01; + Send_Buffer[0] = 'H'; Send_Buffer[1] = 'e'; Send_Buffer[2] = 'l'; Send_Buffer[3] = 'l';