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

Merge branch 'develop' into release/v2.4.2

Browse Source
This commit is contained in:
TinyO 2019-08-28 16:21:35 +08:00
commit a7be1c47cd
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Jenkinsfile vendored
View File

@ -16,7 +16,10 @@ pipeline {
steps { steps {
echo "WORKSPACE: ${env.WORKSPACE}" echo "WORKSPACE: ${env.WORKSPACE}"
echo 'apt-get ..' echo 'apt-get ..'
sh 'apt-get update' sh '''
apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
apt-get update
'''
} }
} }
stage('Init') { stage('Init') {
@ -39,12 +42,7 @@ pipeline {
sh '. /opt/ros/kinetic/setup.sh; make install SUDO=' sh '. /opt/ros/kinetic/setup.sh; make install SUDO='
} }
} }
stage('Test') {
steps {
echo 'make test ..'
sh '. /opt/ros/kinetic/setup.sh; make test SUDO='
}
}
stage('Samples') { stage('Samples') {
steps { steps {
echo 'make samples ..' echo 'make samples ..'
@ -82,29 +80,34 @@ pipeline {
post { post {
always { always {
echo 'This will always run' echo 'This will always run'
dingTalk accessToken: '7dca6ae9b1b159b8b4b375e858b71f2e6cec8f73fa20d07552d09791261b2344',
imageUrl: 'http://icon-park.com/imagefiles/loading7_gray.gif',
message: '开始构建',
jenkinsUrl: "${JENKINS_URL}"
} }
success { success {
echo 'This will run only if successful' echo 'This will run only if successful'
dingTalk accessToken: '7dca6ae9b1b159b8b4b375e858b71f2e6cec8f73fa20d07552d09791261b2344',
imageUrl: 'http://icons.iconarchive.com/icons/paomedia/small-n-flat/1024/sign-check-icon.png',
message: '构建成功',
jenkinsUrl: "${JENKINS_URL}"
} }
failure { failure {
echo 'This will run only if failed' echo 'This will run only if failed'
mail to: 'mynteye-ci@slightech.com', dingTalk accessToken: '7dca6ae9b1b159b8b4b375e858b71f2e6cec8f73fa20d07552d09791261b2344',
subject: "${env.JOB_NAME} 编译失败 Failed Pipeline: ${currentBuild.fullDisplayName}", imageUrl: 'http://www.iconsdb.com/icons/preview/soylent-red/x-mark-3-xxl.png',
body: """ message: '构建失败',
详情： jenkinsUrl: "${JENKINS_URL}"
FAILED : Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'
状态 ：${env.JOB_NAME} jenkins 运行失败
URL ：${env.BUILD_URL}
项目名称 ：${env.JOB_NAME}
项目更新进度 ：${env.BUILD_NUMBER}
"""
} }
unstable { unstable {
echo 'This will run only if the run was marked as unstable' echo 'This will run only if the run was marked as unstable'
} }
changed { changed {
echo 'This will run only if the state of the Pipeline has changed' echo 'This will run only if the state of the Pipeline has changed'
echo 'For example, if the Pipeline was previously failing but is now successful' echo 'For example, if the Pipeline was previously failing but is now successful11'
} }
} }
} }

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

@ -53,6 +53,11 @@ static const firmware_version_match_table_unit FSVM_TABLE[] ={
{"MYNT-EYE-S1030", ">2.3.3", "<2.4.0", WARN_DESCRIPTION_F}, {"MYNT-EYE-S1030", ">2.3.3", "<2.4.0", WARN_DESCRIPTION_F},
{"MYNT-EYE-S1030", ">0.0.0", ">2.2.0", PASS_DESCRIPTION}, {"MYNT-EYE-S1030", ">0.0.0", ">2.2.0", PASS_DESCRIPTION},
{"MYNT-EYE-S1030", ">0.0.0", "<2.3.0", WARN_DESCRIPTION_F}, {"MYNT-EYE-S1030", ">0.0.0", "<2.3.0", WARN_DESCRIPTION_F},
/** S2110 */
{"MYNT-EYE-S2110", ">2.4.1", "1.4", PASS_DESCRIPTION},
{"MYNT-EYE-S2110", "2.4.1", "1.4", PASS_DESCRIPTION},
{"MYNT-EYE-S2110", "2.4.1", "<1.4", WARN_DESCRIPTION_F},
{"MYNT-EYE-S2110", "<2.4.1", "<1.4", WARN_DESCRIPTION_S},
/** S2100 */ /** S2100 */
{"MYNT-EYE-S2100", "2.3.5", "<1.2", WARN_DESCRIPTION_F}, {"MYNT-EYE-S2100", "2.3.5", "<1.2", WARN_DESCRIPTION_F},
{"MYNT-EYE-S2100", ">2.3.3", ">1.0", PASS_DESCRIPTION}, {"MYNT-EYE-S2100", ">2.3.3", ">1.0", PASS_DESCRIPTION},
@ -143,6 +148,7 @@ bool checkIfDeviceInTable(const std::string& devn) {
bool checkFirmwareVersion(const std::shared_ptr<API> api) { bool checkFirmwareVersion(const std::shared_ptr<API> api) {
auto sdkv = api->GetSDKVersion(); auto sdkv = api->GetSDKVersion();
std::cout << sdkv;
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);