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

change product name, include version string

Browse Source
This commit is contained in:
Conor Patrick 2019-02-12 13:59:16 -05:00
parent a6446e67bc
commit d23bf0a144
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
targets/stm32l432/bootloader/bootloader.h
View File

@ -1,21 +1,21 @@
/* /*
* Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/> * Copyright (C) 2018 SoloKeys, Inc. <https://solokeys.com/>
* *
* This file is part of Solo. * This file is part of Solo.
* *
* Solo is free software: you can redistribute it and/or modify * Solo is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Solo is distributed in the hope that it will be useful, * Solo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Solo. If not, see <https://www.gnu.org/licenses/> * along with Solo. If not, see <https://www.gnu.org/licenses/>
* *
* This code is available under licenses for commercial use. * This code is available under licenses for commercial use.
* Please contact SoloKeys for more information. * Please contact SoloKeys for more information.
*/ */
@ -65,6 +65,13 @@
#define SKIP_BUTTON_CHECK_WITH_DELAY 0 #define SKIP_BUTTON_CHECK_WITH_DELAY 0
#define SKIP_BUTTON_CHECK_FAST 1 #define SKIP_BUTTON_CHECK_FAST 1
#define BOOT_VERSION_MAJ 1
#define BOOT_VERSION_MIN 0
#define __STR_HELPER(x) #x
#define __STR(x) __STR_HELPER(x)
#define SOLO_PRODUCT_NAME "Solo Bootloader " __STR(BOOT_VERSION_MAJ) "." __STR(BOOT_VERSION_MIN)
void printing_init(); void printing_init();
void hw_init(void); void hw_init(void);

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

@ -53,19 +53,10 @@
#define USBD_VID 0x0483 #define USBD_VID 0x0483
#define USBD_PID 0xA2CA #define USBD_PID 0xA2CA
#define USBD_LANGID_STRING 0x409 #define USBD_LANGID_STRING 0x409
#ifndef SOLO_HACKER #define USBD_MANUFACTURER_STRING "SoloKeys"
#define USBD_MANUFACTURER_STRING "Solo Keys" #define USBD_PRODUCT_FS_STRING SOLO_PRODUCT_NAME
#define USBD_PRODUCT_FS_STRING "Solo"
#ifndef USBD_SERIAL_NUM
#define USBD_SERIAL_NUM "0123456789ABCDEF" #define USBD_SERIAL_NUM "0123456789ABCDEF"
#endif
#else
#define USBD_MANUFACTURER_STRING "Solo Keys"
#define USBD_PRODUCT_FS_STRING "Solo HACKER (Unlocked)"
#ifndef USBD_SERIAL_NUM
#define USBD_SERIAL_NUM "0123456789ABCDEF"
#endif
#endif
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);

10
targets/stm32l432/src/app.h
View File

@ -43,6 +43,16 @@
// #define DISABLE_CTAPHID_PING // #define DISABLE_CTAPHID_PING
// #define DISABLE_CTAPHID_WINK // #define DISABLE_CTAPHID_WINK
// #define DISABLE_CTAPHID_CBOR // #define DISABLE_CTAPHID_CBOR
#define SOLO_VERSION_MAJ 1
#define SOLO_VERSION_MIN 0
#define __STR_HELPER(x) #x
#define __STR(x) __STR_HELPER(x)
#if defined(SOLO_HACKER)
#define SOLO_PRODUCT_NAME "Solo Hacker " __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN)
#else
#define SOLO_PRODUCT_NAME "Solo " __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN)
#endif
void printing_init(); void printing_init();
void hw_init(void); void hw_init(void);