fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 02:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

versioning: fix style

Browse Source
This commit is contained in:
Dario Röthlisberger
2017-10-09 14:41:58 +02:00
committed by Beat Küng
parent e3b8c0512e
commit 3edc5942e4
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/version/version.c
+6 -4
View File
@@ -129,6 +129,7 @@ uint32_t version_tag_to_number(const char *tag)
version_number = ((uint8_t)version[0] << 8 * 3) | version_number = ((uint8_t)version[0] << 8 * 3) |
((uint8_t)version[1] << 8 * 2) | ((uint8_t)version[1] << 8 * 2) |
((uint8_t)version[2] << 8 * 1) | firmware_type; ((uint8_t)version[2] << 8 * 1) | firmware_type;
} else { } else {
version_number = 0; version_number = 0;
} }
@@ -175,10 +176,10 @@ uint32_t version_tag_to_vendor_version_number(const char *tag)
} }
if ((dash_count == 1 && point_count == 2 && firmware_type == FIRMWARE_TYPE_RELEASE) || if ((dash_count == 1 && point_count == 2 && firmware_type == FIRMWARE_TYPE_RELEASE) ||
(dash_count == 2 && point_count == 2) || (dash_count == 2 && point_count == 2) ||
(dash_count == 3 && point_count == 4)) { (dash_count == 3 && point_count == 4)) {
firmware_type = FIRMWARE_TYPE_DEV; firmware_type = FIRMWARE_TYPE_DEV;
} }
for (size_t i = 0; i < strlen(tag); i++) { for (size_t i = 0; i < strlen(tag); i++) {
if (buffer_counter > 5) { if (buffer_counter > 5) {
@@ -215,6 +216,7 @@ uint32_t version_tag_to_vendor_version_number(const char *tag)
} else if (buffer_counter == 3) { } else if (buffer_counter == 3) {
version_number = firmware_type; version_number = firmware_type;
} else { } else {
version_number = 0; version_number = 0;
} }
src/systemcmds/tests/test_versioning.cpp
+10 -4
View File
@@ -7,10 +7,12 @@ public:
virtual bool run_tests(); virtual bool run_tests();
private: private:
bool _test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, uint32_t vendor_version_target); bool _test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target,
uint32_t vendor_version_target);
}; };
bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target, uint32_t vendor_version_target) bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32_t flight_version_target,
uint32_t vendor_version_target)
{ {
uint32_t flight_version_result = version_tag_to_number(version_tag); uint32_t flight_version_result = version_tag_to_number(version_tag);
uint32_t vendor_version_result = version_tag_to_vendor_version_number(version_tag); uint32_t vendor_version_result = version_tag_to_vendor_version_number(version_tag);
@@ -18,12 +20,16 @@ bool VersioningTest::_test_tag_to_version_number(const char *version_tag, uint32
if (flight_version_target == flight_version_result) { if (flight_version_target == flight_version_result) {
if (vendor_version_target == vendor_version_result) { if (vendor_version_target == vendor_version_result) {
return true; return true;
} else { } else {
PX4_ERR("Wrong vendor version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, vendor_version_result, vendor_version_target); PX4_ERR("Wrong vendor version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, vendor_version_result,
vendor_version_target);
return false; return false;
} }
} else { } else {
PX4_ERR("Wrong flight version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, flight_version_result, flight_version_target); PX4_ERR("Wrong flight version: tag: %s, got: 0x%x, expected: 0x%x", version_tag, flight_version_result,
flight_version_target);
return false; return false;
} }
} }