hueso/badgemagic-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

automatically embedding version numbers (#53)

Browse Source
This commit is contained in:
Dien-Nhung Nguyen
2024-10-21 20:06:13 +07:00
committed by GitHub
parent 321677cf9b
commit 9cda33787c
5 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ble/profile/devinfo.c
View File

@@ -5,17 +5,25 @@
static const uint8_t systemId_val[] = {0, 0, 0, 0, 0, 0, 0, 0};
static const uint16_t systemId_UUID = SYSTEM_ID_UUID;
static const uint8_t modelNumber_val[] = "B1144";
#ifdef USBC_VERSION
#define USBC_VER_PREFIX "(C) "
#define USBC_VER_SUFIX "-C"
#else
#define USBC_VER_PREFIX ""
#define USBC_VER_SUFIX ""
#endif
static const uint8_t modelNumber_val[] = "BM1144" USBC_VER_SUFIX;
static const uint16_t modelNumber_UUID = MODEL_NUMBER_UUID;
const uint16_t serialNumber_UUID = SERIAL_NUMBER_UUID;
static const uint8_t serialNumber_val[] = "N/A";
const uint16_t firmwareRev_UUID = FIRMWARE_REV_UUID;
static const uint8_t firmwareRev_val[] = "v0.0.1";
static const uint8_t firmwareRev_val[] = USBC_VER_PREFIX VERSION;
const uint16_t hardwareRev_UUID = HARDWARE_REV_UUID;
static const uint8_t hardwareRev_val[] = "221028";
static const uint8_t hardwareRev_val[] = "20240908";
const uint16_t softwareRev_UUID = SOFTWARE_REV_UUID;
static const uint8_t softwareRev_val[] = "N/A";

2
src/main.c
View File

@@ -425,7 +425,7 @@ static void disp_charging()
if (is_charging()) {
disp_bat_stt(blink ? percent : 0, 2, 2);
if (ani_xbm_next_frame(&fabm_xbm, fb, 16, 0) == 0) {
fb_puts("v0.1", 4, 16, 2); // TODO: get version from git tag
fb_puts(VERSION_ABBR, sizeof(VERSION_ABBR), 16, 2);
fb_putchar(' ', 40, 2);
}
blink = !blink;

26
src/usb/dev.c
View File

@@ -53,16 +53,30 @@ static uint16_t product_info[] = {
'M', 'a', 'g', 'i', 'c'
};
// TODO: auto update firmware version by CI here
static uint16_t serial_number[] = {
47 * 2 | /* bLength */
#ifdef USBC_VERSION
4 +
#endif
(12 + sizeof(VERSION_ABBR) - 1) * 2 | /* bLength */
0x03 << 8, /* bDescriptorType */
/* bString */
'N', 'o', 't', ' ', 'y', 'e', 't', ' ',
'i', 'm', 'p', 'l', 'e', 'm', 'e', 'n', 't', 'e', 'd', '\n',
'P', 'R', 'E', 'S', 'S', ' ', 'A', 'L', 'T', '+', 'F', '4', ' ',
'T', 'O', ' ', 'C', 'O', 'N', 'T', 'I', 'N', 'U', 'E', '.'
'B', 'M', '1', '1', '4', '4',
#ifdef USBC_VERSION
'-', 'C',
#endif
' ',
'f', 'w', ':',' ',
/* vX.Y */
VERSION[0],
VERSION[1],
VERSION[2],
VERSION[3],
VERSION[4],
VERSION[5],
VERSION[6],
VERSION[7],
VERSION[8]
};
static void desc_dev(USB_SETUP_REQ *request)