diff --git a/Jenkinsfile b/Jenkinsfile index 3e397c2..2cc7e1d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ import java.text.SimpleDateFormat jobName = "metadata-exporter" -version = "0.1.48" +version = "0.1.49" build_dir = "build" buildPackageName = "meta-exporter" @@ -9,12 +9,12 @@ node ('dockerslave') { deleteDir() stage ('Git') { git branch: 'master', url: 'git@github.com:MONROE-PROJECT/Utilities.git' - - checkout([$class: 'GitSCM', - branches: [[name: 'master']], - doGenerateSubmoduleConfigurations: false, - extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']], - submoduleCfg: [], + + checkout([$class: 'GitSCM', + branches: [[name: 'master']], + doGenerateSubmoduleConfigurations: false, + extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']], + submoduleCfg: [], userRemoteConfigs: [[url: 'git@github.com:kristrev/data-exporter.git']]]) gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim() shortCommit = gitCommit.take(6) @@ -57,7 +57,7 @@ node ('dockerslave') { sh "rm meta-exporter*.deb" } } - + stage ('Archive artifacts') { archiveArtifacts "${build_dir}/*.deb" } diff --git a/metadata_writer_sqlite.h b/metadata_writer_sqlite.h index a6752ec..0fd6937 100644 --- a/metadata_writer_sqlite.h +++ b/metadata_writer_sqlite.h @@ -102,7 +102,7 @@ "Latitude REAL NOT NULL," \ "Longitude REAL NOT NULL," \ "Altitude REAL," \ - "GroundSpeed REAL," \ + "Speed REAL," \ "NumOfSatelites INTEGER," \ "PRIMARY KEY(NodeId) ON CONFLICT REPLACE)" @@ -151,7 +151,7 @@ #define INSERT_GPS_EVENT "INSERT INTO GpsUpdate(NodeId,BootCount" \ ",BootMultiplier,Timestamp" \ ",Sequence,EventType,EventParam,Latitude,Longitude" \ - ",Altitude,GroundSpeed,NumOfSatelites) " \ + ",Altitude,Speed,NumOfSatelites) " \ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?)" #define INSERT_MONITOR_EVENT "INSERT INTO MonitorEvents(NodeId,Timestamp" \ @@ -285,7 +285,7 @@ "quote(\"BootMultiplier\"), quote(\"Timestamp\"), "\ "quote(\"Sequence\"), quote(\"Latitude\"), "\ "quote(\"Longitude\"), quote(\"Altitude\"), "\ - "quote(\"GroundSpeed\"), quote(\"NumOfSatelites\") "\ + "quote(\"Speed\"), quote(\"NumOfSatelites\") "\ "|| \")\" FROM \"GpsUpdate\" ORDER BY Timestamp;" #define DUMP_MONITOR "SELECT \"REPLACE INTO MonitorEvents" \