liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1961] Cli: device_info format versioning. Detach target from firmware name. #765

Browse Source
This commit is contained in:
あく
2021-10-16 14:25:32 +03:00
committed by GitHub
parent 0e14545d48
commit 2255060d52
14 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/targets/f6/ble-glue/dev_info_service.c
View File

@@ -18,7 +18,7 @@ static DevInfoSvc* dev_info_svc = NULL;
static const char dev_info_man_name[] = "Flipper Devices Inc.";
static const char dev_info_serial_num[] = "1.0";
static const char dev_info_firmware_rev_num[] = TARGET;
static const char dev_info_firmware_rev_num[] = TOSTRING(TARGET);
static const char dev_info_software_rev_num[] = GIT_COMMIT " " GIT_BRANCH " " GIT_BRANCH_NUM " " BUILD_DATE;
void dev_info_svc_start() {

2
firmware/targets/f6/target.mk
View File

@@ -24,6 +24,8 @@ LDFLAGS += $(MCU_FLAGS) -specs=nosys.specs -specs=nano.specs
CPPFLAGS += -fno-rtti -fno-use-cxa-atexit -fno-exceptions
LDFLAGS += -Wl,--start-group -lstdc++ -lsupc++ -Wl,--end-group
HARDWARE_TARGET = 6
MXPROJECT_DIR = $(TARGET_DIR)
# Entry Point

2
firmware/targets/f7/ble-glue/dev_info_service.c
View File

@@ -18,7 +18,7 @@ static DevInfoSvc* dev_info_svc = NULL;
static const char dev_info_man_name[] = "Flipper Devices Inc.";
static const char dev_info_serial_num[] = "1.0";
static const char dev_info_firmware_rev_num[] = TARGET;
static const char dev_info_firmware_rev_num[] = TOSTRING(TARGET);
static const char dev_info_software_rev_num[] = GIT_COMMIT " " GIT_BRANCH " " GIT_BRANCH_NUM " " BUILD_DATE;
void dev_info_svc_start() {

2
firmware/targets/f7/target.mk
View File

@@ -24,6 +24,8 @@ LDFLAGS += $(MCU_FLAGS) -specs=nosys.specs -specs=nano.specs
CPPFLAGS += -fno-rtti -fno-use-cxa-atexit -fno-exceptions
LDFLAGS += -Wl,--start-group -lstdc++ -lsupc++ -Wl,--end-group
HARDWARE_TARGET = 7
MXPROJECT_DIR = $(TARGET_DIR)
# Entry Point