dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

delete unused ECL_LIB_GIT_VERSION 

Since 'ecl' is nomore a git submodule, code lines related to
'ECL_LIB_GIT_VERSION' could be deleted
This commit is contained in:
oneWayOut 2023-06-03 23:39:20 +08:00 committed by Daniel Agar
parent f4de43a10b
commit 6ee2d796ea
4 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/version/px_update_git_header.py
View File

@ -119,21 +119,6 @@ header += f"""
"""
# ECL
if (os.path.exists('src/lib/ecl/.git')):
ecl_git_tag = subprocess.check_output('git describe --always --tags --dirty'.split(),
cwd='src/lib/ecl', stderr=subprocess.STDOUT).decode('utf-8')
ecl_git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(),
cwd='src/lib/ecl', stderr=subprocess.STDOUT).decode('utf-8').strip()
ecl_git_version_short = ecl_git_version[0:16]
header += f"""
#define ECL_LIB_GIT_VERSION_STR "{ecl_git_version}"
#define ECL_LIB_GIT_VERSION_BINARY 0x{ecl_git_version_short}
"""
# Mavlink
if (os.path.exists('src/modules/mavlink/mavlink/.git')):
mavlink_git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(),

8
src/lib/version/version.c
View File

@ -345,14 +345,6 @@ uint64_t px4_firmware_version_binary(void)
return PX4_GIT_VERSION_BINARY;
}
const char *px4_ecl_lib_version_string(void)
{
#ifdef ECL_LIB_GIT_VERSION_STRING
return ECL_LIB_GIT_VERSION_STRING;
#else
return NULL;
#endif
}
#ifdef MAVLINK_LIB_GIT_VERSION_BINARY
uint64_t px4_mavlink_lib_version_binary(void)

5
src/lib/version/version.h
View File

@ -179,11 +179,6 @@ __EXPORT const char *px4_firmware_git_branch(void);
*/
__EXPORT uint64_t px4_firmware_version_binary(void);
/**
* ECL lib version as human readable string (git tag)
*/
__EXPORT const char *px4_ecl_lib_version_string(void);
/**
* MAVLink lib version in binary form (first part of the git tag)
*/

6
src/modules/logger/logger.cpp
View File

@ -2075,12 +2075,6 @@ void Logger::write_version(LogType type)
write_info(type, "sys_toolchain", px4_toolchain_name());
write_info(type, "sys_toolchain_ver", px4_toolchain_version());
const char *ecl_version = px4_ecl_lib_version_string();
if (ecl_version && ecl_version[0]) {
write_info(type, "sys_lib_ecl_ver", ecl_version);
}
char revision = 'U';
const char *chip_name = nullptr;