From 5ecd4be222ca01d42e187315924ef025ce1d7b5b Mon Sep 17 00:00:00 2001
From: wangruixue <cocowang@slightech.com>
Date: Mon, 26 Aug 2019 18:15:37 +0800
Subject: [PATCH 1/2] chore(*): modify jenkinsfile

---
 Jenkinsfile | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e50972d..21737e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,10 @@ pipeline {
       steps {
         echo "WORKSPACE: ${env.WORKSPACE}"
         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') {
@@ -39,12 +42,7 @@ pipeline {
         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') {
       steps {
         echo 'make samples ..'
@@ -82,29 +80,34 @@ pipeline {
   post {
     always {
       echo 'This will always run'
+	  dingTalk accessToken: '7dca6ae9b1b159b8b4b375e858b71f2e6cec8f73fa20d07552d09791261b2344',
+                    imageUrl: 'http://icon-park.com/imagefiles/loading7_gray.gif',
+                    message: '开始构建',
+                    jenkinsUrl: "${JENKINS_URL}"
+					
+
     }
     success {
       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 {
       echo 'This will run only if failed'
-	  mail to: 'mynteye-ci@slightech.com',
-      subject: "${env.JOB_NAME} 编译失败 Failed Pipeline: ${currentBuild.fullDisplayName}",
-      body: """
-                详情：
-                FAILED       : Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'             
-                状态         ：${env.JOB_NAME} jenkins 运行失败 
-                URL          ：${env.BUILD_URL}
-                项目名称     ：${env.JOB_NAME} 
-                项目更新进度 ：${env.BUILD_NUMBER}
-            """
+	  dingTalk accessToken: '7dca6ae9b1b159b8b4b375e858b71f2e6cec8f73fa20d07552d09791261b2344',
+                    imageUrl: 'http://www.iconsdb.com/icons/preview/soylent-red/x-mark-3-xxl.png',
+                    message: '构建失败',
+                    jenkinsUrl: "${JENKINS_URL}"
     }
     unstable {
       echo 'This will run only if the run was marked as unstable'
     }
     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'
     }
   }
 }

From a04da7dafac4592bd776163f234f43350941c6fb Mon Sep 17 00:00:00 2001
From: TinyO <tinysilk@hotmail.com>
Date: Wed, 28 Aug 2019 16:05:51 +0800
Subject: [PATCH 2/2] feat(*): add version check things of s2110.

---
 src/mynteye/api/version_checker.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/mynteye/api/version_checker.cc b/src/mynteye/api/version_checker.cc
index 6b3f40d..e4a2c36 100644
--- a/src/mynteye/api/version_checker.cc
+++ b/src/mynteye/api/version_checker.cc
@@ -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",    ">0.0.0",         ">2.2.0",   PASS_DESCRIPTION},
   {"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 */
   {"MYNT-EYE-S2100",    "2.3.5",          "<1.2",      WARN_DESCRIPTION_F},
   {"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) {
   auto sdkv = api->GetSDKVersion();
+  std::cout << sdkv;
   auto devn = api->GetInfo(Info::DEVICE_NAME);
   auto firmv = api->GetInfo(Info::FIRMWARE_VERSION);