From f97d9ab34fd67a0c8e85df0387072c22edc3eafc Mon Sep 17 00:00:00 2001 From: yparitcher Date: Tue, 12 Feb 2019 19:22:35 -0500 Subject: [PATCH] fixes --- targets/stm32l432/Makefile | 2 +- targets/stm32l432/lib/usbd/usbd_desc.c | 3 +++ targets/stm32l432/src/flash.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/targets/stm32l432/Makefile b/targets/stm32l432/Makefile index a074d6f..f2f7d10 100644 --- a/targets/stm32l432/Makefile +++ b/targets/stm32l432/Makefile @@ -79,7 +79,7 @@ solo.hex: echo "You need to build the application first." cbor: - $(MAKE) -f application.mk -j8 cbor + $(MAKE) -f $(APPMAKE) -j8 cbor test: $(MAKE) build-release-locked diff --git a/targets/stm32l432/lib/usbd/usbd_desc.c b/targets/stm32l432/lib/usbd/usbd_desc.c index 9a107a2..88b920d 100644 --- a/targets/stm32l432/lib/usbd/usbd_desc.c +++ b/targets/stm32l432/lib/usbd/usbd_desc.c @@ -50,11 +50,14 @@ #include APP_CONFIG +#define USBD_VID 0x0483 +#define USBD_PID 0xA2CA #define USBD_LANGID_STRING 0x409 #define USBD_MANUFACTURER_STRING "SoloKeys" #define USBD_PRODUCT_FS_STRING SOLO_PRODUCT_NAME #define USBD_SERIAL_NUM "0123456789ABCDEF" + uint8_t *USBD_HID_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length); uint8_t *USBD_HID_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length); uint8_t *USBD_HID_ManufacturerStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *length); diff --git a/targets/stm32l432/src/flash.h b/targets/stm32l432/src/flash.h index e5526df..5da975c 100644 --- a/targets/stm32l432/src/flash.h +++ b/targets/stm32l432/src/flash.h @@ -12,7 +12,6 @@ void flash_write_dword(uint32_t addr, uint64_t data); void flash_write(uint32_t addr, uint8_t * data, size_t sz); void flash_write_fast(uint32_t addr, uint32_t * data); void flash_option_bytes_init(int boot_from_dfu); -void flash_lock(); #define FLASH_PAGE_SIZE 2048