diff --git a/Jenkinsfile b/Jenkinsfile index 20a966b..e8091c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,4 @@ node(label: 'raspberrypi') { - properties([ - pipelineTriggers([ - upstream(threshold: 'SUCCESS', - upstreamProjects: "bladeRF/${env.BRANCH_NAME}") - ]), - disableConcurrentBuilds(), - durabilityHint(hint: 'PERFORMANCE_OPTIMIZED') - ]) - def dists = ["stretch", "jessie"] def srcdir = "${WORKSPACE}/src" @@ -33,21 +24,23 @@ node(label: 'raspberrypi') { sh "rm -fr ${results}" sh "mkdir -p ${results}" dir(pkgdir) { - sh "DIST=${dist} BRANCH=${env.BRANCH_NAME} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results} -- --override-config" + sh "DIST=${dist} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results}" } archiveArtifacts artifacts: "${results}/*.deb", fingerprint: true } stage("Test install on ${dist}") { - sh "BRANCH=${env.BRANCH_NAME} /build/pi-builder/scripts/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" + sh "/build/repo/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" } } - stage('Deploy to internal repository') { - for (int i = 0; i < dists.size(); ++i) { - def dist = dists[i] - def results = "results-${dist}" - sh "/build/pi-builder/scripts/deploy.sh -distribution ${dist} -branch ${env.BRANCH_NAME} ${results}/*.deb" + if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "dev") { + stage("Deploy to staging repo") { + for (int i = 0; i < dists.size(); ++i) { + def dist = dists[i] + def results = "results-${dist}" + sh "/build/repo/deploy-packages.sh ${dist} ${results}/*.deb" + } } } } diff --git a/debian/changelog b/debian/changelog index 8121ea8..6525f8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,8 @@ -dump1090-fa (3.7.2) stable; urgency=medium +dump1090-fa (3.7.2~dev) UNRELEASED; urgency=medium - * dump1090: Fix reversed sense of Track Angle/Heading bit in surface opstatus messages - * dump1090: Have filter-regs emit a special value "-COMPUTED-" for filtered data - values, rather than blanking them out entirely - * Fix registration side mappings with a non-zero offset - * dump1090: Update aircraft DB to 20190816 - * dump1090: Reject outright libbladerf that's too old - * dump1090: Trigger build after bladeRF build; turn off build durability; turn - off concurrent builds - * SkyAware: SkyAware Renaming - * SkyAware: Fix some display errors for ground vehicles - * SkyAware: Fix aircraft trail handling + * in development - -- Eric Tran Mon, 09 Sep 2019 09:25:00 -6000 + -- Eric Tran Wed, 31 Jul 2019 11:27:00 -6000 dump1090-fa (3.7.1) stable; urgency=medium diff --git a/dump1090.c b/dump1090.c index 01d0391..b654c01 100644 --- a/dump1090.c +++ b/dump1090.c @@ -51,8 +51,6 @@ #include -struct modeStruct Modes; - // // ============================= Utility functions ========================== // diff --git a/dump1090.h b/dump1090.h index f98207e..90700ce 100644 --- a/dump1090.h +++ b/dump1090.h @@ -294,7 +294,7 @@ struct mag_buf { }; // Program global state -struct modeStruct { // Internal state +struct { // Internal state pthread_t reader_thread; pthread_mutex_t data_mutex; // Mutex to synchronize buffer access @@ -392,9 +392,7 @@ struct modeStruct { // Internal state int stats_latest_1min; struct stats stats_5min; struct stats stats_15min; -}; - -extern struct modeStruct Modes; +} Modes; // The struct we use to store information about a decoded message. struct modesMessage { diff --git a/public_html/config.js b/public_html/config.js index c1289d2..b9be157 100644 --- a/public_html/config.js +++ b/public_html/config.js @@ -11,11 +11,11 @@ PlaneCountInTitle = true; MessageRateInTitle = false; // -- Output Settings ------------------------------------- -// The DisplayUnits setting controls whether nautical (ft, NM, knots), -// metric (m, km, km/h) or imperial (ft, mi, mph) units are used in the +// The DisplayUnits setting controls whether nautical (ft, NM, knots), +// metric (m, km, km/h) or imperial (ft, mi, mph) units are used in the // plane table and in the detailed plane info. Valid values are // "nautical", "metric", or "imperial". -DisplayUnits = "metric"; +DisplayUnits = "nautical"; // -- Map settings ---------------------------------------- // These settings are overridden by any position information @@ -23,17 +23,17 @@ DisplayUnits = "metric"; // degrees. // Default center of the map. -DefaultCenterLat = 49.425626; -DefaultCenterLon = 7.756527; +DefaultCenterLat = 45.0; +DefaultCenterLon = 9.0; // The google maps zoom level, 0 - 16, lower is further out -DefaultZoomLvl = 8; +DefaultZoomLvl = 7; // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. -SiteShow = true; // true to show a center marker -SiteLat = 49.425626; // position of the marker -SiteLon = 7.756527; +SiteShow = false; // true to show a center marker +SiteLat = 45.0; // position of the marker +SiteLon = 9.0; SiteName = "My Radar Site"; // tooltip of the marker // -- Marker settings ------------------------------------- @@ -96,7 +96,7 @@ OutlineMlatColor = '#4040FF'; SiteCircles = true; // true to show circles (only shown if the center marker is shown) // In miles, nautical miles, or km (depending settings value 'DisplayUnits') -SiteCirclesDistances = new Array(25,50,75,100); +SiteCirclesDistances = new Array(100,150,200); // Controls page title, righthand pane when nothing is selected PageName = "PiAware SkyAware"; diff --git a/public_html/index.html b/public_html/index.html index 6a83a9f..a0e4ceb 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -2,7 +2,7 @@ - + @@ -14,16 +14,16 @@ - - - - - - - - - - DL0XK Aeorspectator + + + + + + + + + + PiAware SkyAware @@ -46,8 +46,25 @@ +
+ + +
n/a @@ -150,8 +167,8 @@