tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(api): version check pass while device name out of check table.

Browse Source
This commit is contained in:
TinyOh 2019-03-07 11:15:38 +08:00
parent d261bad291
commit ea5d40ff20
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mynteye/api/version_checker.cc
View File

@ -34,6 +34,7 @@ const char* WARN_DESCRIPTION_F =
const char* WARN_DESCRIPTION_S = const char* WARN_DESCRIPTION_S =
"We suggest that you should update the SDK"; "We suggest that you should update the SDK";
const char* PASS_DESCRIPTION = "pass"; const char* PASS_DESCRIPTION = "pass";
const char* PASS_OUTOF_TABLE_WARNING = "You're using a custom mynteye device";
/** firmware/sdk version matched table */ /** firmware/sdk version matched table */
/**----device type-----sdk version---firmware version-----pass tag-----*/ /**----device type-----sdk version---firmware version-----pass tag-----*/
@ -112,11 +113,27 @@ STATUS_UNIT checkUnit(const std::string& sdkv,
return ST_NOT_PASS; return ST_NOT_PASS;
} }
bool checkIfDeviceInTable(const std::string& devn) {
for (size_t i =0;
i < sizeof(FSVM_TABLE)/sizeof(firmware_version_match_table_unit);
i++) {
if (FSVM_TABLE[i].device_type == devn) {
return true;
}
}
return false;
}
bool checkFirmwareVersion(const std::shared_ptr<API> api) { bool checkFirmwareVersion(const std::shared_ptr<API> api) {
auto sdkv = api->GetSDKVersion(); auto sdkv = api->GetSDKVersion();
auto devn = api->GetInfo(Info::DEVICE_NAME); auto devn = api->GetInfo(Info::DEVICE_NAME);
auto firmv = api->GetInfo(Info::FIRMWARE_VERSION); auto firmv = api->GetInfo(Info::FIRMWARE_VERSION);
if (!checkIfDeviceInTable(devn)) {
LOG(WARNING) << PASS_OUTOF_TABLE_WARNING;
return true;
}
for (size_t i =0; for (size_t i =0;
i < sizeof(FSVM_TABLE)/sizeof(firmware_version_match_table_unit); i < sizeof(FSVM_TABLE)/sizeof(firmware_version_match_table_unit);
i++) { i++) {