Skip to content

Commit

Permalink
Merge pull request #1132 from opencpn-radar-pi/Beta
Browse files Browse the repository at this point in the history
Radar plugin v5.5.3-beta
  • Loading branch information
bdbcat authored Aug 4, 2024
2 parents 0f63b22 + e3e5af7 commit 9f32238
Show file tree
Hide file tree
Showing 14 changed files with 83 additions and 78 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/2855 -->
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/3337 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>darwin-wx32</target>
<target-version>10</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-darwin-wx32-10-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_darwin-wx32-10-x86_64.tar.gz </tarball-url>
<tarball-checksum> b04a5363d5a5cee6333c91f03db7f21263eb5e0d7c4cd7d0447087401be2b088 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-darwin-wx32-10-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_darwin-wx32-10-x86_64.tar.gz </tarball-url>
<tarball-checksum> 7d8c6aee80b43ba8a9997fea344d8038cdc2baf641b7e6a82d9e2027a98125f8 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/2854 -->
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/3328 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-x86_64</target>
<target-version>11</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-x86_64.tar.gz </tarball-url>
<tarball-checksum> 1c3d52cfa72a9318399ec3e4bc7741b9a83d51606a185b4e4ef8df6bc95d8b71 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-x86_64.tar.gz </tarball-url>
<tarball-checksum> c41c9186d2e150ca2698768367be81151b1463f8c846dbc4e82d4579ee6a8f64 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-x86_64</target>
<target-version>12</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-x86_64.tar.gz </tarball-url>
<tarball-checksum> c15fa5e301b45b63861456ff5539c2210ab137c4c69db8cb0cc152238c5137a8 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-x86_64.tar.gz </tarball-url>
<tarball-checksum> 5c71f71a331f9f08ce31e9a18673e12c5ad31fc048acf37ebc7ab64a60dcd4df </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-armhf</target>
<target-version>11</target-version>
<target-arch>armhf</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-armhf.tar.gz </tarball-url>
<tarball-checksum> 8a5a9c27d084df8c7fadb5209f98c778c353317bdafc6beafe806ff32157d6a7 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-armhf.tar.gz </tarball-url>
<tarball-checksum> 269ecb83bec6758649c2a1716dce138c2857d932bf992ddda305699835dce4b7 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-armhf</target>
<target-version>12</target-version>
<target-arch>armhf</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A32-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-armhf.tar.gz </tarball-url>
<tarball-checksum> 594b96293fe3fd361de0dc997ab54f60356ca0d82893bf18a1dc6525a4520361 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A32-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-armhf.tar.gz </tarball-url>
<tarball-checksum> bb2cd3e0ff671c51a59ab068e766defe5f47ace8507610598be095cdc42ba58f </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-arm64</target>
<target-version>11</target-version>
<target-arch>arm64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A64-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-arm64.tar.gz </tarball-url>
<tarball-checksum> cb731ea5a7330de5961fe4a90561189b28aadc30d9feb95e07adcaab10815669 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A64-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-arm64.tar.gz </tarball-url>
<tarball-checksum> faa87e562b850a06e3a9c7602cb72a7ac27ea73a84159c3743a55976ba9be3de </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-arm64</target>
<target-version>12</target-version>
<target-arch>arm64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A64-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-arm64.tar.gz </tarball-url>
<tarball-checksum> 42a5a957457d02f80643c4403e1f8c66c43ae54cb2422e44f8960e7cc72caf23 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A64-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-arm64.tar.gz </tarball-url>
<tarball-checksum> 917800a3192a61dec7a6c4cf8708bc2c224c0c1dbbcd1f8494a4f22a69d3cb92 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-wx32-armhf</target>
<target-version>11</target-version>
<target-arch>armhf</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-A32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-armhf.tar.gz </tarball-url>
<tarball-checksum> f42344036a775dbda56059b849e5b1f98b5326520d14baed60eb839010d48656 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32-A32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32-11-armhf.tar.gz </tarball-url>
<tarball-checksum> aee2818f9cb38f4906597379eb65a927957331db7c2c4185db4a4fd6471e6914 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-wx32-arm64</target>
<target-version>11</target-version>
<target-arch>arm64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-A64-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-arm64.tar.gz </tarball-url>
<tarball-checksum> 8d3a740a9befbdd64dab46bb3e0b218b8c5fd959521ee05a6ba249165421e03e </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32-A64-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32-11-arm64.tar.gz </tarball-url>
<tarball-checksum> f76d5c32ff3b9572ccc1e321ad9a19dc7fb49e4cae479ddef2cfb85fc21b29d6 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/2861 -->
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/3338 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>debian-wx32-x86_64</target>
<target-version>11</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-x86_64.tar.gz </tarball-url>
<tarball-checksum> a53da02d3ac864dbce10c2cb246c3a65cc7e1367c23666ada26b5b3f2287e06b </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32.wx32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32.wx32-11-x86_64.tar.gz </tarball-url>
<tarball-checksum> 378eb7b3497d874ff3d4e6119e4ad2906b9df2484d1dd34ebf6510950a2d0bc0 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/2859 -->
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/3325 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>flatpak-x86_64</target>
<target-version>22.08</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-flatpak-22.08-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_flatpak-22.08-x86_64.tar.gz </tarball-url>
<tarball-checksum> 54129dd3f2f93c841e3c28796a6340eb442884d223dcc706d77e2bfa5b22bc56 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-flatpak-22.08-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_flatpak-22.08-x86_64.tar.gz </tarball-url>
<tarball-checksum> 33b7f36592a8eaf0d73536b5d5272a00ce939ffa490ecae4b350ccc9f19e927f </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/2866 -->
<!-- https://circleci.com/gh/opencpn-radar-pi/radar_pi/3324 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

Expand All @@ -29,6 +29,6 @@ such as dual radar range and Doppler.
<target>flatpak-aarch64</target>
<target-version>22.08</target-version>
<target-arch>aarch64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-flatpak-A64-22.08-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_flatpak-22.08-aarch64.tar.gz </tarball-url>
<tarball-checksum> d44bd02707143e00a04eb2adfc16b30f7d9ff00ad65342123dc343dee94880d7 </tarball-checksum>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-flatpak-A64-22.08-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_flatpak-22.08-aarch64.tar.gz </tarball-url>
<tarball-checksum> 87083d9eb40b8125029d41836057283d5a4d32c01cbbdccd43eb0d9349b4ceb2 </tarball-checksum>
</plugin>
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://ci.appveyor.com/project/keesverruijt/radar-pi/builds/46766798 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.0-beta4 </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

<api-version> 1.16 </api-version>
<open-source> yes </open-source>
<author> Hakan Svensson / Douwe Fokkema / Kees Verruijt / David S Register </author>
<source> https://github.com/opencpn-radar-pi/radar_pi </source>
<info-url> https://opencpn.org/OpenCPN/plugins/radarPI.html </info-url>

<description> Garmin, Navico and Raymarine radar support

WARNING: OPENGL MODE IS REQUIRED!

Works with Garmin HD, xHD, Navico BR24, 3G, 4G, HALOxx and several Raymarine radars.

When a compass heading is provided it will allow radar overlay on the chart(s).
It also allows separate display of a traditional radar picture (PPI).

Supports MARPA (even on radars that do not support this themselves),
Guard zones, AIS overlay on PPI, and various radar dependent features
such as dual radar range and Doppler.
</description>

<target>msvc-wx32</target>
<target-version>10</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-msvc-wx32-10-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_msvc-wx32-10-win32.tar.gz </tarball-url>
<tarball-checksum> 81595a0878684f3eaca3fbb2e5472c7da2e466ac5a97579872628f7f7657b809 </tarball-checksum>
</plugin>
<?xml version="1.0" encoding="UTF-8"?>
<!-- https://ci.appveyor.com/project/keesverruijt/radar-pi/builds/50341986 -->
<plugin version="1">
<name> Radar </name>
<version> v5.5.3-beta </version>
<release> </release>
<summary> Overlays the radar picture on OpenCPN </summary>

<api-version> 1.16 </api-version>
<open-source> yes </open-source>
<author> Hakan Svensson / Douwe Fokkema / Kees Verruijt / David S Register </author>
<source> https://github.com/opencpn-radar-pi/radar_pi </source>
<info-url> https://opencpn.org/OpenCPN/plugins/radarPI.html </info-url>

<description> Garmin, Navico and Raymarine radar support

WARNING: OPENGL MODE IS REQUIRED!

Works with Garmin HD, xHD, Navico BR24, 3G, 4G, HALOxx and several Raymarine radars.

When a compass heading is provided it will allow radar overlay on the chart(s).
It also allows separate display of a traditional radar picture (PPI).

Supports MARPA (even on radars that do not support this themselves),
Guard zones, AIS overlay on PPI, and various radar dependent features
such as dual radar range and Doppler.
</description>

<target>msvc-wx32</target>
<target-version>10</target-version>
<target-arch>x86_64</target-arch>
<tarball-url> https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-msvc-wx32-10-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_msvc-wx32-10-win32.tar.gz </tarball-url>
<tarball-checksum> 5bad06dd47f6632514469a72674186100fa4b631d19e6217c73da6f0dbae5fcf </tarball-checksum>
</plugin>
11 changes: 8 additions & 3 deletions pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@
# - Copy to .git/hooks to activate.
# - Use --no-verify to override.

set -euo pipefail

function files_to_update()
{
git diff --cached --name-status | grep -v ^D | awk '$1 $2 { print $2}'
git diff --cached --name-status | grep -v ^D | awk '{print $NF}'
}
topdir=$( git rev-parse --show-toplevel )
here=$(dirname $0)

XML_SOURCES=( $( files_to_update | grep -E '\.xml$'))

if [ -n "$XML_SOURCES" ]; then
xmllint --schema $topdir/ocpn-plugin.xsd $XML_SOURCES --noout || exit 1
python $here/../../tools/check-metadata-urls $XML_SOURCES || exit 1
for f in "${XML_SOURCES[@]}"
do
xmllint --schema "${topdir}/ocpn-plugin.xsd" "${f}" --noout || exit 1
python "${here}/../../tools/check-metadata-urls" "${f}" || exit 1
done
fi

# If there are whitespace errors, print the offending file names and fail.
Expand Down

0 comments on commit 9f32238

Please sign in to comment.