From 4edb2e8e3593b89a29cf1480ab2e0758d1cd7cf7 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 4 Sep 2019 21:53:53 +0800 Subject: [PATCH 1/9] Use new build infrastructure scripts --- Jenkinsfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e8091c7..b11ca00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,23 +24,21 @@ node(label: 'raspberrypi') { sh "rm -fr ${results}" sh "mkdir -p ${results}" dir(pkgdir) { - sh "DIST=${dist} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results}" + sh "DIST=${dist} BRANCH=${env.BRANCH_NAME} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results} -- --override-config" } archiveArtifacts artifacts: "${results}/*.deb", fingerprint: true } stage("Test install on ${dist}") { - sh "/build/repo/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" + sh "/build/pi-builder/scripts/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.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" - } + 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" } } } From 18d47fd5ff7198b62ba3765626c2c99903301285 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 4 Sep 2019 22:14:56 +0800 Subject: [PATCH 2/9] Fix polyfill for really old libbladerf-dev which doesn't provide an API version define --- sdr_bladerf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdr_bladerf.c b/sdr_bladerf.c index 65ef2a8..e6ec308 100644 --- a/sdr_bladerf.c +++ b/sdr_bladerf.c @@ -24,7 +24,7 @@ #include // Polyfill for the older bladerf API -#if defined(LIBBLADERF_API_VERSION) && (LIBBLADERF_API_VERSION < 0x02000000) +#if !defined(LIBBLADERF_API_VERSION) || (LIBBLADERF_API_VERSION < 0x02000000) typedef unsigned int bladerf_frequency; #endif From 1d29f5e059c52593a853842369ff71c95d976c36 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 4 Sep 2019 22:46:38 +0800 Subject: [PATCH 3/9] Reject outright a libbladerf that's too old --- sdr_bladerf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdr_bladerf.c b/sdr_bladerf.c index e6ec308..69fe799 100644 --- a/sdr_bladerf.c +++ b/sdr_bladerf.c @@ -23,8 +23,12 @@ #include #include +#if !defined(LIBBLADERF_API_VERSION) || (LIBBLADERF_API_VERSION < 0x01060100) +#error This libbladeRF is too old, upgrade or disable bladerf support +#endif + // Polyfill for the older bladerf API -#if !defined(LIBBLADERF_API_VERSION) || (LIBBLADERF_API_VERSION < 0x02000000) +#if LIBBLADERF_API_VERSION < 0x02000000 typedef unsigned int bladerf_frequency; #endif From 0a0fb46b5d3f673da21a176d292dd485d10c7051 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 4 Sep 2019 23:55:48 +0800 Subject: [PATCH 4/9] Pass branch name to validate-packages --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b11ca00..0b2b279 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ node(label: 'raspberrypi') { } stage("Test install on ${dist}") { - sh "/build/pi-builder/scripts/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" + sh "BRANCH=${env.BRANCH_NAME} /build/pi-builder/scripts/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" } } From dabb6fc1352741193a4026698555f94426bf25e9 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 5 Sep 2019 15:32:04 +0800 Subject: [PATCH 5/9] Trigger build after bladeRF build; turn off build durability; turn off concurrent builds --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 0b2b279..20a966b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,13 @@ 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" From ae4a89b7074322eb27b39048e6468157e8b8915a Mon Sep 17 00:00:00 2001 From: Eric Tran Date: Mon, 9 Sep 2019 14:29:26 +0000 Subject: [PATCH 6/9] Release 3.7.2 --- debian/changelog | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6525f8c..8121ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ -dump1090-fa (3.7.2~dev) UNRELEASED; urgency=medium +dump1090-fa (3.7.2) stable; urgency=medium - * in development + * 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 - -- Eric Tran Wed, 31 Jul 2019 11:27:00 -6000 + -- Eric Tran Mon, 09 Sep 2019 09:25:00 -6000 dump1090-fa (3.7.1) stable; urgency=medium From 25b3a34fffc45a29a582d5e2e394673fb78cf51f Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 11 Sep 2019 12:59:51 +0800 Subject: [PATCH 7/9] Add a versioned cache bust to all the javascript URLs --- public_html/index.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public_html/index.html b/public_html/index.html index a0e4ceb..eadaa4c 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -2,7 +2,7 @@ - + @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + PiAware SkyAware From de29e8232766e8e2aca351ce8a4e83781b89462f Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Sun, 3 Nov 2019 17:00:53 +0100 Subject: [PATCH 8/9] Modified look and feel for the dl0xk installation --- public_html/config.js | 20 +++++------ public_html/index.html | 64 ++++++++++----------------------- public_html/script.js | 80 +++++++++++++++++++++--------------------- public_html/style.css | 17 ++++----- 4 files changed, 77 insertions(+), 104 deletions(-) diff --git a/public_html/config.js b/public_html/config.js index b9be157..c1289d2 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 = "nautical"; +DisplayUnits = "metric"; // -- Map settings ---------------------------------------- // These settings are overridden by any position information @@ -23,17 +23,17 @@ DisplayUnits = "nautical"; // degrees. // Default center of the map. -DefaultCenterLat = 45.0; -DefaultCenterLon = 9.0; +DefaultCenterLat = 49.425626; +DefaultCenterLon = 7.756527; // The google maps zoom level, 0 - 16, lower is further out -DefaultZoomLvl = 7; +DefaultZoomLvl = 8; // Center marker. If dump1090 provides a receiver location, // that location is used and these settings are ignored. -SiteShow = false; // true to show a center marker -SiteLat = 45.0; // position of the marker -SiteLon = 9.0; +SiteShow = true; // true to show a center marker +SiteLat = 49.425626; // position of the marker +SiteLon = 7.756527; 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(100,150,200); +SiteCirclesDistances = new Array(25,50,75,100); // 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 eadaa4c..6a83a9f 100644 --- a/public_html/index.html +++ b/public_html/index.html @@ -23,7 +23,7 @@ - PiAware SkyAware + DL0XK Aeorspectator @@ -46,25 +46,8 @@ -
- - -
n/a @@ -167,8 +150,8 @@