shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fixes

Browse Source
This commit is contained in:
yparitcher 2019-02-12 19:22:35 -05:00
parent f2d0e3d275
commit f97d9ab34f
No known key found for this signature in database
GPG Key ID: FC78BE8055D48472
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/stm32l432/Makefile
View File

@ -79,7 +79,7 @@ solo.hex:
echo "You need to build the application first." echo "You need to build the application first."
cbor: cbor:
$(MAKE) -f application.mk -j8 cbor $(MAKE) -f $(APPMAKE) -j8 cbor
test: test:
$(MAKE) build-release-locked $(MAKE) build-release-locked

3
targets/stm32l432/lib/usbd/usbd_desc.c
View File

@ -50,11 +50,14 @@
#include APP_CONFIG #include APP_CONFIG
#define USBD_VID 0x0483
#define USBD_PID 0xA2CA
#define USBD_LANGID_STRING 0x409 #define USBD_LANGID_STRING 0x409
#define USBD_MANUFACTURER_STRING "SoloKeys" #define USBD_MANUFACTURER_STRING "SoloKeys"
#define USBD_PRODUCT_FS_STRING SOLO_PRODUCT_NAME #define USBD_PRODUCT_FS_STRING SOLO_PRODUCT_NAME
#define USBD_SERIAL_NUM "0123456789ABCDEF" #define USBD_SERIAL_NUM "0123456789ABCDEF"
uint8_t *USBD_HID_DeviceDescriptor(USBD_SpeedTypeDef speed, uint16_t *length); 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_LangIDStrDescriptor(USBD_SpeedTypeDef speed, uint16_t *length);
uint8_t *USBD_HID_ManufacturerStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *length); uint8_t *USBD_HID_ManufacturerStrDescriptor (USBD_SpeedTypeDef speed, uint16_t *length);

1
targets/stm32l432/src/flash.h
View File

@ -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(uint32_t addr, uint8_t * data, size_t sz);
void flash_write_fast(uint32_t addr, uint32_t * data); void flash_write_fast(uint32_t addr, uint32_t * data);
void flash_option_bytes_init(int boot_from_dfu); void flash_option_bytes_init(int boot_from_dfu);
void flash_lock();
#define FLASH_PAGE_SIZE 2048 #define FLASH_PAGE_SIZE 2048