Cosmetics
This commit is contained in:
@@ -94,7 +94,7 @@ ifeq ($(PCB), TARANIS)
|
|||||||
LDSCRIPT = ../stm32_ramboot.ld
|
LDSCRIPT = ../stm32_ramboot.ld
|
||||||
TRGT = arm-none-eabi-
|
TRGT = arm-none-eabi-
|
||||||
CPPDEFS += -DHSE_VALUE=12000000
|
CPPDEFS += -DHSE_VALUE=12000000
|
||||||
CPPDEFS += -DPCBTARANIS -DEEPROM_RLC
|
CPPDEFS += -DPCBTARANIS -DEEPROM_RLC -DUSB_MASS_STORAGE
|
||||||
FULL_PRJ = $(PROJECT)_ramBoot
|
FULL_PRJ = $(PROJECT)_ramBoot
|
||||||
ifeq ($(PCBREV), REV9E)
|
ifeq ($(PCBREV), REV9E)
|
||||||
CPPDEFS += -DSTM32F40_41xxx
|
CPPDEFS += -DSTM32F40_41xxx
|
||||||
|
|||||||
@@ -40,16 +40,20 @@
|
|||||||
|
|
||||||
int usbPlugged(void)
|
int usbPlugged(void)
|
||||||
{
|
{
|
||||||
//debounce
|
// debounce
|
||||||
static uint8_t debounced_state = 0;
|
static uint8_t debounced_state = 0;
|
||||||
static uint8_t last_state = 0;
|
static uint8_t last_state = 0;
|
||||||
|
|
||||||
if ( GPIO_ReadInputDataBit(USB_GPIO, USB_GPIO_PIN_VBUS) ) {
|
if (GPIO_ReadInputDataBit(USB_GPIO, USB_GPIO_PIN_VBUS)) {
|
||||||
if (last_state) debounced_state = 1;
|
if (last_state) {
|
||||||
|
debounced_state = 1;
|
||||||
|
}
|
||||||
last_state = 1;
|
last_state = 1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!last_state) debounced_state = 0;
|
if (!last_state) {
|
||||||
|
debounced_state = 0;
|
||||||
|
}
|
||||||
last_state = 0;
|
last_state = 0;
|
||||||
}
|
}
|
||||||
return debounced_state;
|
return debounced_state;
|
||||||
@@ -69,18 +73,13 @@ void usbInit(void)
|
|||||||
|
|
||||||
void usbStart(void)
|
void usbStart(void)
|
||||||
{
|
{
|
||||||
#if !defined(BOOT)
|
|
||||||
#if defined(USB_JOYSTICK)
|
#if defined(USB_JOYSTICK)
|
||||||
//intialize USB as HID device
|
// initialize USB as HID device
|
||||||
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_HID_cb, &USR_cb);
|
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_HID_cb, &USR_cb);
|
||||||
#elif defined(USB_MASS_STORAGE)
|
#elif defined(USB_MASS_STORAGE)
|
||||||
//intialize USB as MSC device
|
// initialize USB as MSC device
|
||||||
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
|
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
|
||||||
#endif
|
#endif
|
||||||
#else
|
|
||||||
//intialize USB as MSC device
|
|
||||||
USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_MSC_cb, &USR_cb);
|
|
||||||
#endif //!defined(BOOT)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(USB_JOYSTICK)
|
#if defined(USB_JOYSTICK)
|
||||||
@@ -89,4 +88,3 @@ void usbStop(void)
|
|||||||
USBD_DeInit(&USB_OTG_dev);
|
USBD_DeInit(&USB_OTG_dev);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -68,8 +68,7 @@
|
|||||||
#define USBD_PRODUCT_FS_STRING "FrSky Taranis Bootloader"
|
#define USBD_PRODUCT_FS_STRING "FrSky Taranis Bootloader"
|
||||||
#define USBD_CONFIGURATION_FS_STRING "MSC Config"
|
#define USBD_CONFIGURATION_FS_STRING "MSC Config"
|
||||||
#define USBD_INTERFACE_FS_STRING "MSC Interface"
|
#define USBD_INTERFACE_FS_STRING "MSC Interface"
|
||||||
#else
|
#elif defined(USB_JOYSTICK)
|
||||||
#if defined(USB_JOYSTICK)
|
|
||||||
#define USBD_PID 0x5710
|
#define USBD_PID 0x5710
|
||||||
#define USBD_PRODUCT_FS_STRING "FrSky Taranis Joystick"
|
#define USBD_PRODUCT_FS_STRING "FrSky Taranis Joystick"
|
||||||
#define USBD_CONFIGURATION_FS_STRING "HID Config"
|
#define USBD_CONFIGURATION_FS_STRING "HID Config"
|
||||||
@@ -80,7 +79,6 @@
|
|||||||
#define USBD_CONFIGURATION_FS_STRING "MSC Config"
|
#define USBD_CONFIGURATION_FS_STRING "MSC Config"
|
||||||
#define USBD_INTERFACE_FS_STRING "MSC Interface"
|
#define USBD_INTERFACE_FS_STRING "MSC Interface"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
const USBD_DEVICE USR_desc =
|
const USBD_DEVICE USR_desc =
|
||||||
{
|
{
|
||||||
@@ -95,26 +93,26 @@ const USBD_DEVICE USR_desc =
|
|||||||
|
|
||||||
/* USB Standard Device Descriptor */
|
/* USB Standard Device Descriptor */
|
||||||
__ALIGN_BEGIN const uint8_t USBD_DeviceDesc[USB_SIZ_DEVICE_DESC] __ALIGN_END =
|
__ALIGN_BEGIN const uint8_t USBD_DeviceDesc[USB_SIZ_DEVICE_DESC] __ALIGN_END =
|
||||||
{
|
{
|
||||||
0x12, /*bLength */
|
USB_SIZ_DEVICE_DESC, /*bLength */
|
||||||
USB_DEVICE_DESCRIPTOR_TYPE, /*bDescriptorType*/
|
USB_DEVICE_DESCRIPTOR_TYPE, /*bDescriptorType*/
|
||||||
0x00, /*bcdUSB */
|
0x00, /*bcdUSB */
|
||||||
0x02,
|
0x02,
|
||||||
0x00, /*bDeviceClass*/
|
0x00, /*bDeviceClass*/
|
||||||
0x00, /*bDeviceSubClass*/
|
0x00, /*bDeviceSubClass*/
|
||||||
0x00, /*bDeviceProtocol*/
|
0x00, /*bDeviceProtocol*/
|
||||||
USB_OTG_MAX_EP0_SIZE, /*bMaxPacketSize*/
|
USB_OTG_MAX_EP0_SIZE, /*bMaxPacketSize*/
|
||||||
LOBYTE(USBD_VID), /*idVendor*/
|
LOBYTE(USBD_VID), /*idVendor*/
|
||||||
HIBYTE(USBD_VID), /*idVendor*/
|
HIBYTE(USBD_VID), /*idVendor*/
|
||||||
LOBYTE(USBD_PID), /*idVendor*/
|
LOBYTE(USBD_PID), /*idVendor*/
|
||||||
HIBYTE(USBD_PID), /*idVendor*/
|
HIBYTE(USBD_PID), /*idVendor*/
|
||||||
0x00, /*bcdDevice rel. 2.00*/
|
0x00, /*bcdDevice rel. 2.00*/
|
||||||
0x02,
|
0x02,
|
||||||
USBD_IDX_MFC_STR, /*Index of manufacturer string*/
|
USBD_IDX_MFC_STR, /*Index of manufacturer string*/
|
||||||
USBD_IDX_PRODUCT_STR, /*Index of product string*/
|
USBD_IDX_PRODUCT_STR, /*Index of product string*/
|
||||||
USBD_IDX_SERIAL_STR, /*Index of serial number string*/
|
USBD_IDX_SERIAL_STR, /*Index of serial number string*/
|
||||||
USBD_CFG_MAX_NUM /*bNumConfigurations*/
|
USBD_CFG_MAX_NUM /*bNumConfigurations*/
|
||||||
} ; /* USB_DeviceDescriptor */
|
}; /* USB_DeviceDescriptor */
|
||||||
|
|
||||||
/* USB Standard Device Descriptor */
|
/* USB Standard Device Descriptor */
|
||||||
__ALIGN_BEGIN const uint8_t USBD_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
|
__ALIGN_BEGIN const uint8_t USBD_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
|
||||||
|
|||||||
Reference in New Issue
Block a user