fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 06:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed version firmware type (#8250)

Browse Source 
* Fixed the version tag to number and version tag to vendor version number to return dev version in case of any local modifications or in case there's a dash before firmware type in tags that support vendor  version.
This commit is contained in:
garfieldG
2017-11-11 20:04:16 -05:00
committed by Daniel Agar
parent 4e7bd576cb
commit cddea6f4b3
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/version/version.c
+10 -2
View File
@@ -83,6 +83,9 @@ uint32_t version_tag_to_number(const char *tag)
} else if (tag[i] == 'p') {
firmware_type = FIRMWARE_TYPE_ALPHA;
} else if (tag[i] == 't' && i < strlen(tag) - 1 && tag[i + 1] == 'y') {
firmware_type = FIRMWARE_TYPE_DEV;
} else if (tag[i] == 't') {
firmware_type = FIRMWARE_TYPE_BETA;
@@ -93,7 +96,8 @@ uint32_t version_tag_to_number(const char *tag)
if ((dash_count == 1 && point_count == 2 && firmware_type == FIRMWARE_TYPE_RELEASE) ||
(dash_count == 2 && point_count == 2) ||
(dash_count == 3 && point_count == 4)) {
(dash_count == 3 && point_count == 4) ||
(dash_count == 4 && point_count == 4)) {
firmware_type = FIRMWARE_TYPE_DEV;
}
@@ -167,6 +171,9 @@ uint32_t version_tag_to_vendor_version_number(const char *tag)
} else if (tag[i] == 'p') {
firmware_type = FIRMWARE_TYPE_ALPHA;
} else if (tag[i] == 't' && i < strlen(tag) - 1 && tag[i + 1] == 'y') {
firmware_type = FIRMWARE_TYPE_DEV;
} else if (tag[i] == 't') {
firmware_type = FIRMWARE_TYPE_BETA;
@@ -177,7 +184,8 @@ uint32_t version_tag_to_vendor_version_number(const char *tag)
if ((dash_count == 1 && point_count == 2 && firmware_type == FIRMWARE_TYPE_RELEASE) ||
(dash_count == 2 && point_count == 2) ||
(dash_count == 3 && point_count == 4)) {
(dash_count == 3 && point_count == 4) ||
(dash_count == 4 && point_count == 4)) {
firmware_type = FIRMWARE_TYPE_DEV;
}