ezri/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lotus: Read serial number from flash

Browse Source 
Signed-off-by: Daniel Schaefer <dhs@frame.work>
This commit is contained in:
Daniel Schaefer
2023-01-16 17:56:52 +08:00
parent 3f5388f97f
commit 84e018fecf
5 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tmk_core/protocol/usb_descriptor.c
View File

@@ -41,6 +41,8 @@
#include "usb_descriptor.h"
#include "usb_descriptor_common.h"
#include "lotus.h"
#ifdef JOYSTICK_ENABLE
# include "joystick.h"
#endif
@@ -1077,13 +1079,14 @@ const USB_Descriptor_String_t PROGMEM ProductString = {
};
#if defined(SERIAL_NUMBER)
const USB_Descriptor_String_t PROGMEM SerialNumberString = {
.Header = {
.Size = sizeof(USBSTR(SERIAL_NUMBER)),
.Type = DTYPE_String
},
.UnicodeString = USBSTR(SERIAL_NUMBER)
};
extern const USB_Descriptor_String_t PROGMEM SerialNumberString;
//const USB_Descriptor_String_t PROGMEM SerialNumberString = {
// .Header = {
// .Size = sizeof(USBSTR(SERIAL_NUMBER)),
// .Type = DTYPE_String
// },
// .UnicodeString = USBSTR(SERIAL_NUMBER)
//};
#endif
// clang-format on
@@ -1131,8 +1134,10 @@ uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const
break;
#if defined(SERIAL_NUMBER)
case 0x03:
Address = &SerialNumberString;
Size = pgm_read_byte(&SerialNumberString.Header.Size);
//Address = &SerialNumberString;
//Size = pgm_read_byte(&SerialNumberString.Header.Size);
Address = lotus_serial_number_string();//&SerialNumberString;
Size = lotus_serial_number_string_len();//pgm_read_byte(&SerialNumberString.Header.Size);
break;
#endif

3
tmk_core/protocol/vusb/vusb.c
View File

@@ -735,8 +735,9 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
.bString = USBSTR(PRODUCT)
};
// THIS IS NOT USED by Lotus
#if defined(SERIAL_NUMBER)
const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial =
.header = {
.bLength = sizeof(USBSTR(SERIAL_NUMBER)),
.bDescriptorType = USBDESCR_STRING