Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

delete unused ECL_LIB_GIT_VERSION #21677

Merged
merged 1 commit into from
Jun 6, 2023
Merged

delete unused ECL_LIB_GIT_VERSION #21677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/lib/version/px_update_git_header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,21 +119,6 @@
"""


# 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(),
Expand Down
8 changes: 0 additions & 8 deletions src/lib/version/version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions src/lib/version/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down
6 changes: 0 additions & 6 deletions src/modules/logger/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down