diff --git a/CMakeLists.txt b/CMakeLists.txt index caecf0c76..6a985892d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,14 +67,12 @@ set(RESOURCES gpsbabel.qrc) # MINIMAL_FMTS set(MINIMAL_FMTS - explorist_ini.cc garmin.cc garmin_device_xml.cc garmin_tables.cc geo.cc gpx.cc kml.cc - magproto.cc nmea.cc wbt-200.cc ) @@ -209,7 +207,6 @@ set(HEADERS defs.h dg-100.h exif.h - explorist_ini.h filter.h filter_vecs.h format.h @@ -237,7 +234,6 @@ set(HEADERS kml.h legacyformat.h lowranceusr.h - magellan.h navilink.h nmea.h osm.h @@ -376,7 +372,6 @@ set(TESTS arc batch bend - classic-1 classic-2 classic-3 dg100 @@ -408,8 +403,6 @@ set(TESTS kml-read kml lowranceusr - magellan_sd - magellan mtk multiurlgpx navilink diff --git a/explorist_ini.cc b/deprecated/explorist_ini.cc similarity index 100% rename from explorist_ini.cc rename to deprecated/explorist_ini.cc diff --git a/explorist_ini.h b/deprecated/explorist_ini.h similarity index 100% rename from explorist_ini.h rename to deprecated/explorist_ini.h diff --git a/magellan.h b/deprecated/magellan.h similarity index 100% rename from magellan.h rename to deprecated/magellan.h diff --git a/magproto.cc b/deprecated/magproto.cc similarity index 100% rename from magproto.cc rename to deprecated/magproto.cc diff --git a/reference/dusky.gnuplot b/reference/dusky.gnuplot index 573facd3c..27c10e6ec 100644 --- a/reference/dusky.gnuplot +++ b/reference/dusky.gnuplot @@ -29,7 +29,7 @@ plot "-" with lines 99.9720 905.512 100.1892 902.231 100.5724 882.546 -102.0104 882.546 +102.0103 882.546 102.8041 875.984 103.0804 872.703 107.3975 921.916 diff --git a/reference/dusky.gpx b/reference/dusky.gpx new file mode 100644 index 000000000..8cd9778c8 --- /dev/null +++ b/reference/dusky.gpx @@ -0,0 +1,262 @@ + + + + + + dusky + + + 190.000 + + + + 217.000 + + + + 218.000 + + + + 218.000 + + + + 215.000 + + + + 201.000 + + + + 185.000 + + + + 186.000 + + + + 190.000 + + + + 188.000 + + + + 192.000 + + + + 195.000 + + + + 196.000 + + + + 195.000 + + + + 195.000 + + + + 196.000 + + + + 187.000 + + + + 199.000 + + + + 202.000 + + + + 213.000 + + + + 225.000 + + + + 233.000 + + + + 220.000 + + + + 221.000 + + + + 233.000 + + + + 275.000 + + + + 276.000 + + + + 276.000 + + + + 275.000 + + + + 269.000 + + + + 269.000 + + + + 267.000 + + + + 266.000 + + + + 281.000 + + + + 279.000 + + + + 298.000 + + + + 297.000 + + + + 306.000 + + + + 295.000 + + + + 330.000 + + + + 317.000 + + + + 314.000 + + + + 322.000 + + + + 332.000 + + + + 328.000 + + + + 304.000 + + + + 297.000 + + + + 296.000 + + + + 311.000 + + + + 285.000 + + + + 276.000 + + + + 275.000 + + + + 271.000 + + + + 266.000 + + + + 258.000 + + + + 265.000 + + + + 267.000 + + + + 258.000 + + + + 261.000 + + + + 264.000 + + + + 265.000 + + + + 262.000 + + + + 259.000 + + + + + diff --git a/reference/format0.txt b/reference/format0.txt index 91981bc48..6d10d5cd0 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -36,9 +36,6 @@ html html HTML Output humminbird_ht ht Humminbird tracks (.ht) humminbird hwr Humminbird waypoints and routes (.hwr) lowranceusr usr Lowrance USR -magellanx upt Magellan SD files (as for eXplorist) -magellan Magellan SD files (as for Meridian) -magellan Magellan serial protocol miniHomer MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI) garmin_xt Mobile Garmin XT Track files mtk-bin bin MTK Logger (iBlue 747,...) Binary File Format diff --git a/reference/format1.txt b/reference/format1.txt index 70140cb00..cc4d87520 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -42,9 +42,6 @@ file humminbird_ht ht Humminbird tracks (.ht) file humminbird hwr Humminbird waypoints and routes (.hwr) internal random Internal GPS data generator file lowranceusr usr Lowrance USR -file magellanx upt Magellan SD files (as for eXplorist) -file magellan Magellan SD files (as for Meridian) -serial magellan Magellan serial protocol serial miniHomer MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI) file garmin_xt Mobile Garmin XT Track files file mtk-bin bin MTK Logger (iBlue 747,...) Binary File Format diff --git a/reference/format2.txt b/reference/format2.txt index 70877eecb..713235226 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -42,9 +42,6 @@ file r-rwr- humminbird_ht ht Humminbird tracks (.ht) file rwr-rw humminbird hwr Humminbird waypoints and routes (.hwr) internal r-r-r- random Internal GPS data generator file rwrwrw lowranceusr usr Lowrance USR -file rwrwrw magellanx upt Magellan SD files (as for eXplorist) -file rwrwrw magellan Magellan SD files (as for Meridian) -serial rwrwrw magellan Magellan serial protocol serial r-r--- miniHomer MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI) file --r--- garmin_xt Mobile Garmin XT Track files file r-r--- mtk-bin bin MTK Logger (iBlue 747,...) Binary File Format diff --git a/reference/format3.txt b/reference/format3.txt index f0f8b6081..70596a81f 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -508,30 +508,6 @@ option lowranceusr serialnum (USR output) Device serial number integer 0 https option lowranceusr description (USR output) Output file content description string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_lowranceusr.html#fmt_lowranceusr_o_description -file rwrwrw magellanx upt Magellan SD files (as for eXplorist) magellanx - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellanx.html -option magellanx deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellanx.html#fmt_magellanx_o_deficon - -option magellanx maxcmts Max number of comments to write (maxcmts=200) integer https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellanx.html#fmt_magellanx_o_maxcmts - -file rwrwrw magellan Magellan SD files (as for Meridian) magellan - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html -option magellan deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_deficon - -option magellan maxcmts Max number of comments to write (maxcmts=200) integer https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_maxcmts - -serial rwrwrw magellan Magellan serial protocol magellan - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html -option magellan deficon Default icon name string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_deficon - -option magellan maxcmts Max number of comments to write (maxcmts=200) integer 200 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_maxcmts - -option magellan baud Numeric value of bitrate (baud=4800) integer 4800 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_baud - -option magellan noack Suppress use of handshaking in name of speed boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_noack - -option magellan nukewpt Delete all waypoints boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_magellan.html#fmt_magellan_o_nukewpt - serial r-r--- miniHomer MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI) miniHomer https://www.gpsbabel.org/WEB_DOC_DIR/fmt_miniHomer.html option miniHomer baud Baud rate used for download integer 115200 0 115200 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_miniHomer.html#fmt_miniHomer_o_baud diff --git a/reference/help.txt b/reference/help.txt index f76efa9c0..c787547d2 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -252,18 +252,6 @@ File Types (-i and -o options): title (USR output) Output file title string serialnum (USR output) Device serial number description (USR output) Output file content description - magellanx Magellan SD files (as for eXplorist) - deficon Default icon name - maxcmts Max number of comments to write (maxcmts=200) - magellan Magellan SD files (as for Meridian) - deficon Default icon name - maxcmts Max number of comments to write (maxcmts=200) - magellan Magellan serial protocol - deficon Default icon name - maxcmts Max number of comments to write (maxcmts=200) - baud Numeric value of bitrate (baud=4800) - noack (0/1) Suppress use of handshaking in name of speed - nukewpt (0/1) Delete all waypoints miniHomer MiniHomer, a skyTraq Venus 6 based logger (downloa baud Baud rate used for download dump-file Dump raw data to this file diff --git a/reference/magfile b/reference/magfile deleted file mode 100644 index 26216d129..000000000 --- a/reference/magfile +++ /dev/null @@ -1,18 +0,0 @@ -$PMGNWPL,2805.200,N,08246.200,W,0000000,M,AL7394,872 6833 A TIDAL,a*43 -$PMGNWPL,2806.216,N,08246.733,W,0000000,M,AL7485,872 6853 TIDAL 1,a*33 -$PMGNWPL,2806.216,N,08246.733,W,0000000,M,AL7484,872 6853 TIDAL 2,a*31 -$PMGNWPL,2806.050,N,08246.367,W,0000000,M,AL7482,872 6853 TIDAL 4,a*34 -$PMGNWPL,2808.816,N,08245.483,W,0000000,M,AL7471,872 6892 TIDAL 1,a*3A -$PMGNWPL,2808.816,N,08245.483,W,0000000,M,AL7470,872 6892 TIDAL 2,a*38 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7380,872 6899 TIDAL 1,a*35 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7379,872 6899 TIDAL 2,a*30 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7378,872 6899 TIDAL 3,a*30 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7377,872 6899 TIDAL 4,a*38 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7376,872 6899 TIDAL 5,a*38 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7386,872 6904 TIDAL 1,a*32 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7385,872 6904 TIDAL 2,a*32 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7384,872 6904 TIDAL 3,a*32 -$PMGNWPL,2809.216,N,08248.017,W,0000000,M,AL7383,872 6904 TIDAL 4,a*34 -$PMGNWPL,2809.216,N,08248.017,W,0000000,M,AL7382,872 6904 TIDAL 5,a*34 -$PMGNWPL,2809.617,N,08245.933,W,0000000,M,AL6625,872 6905 TIDAL 5,a*3B -$PMGNWPL,2809.383,N,08244.666,W,0000000,M,AL7392,872 6906 TIDAL 2,a*31 diff --git a/reference/magxfile b/reference/magxfile deleted file mode 100644 index f9ea738d8..000000000 --- a/reference/magxfile +++ /dev/null @@ -1,19 +0,0 @@ -$PMGNWPL,2805.200,N,08246.200,W,0000000,M,AL7394,872 6833 A TIDAL,a*43 -$PMGNWPL,2806.216,N,08246.733,W,0000000,M,AL7485,872 6853 TIDAL 1,a*33 -$PMGNWPL,2806.216,N,08246.733,W,0000000,M,AL7484,872 6853 TIDAL 2,a*31 -$PMGNWPL,2806.050,N,08246.367,W,0000000,M,AL7482,872 6853 TIDAL 4,a*34 -$PMGNWPL,2808.816,N,08245.483,W,0000000,M,AL7471,872 6892 TIDAL 1,a*3A -$PMGNWPL,2808.816,N,08245.483,W,0000000,M,AL7470,872 6892 TIDAL 2,a*38 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7380,872 6899 TIDAL 1,a*35 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7379,872 6899 TIDAL 2,a*30 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7378,872 6899 TIDAL 3,a*30 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7377,872 6899 TIDAL 4,a*38 -$PMGNWPL,2809.017,N,08246.283,W,0000000,M,AL7376,872 6899 TIDAL 5,a*38 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7386,872 6904 TIDAL 1,a*32 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7385,872 6904 TIDAL 2,a*32 -$PMGNWPL,2809.216,N,08248.033,W,0000000,M,AL7384,872 6904 TIDAL 3,a*32 -$PMGNWPL,2809.216,N,08248.017,W,0000000,M,AL7383,872 6904 TIDAL 4,a*34 -$PMGNWPL,2809.216,N,08248.017,W,0000000,M,AL7382,872 6904 TIDAL 5,a*34 -$PMGNWPL,2809.617,N,08245.933,W,0000000,M,AL6625,872 6905 TIDAL 5,a*3B -$PMGNWPL,2809.383,N,08244.666,W,0000000,M,AL7392,872 6906 TIDAL 2,a*31 -$PMGNCMD,END*3D diff --git a/reference/track/meridian.trk b/reference/track/meridian.trk deleted file mode 100644 index abcb1a40a..000000000 --- a/reference/track/meridian.trk +++ /dev/null @@ -1,64 +0,0 @@ -$PMGNTRK,3003.731,N,09136.621,W,00001,M,170621.25,A,,250502*6A -$PMGNTRK,3003.767,N,09136.634,W,00000,M,170955.19,A,,250502*6F -$PMGNTRK,3003.762,N,09136.496,W,00000,M,171200.20,A,,250502*60 -$PMGNTRK,3003.740,N,09136.443,W,00000,M,171248.75,A,,250502*64 -$PMGNTRK,3003.692,N,09136.317,W,00000,M,171441.20,A,,250502*63 -$PMGNTRK,3003.587,N,09135.964,W,00000,M,171716.20,A,,250502*68 -$PMGNTRK,3003.468,N,09135.801,W,00000,M,171746.20,A,,250502*6F -$PMGNTRK,3003.323,N,09135.694,W,00000,M,171820.81,A,,250502*61 -$PMGNTRK,3003.233,N,09135.557,W,00000,M,171901.20,A,,250502*64 -$PMGNTRK,3002.984,N,09135.385,W,00000,M,172046.25,A,,250502*67 -$PMGNTRK,3002.941,N,09135.393,W,00000,M,172110.25,A,,250502*6B -$PMGNTRK,3002.928,N,09135.576,W,00000,M,172151.37,A,,250502*6F -$PMGNTRK,3002.774,N,09135.787,W,00000,M,172235.20,A,,250502*63 -$PMGNTRK,3002.731,N,09135.923,W,00000,M,172308.56,A,,250502*6C -$PMGNTRK,3002.838,N,09136.016,W,00000,M,180423.93,A,,250502*6C -$PMGNTRK,3002.820,N,09135.978,W,00002,M,180604.92,A,,250502*63 -$PMGNTRK,3002.786,N,09135.968,W,00000,M,180706.92,A,,250502*60 -$PMGNTRK,3002.772,N,09135.937,W,00001,M,180818.92,A,,250502*60 -$PMGNTRK,3002.782,N,09135.864,W,00000,M,181020.92,A,,250502*6B -$PMGNTRK,3002.781,N,09135.830,W,00000,M,181109.93,A,,250502*62 -$PMGNTRK,3002.807,N,09135.780,W,00000,M,181218.92,A,,250502*65 -$PMGNTRK,3002.847,N,09135.712,W,00000,M,181422.93,A,,250502*64 -$PMGNTRK,3002.868,N,09135.686,W,00002,M,181504.93,A,,250502*62 -$PMGNTRK,3002.895,N,09135.645,W,00001,M,181614.93,A,,250502*6E -$PMGNTRK,3002.921,N,09135.628,W,00001,M,181701.93,A,,250502*6E -$PMGNTRK,3002.961,N,09135.631,W,00000,M,181807.94,A,,250502*6D -$PMGNTRK,3003.019,N,09135.639,W,00002,M,181951.94,A,,250502*62 -$PMGNTRK,3003.047,N,09135.647,W,00000,M,182039.94,A,,250502*66 -$PMGNTRK,3003.074,N,09135.662,W,00000,M,182124.93,A,,250502*6B -$PMGNTRK,3003.108,N,09135.662,W,00000,M,182217.94,A,,250502*65 -$PMGNTRK,3003.133,N,09135.680,W,00000,M,182318.93,A,,250502*68 -$PMGNTRK,3003.181,N,09135.681,W,00000,M,182437.94,A,,250502*6D -$PMGNTRK,3003.292,N,09135.712,W,00006,M,182813.95,A,,250502*6A -$PMGNTRK,3003.224,N,09135.696,W,00002,M,183136.94,A,,250502*60 -$PMGNTRK,3003.191,N,09135.687,W,00000,M,183256.95,A,,250502*6B -$PMGNTRK,3003.158,N,09135.690,W,00000,M,183402.95,A,,250502*6F -$PMGNTRK,3003.147,N,09135.726,W,00000,M,183603.95,A,,250502*6E -$PMGNTRK,3003.149,N,09135.758,W,00000,M,183648.96,A,,250502*65 -$PMGNTRK,3003.159,N,09135.807,W,00001,M,183752.96,A,,250502*6A -$PMGNTRK,3003.188,N,09135.871,W,00000,M,183918.95,A,,250502*65 -$PMGNTRK,3003.217,N,09135.878,W,00000,M,184015.96,A,,250502*69 -$PMGNTRK,3003.238,N,09135.866,W,00006,M,184125.96,A,,250502*6F -$PMGNTRK,3003.217,N,09135.885,W,00000,M,184237.96,A,,250502*69 -$PMGNTRK,3003.192,N,09135.875,W,00000,M,184401.96,A,,250502*6B -$PMGNTRK,3003.169,N,09135.851,W,00000,M,184553.96,A,,250502*6F -$PMGNTRK,3003.154,N,09135.816,W,00000,M,184654.96,A,,250502*66 -$PMGNTRK,3003.140,N,09135.786,W,00000,M,184742.97,A,,250502*62 -$PMGNTRK,3003.135,N,09135.741,W,00000,M,184841.96,A,,250502*66 -$PMGNTRK,3003.133,N,09135.701,W,00000,M,184952.97,A,,250502*66 -$PMGNTRK,3003.113,N,09135.682,W,00000,M,185049.97,A,,250502*6C -$PMGNTRK,3003.063,N,09135.664,W,00000,M,185214.97,A,,250502*68 -$PMGNTRK,3003.034,N,09135.654,W,00000,M,185256.98,A,,250502*60 -$PMGNTRK,3003.011,N,09135.646,W,00000,M,185338.98,A,,250502*6D -$PMGNTRK,3002.946,N,09135.623,W,00000,M,185511.97,A,,250502*66 -$PMGNTRK,3002.907,N,09135.655,W,00000,M,185632.98,A,,250502*6F -$PMGNTRK,3002.885,N,09135.685,W,00000,M,185724.97,A,,250502*60 -$PMGNTRK,3002.850,N,09135.727,W,00007,M,185840.98,A,,250502*64 -$PMGNTRK,3002.824,N,09135.760,W,00000,M,185928.98,A,,250502*6C -$PMGNTRK,3002.798,N,09135.796,W,00000,M,190022.98,A,,250502*6A -$PMGNTRK,3002.784,N,09135.859,W,00000,M,190141.98,A,,250502*6F -$PMGNTRK,3002.774,N,09135.908,W,00000,M,190248.99,A,,250502*6E -$PMGNTRK,3002.779,N,09135.938,W,00000,M,190343.98,A,,250502*6B -$PMGNTRK,3002.807,N,09135.957,W,00000,M,190449.99,A,,250502*68 -$PMGNTRK,3002.828,N,09135.980,W,00000,M,190557.98,A,,250502*60 diff --git a/testo.d/classic-1.test b/testo.d/classic-1.test deleted file mode 100644 index 1eb1ea028..000000000 --- a/testo.d/classic-1.test +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - - -# Magellan serial -# TODO - - -# -# GPX routes -- since GPX contains a date stamp, tests will always -# fail, so we use magellan as an interim format... -# -rm -f ${TMPDIR}/gpxroute.gpx ${TMPDIR}/maggpx.rte -gpsbabel -r -i gpx -f ${REFERENCE}/route/route.gpx -o gpx \ - -F ${TMPDIR}/gpxroute.gpx -gpsbabel -r -i gpx -f ${TMPDIR}/gpxroute.gpx -o magellan \ - -F ${TMPDIR}/maggpx.rte -compare ${REFERENCE}/route/magellan.rte ${TMPDIR}/maggpx.rte - -# -# GPX tracks -- since GPX contains a date stamp, tests will always -# fail, so we use magellan as an interim format... -# -rm -f ${TMPDIR}/gpxtrack.gpx ${TMPDIR}/maggpx.trk -gpsbabel -t -i gpx -f ${REFERENCE}/track/tracks.gpx -o gpx \ - -F ${TMPDIR}/gpxtrack.gpx -gpsbabel -t -i magellan -f ${REFERENCE}/track/meridian.trk -o gpx \ - -F ${TMPDIR}/maggpx.trk -compare ${TMPDIR}/maggpx.trk ${TMPDIR}/gpxtrack.gpx - diff --git a/testo.d/classic-2.test b/testo.d/classic-2.test index 8bcaf9115..96f5fc9d7 100644 --- a/testo.d/classic-2.test +++ b/testo.d/classic-2.test @@ -12,7 +12,7 @@ compare ${REFERENCE}/humanread.out ${TMPDIR}/humanread.out # XCSV "path distance" test # rm -f ${TMPDIR}/pathdist.out -gpsbabel -i magellan -f ${REFERENCE}/dusky.trk -o xcsv,style=${REFERENCE}/gnuplot.style -F ${TMPDIR}/pathdist.out +gpsbabel -i gpx -f ${REFERENCE}/dusky.gpx -o xcsv,style=${REFERENCE}/gnuplot.style -F ${TMPDIR}/pathdist.out compare ${REFERENCE}/dusky.gnuplot ${TMPDIR}/pathdist.out # diff --git a/testo.d/magellan.test b/testo.d/magellan.test deleted file mode 100644 index f6f4e80c1..000000000 --- a/testo.d/magellan.test +++ /dev/null @@ -1,22 +0,0 @@ - - -# -# Magellan file format -# -gpsbabel -i magellan -f ${REFERENCE}/magfile -o magellan -F ${TMPDIR}/magfile -compare ${TMPDIR}/magfile ${REFERENCE}/magfile - -# -# Magellanx is just like, but with longer names. (which this admittedly -# doesn't actually exercise...) -# -gpsbabel -i magellan -f ${REFERENCE}/magxfile -o magellanx -F ${TMPDIR}/magxfile -compare ${TMPDIR}/magxfile ${REFERENCE}/magxfile - -# Magellanx routes, however, have an extra 'name' field in them. -gpsbabel -r -i magellanx -f ${REFERENCE}/route/magexplorist.rte -o magellanx -F ${TMPDIR}/magxfile.rte -gpsbabel -r -i magellanx -f ${TMPDIR}/magxfile.rte -o magellanx -F ${TMPDIR}/magxfile2.rte -compare ${REFERENCE}/route/magexplorist.rte ${TMPDIR}/magxfile2.rte - -gpsbabel -t -i gpx -f ${REFERENCE}/track/nmeadate.gpx -o magellanx -F ${TMPDIR}/magellandate.log -compare ${REFERENCE}/track/magellandate.log ${TMPDIR}/magellandate.log diff --git a/testo.d/magellan_sd.test b/testo.d/magellan_sd.test deleted file mode 100644 index db472d58e..000000000 --- a/testo.d/magellan_sd.test +++ /dev/null @@ -1,8 +0,0 @@ -# -# magellan SD card waypoint / route format -# -rm -f ${TMPDIR}/magellan.rte -gpsbabel -r -i magellan -f ${REFERENCE}/route/magellan.rte -o magellan \ - -F ${TMPDIR}/magellan.rte -compare ${REFERENCE}/route/magellan.rte ${TMPDIR}/magellan.rte - diff --git a/vecs.cc b/vecs.cc index 0df9ee641..45f0c1e90 100644 --- a/vecs.cc +++ b/vecs.cc @@ -69,9 +69,6 @@ extern ff_vecs_t geo_vecs; -extern ff_vecs_t mag_svecs; -extern ff_vecs_t mag_fvecs; -extern ff_vecs_t magX_fvecs; extern ff_vecs_t garmin_vecs; extern ff_vecs_t ozi_vecs; #if MAXIMAL_ENABLED @@ -120,9 +117,6 @@ struct Vecs::Impl { #endif // CSVFMTS_ENABLED LegacyFormat geo_fmt {geo_vecs}; GpxFormat gpx_fmt; - LegacyFormat mag_sfmt {mag_svecs}; - LegacyFormat mag_ffmt {mag_fvecs}; - LegacyFormat magX_ffmt {magX_fvecs}; LegacyFormat garmin_fmt {garmin_vecs}; GdbFormat gdb_fmt; NmeaFormat nmea_fmt; @@ -208,27 +202,6 @@ struct Vecs::Impl { "gpx", nullptr, }, - { - &mag_sfmt, - "magellan", - "Magellan serial protocol", - nullptr, - nullptr, - }, - { - &mag_ffmt, - "magellan", - "Magellan SD files (as for Meridian)", - nullptr, - nullptr, - }, - { - &magX_ffmt, - "magellanx", - "Magellan SD files (as for eXplorist)", - "upt", - nullptr, - }, { &garmin_fmt, "garmin", diff --git a/xmldoc/chapters/preface.xml b/xmldoc/chapters/preface.xml index 339b14e29..61e0d6454 100644 --- a/xmldoc/chapters/preface.xml +++ b/xmldoc/chapters/preface.xml @@ -12,7 +12,7 @@ standard in XML to contain all the data, but there are too many programs that don't understand it yet and too much data in alternate formats. Perhaps you have an - Explorist 600 + GPSMap 60CSx and your friend has a StreetPilot 2720 . diff --git a/xmldoc/chapters/use.xml b/xmldoc/chapters/use.xml index 4431ba8eb..1aa0a99ba 100644 --- a/xmldoc/chapters/use.xml +++ b/xmldoc/chapters/use.xml @@ -207,8 +207,6 @@ merged data to multiple destinations. transparently with waypoints, tracks, and routes. Some formats, like garmin - and - magellan require the -t flag to work with tracks and diff --git a/xmldoc/formats/magellan.xml b/xmldoc/formats/magellan.xml deleted file mode 100644 index 9a25f8e6a..000000000 --- a/xmldoc/formats/magellan.xml +++ /dev/null @@ -1,38 +0,0 @@ -GPSBabel supports the following Magellan receivers: - - 310 - 315 - Map330 - SporTrak Map Color - SporTrak Map - SporTrak Map Pro - SporTrak Map Topo - Meridian (green or yellow) - Meridian Gold - Meridian Platinum - Meridian Color - Explorist 100 (with aftermarket cable) - Explorist 200 (with aftermarket cable) - Explorist 300 (with aftermarket cable) - Explorist 210 - Explorist 300 - Explorist 400 - Explorist 500 - Explorist 600 - Explorist XL - - - - - This format is used for both the serial protocol used on the - devices with serial ports such as Map330 and Meridian and for - the files stored either in either the unit's internal memory - (Explorist 210, Explorist 400, Explorist 500, Explorist 600, - Explorist XL) or on removable memory. - - - If you specify a serial port for the file (.e.g. "COM1", "/dev/ttyS0") - to be read or written, GPSBabel will use serial protocol. Specifying - a file, either on local filesystem or on a mounted flash card reader, - will results in the file-based format being used. - diff --git a/xmldoc/formats/magellan1.xml b/xmldoc/formats/magellan1.xml deleted file mode 100644 index e3936649a..000000000 --- a/xmldoc/formats/magellan1.xml +++ /dev/null @@ -1,96 +0,0 @@ -GPSBabel supports the following Magellan receivers: - - 310 - 315 - Map330 - SporTrak Map Color - SporTrak Map - SporTrak Map Pro - SporTrak Map Topo - Meridian (green or yellow) - Meridian Gold - Meridian Platinum - Meridian Color - Explorist 100 (with aftermarket cable) - Explorist 200 (with aftermarket cable) - Explorist 300 (with aftermarket cable) - Explorist 210 - Explorist 300 - Explorist 400 - Explorist 500 - Explorist 600 - Explorist XL - - - -The RoadMate family of products is not supported. - - - - This format is used for both the serial protocol used on the - devices with serial ports such as Map330 and Meridian and for - the files stored either in either the unit's internal memory - (Explorist 210, 400, 500, 600, XL) or on removable memory. - - - If you specify a serial port for the file (.e.g. "COM1", "/dev/ttyS0") - to be read or written, GPSBabel will use serial protocol. Specifying - a file, either on local filesystem or on a mounted flash card reader, - will result in the file-based format being used. - - - Users of the Explorist generation of receivers should probably - prefer to use the magellanx - format over this one. - - - - -This module does not support the units that do not follow Magellan's -documented communications protocols including: - -Maestro 3100 -Maestro 3140 -Maestro 3200 -Maestro 3210 -Maestro 3220 -Maestro 3225 -Maestro 3250 -Maestro 4000 -Maestro 4040 -Maestro 4050 -Maestro 4200 -Maestro 4210 -Maestro 4220 -Maestro 4250 -Maestro 5310 - - RoadMate 300 - RoadMate 360 - RoadMate 500 - RoadMate 700 - RoadMate 760 - RoadMate 800 - RoadMate 860T - RoadMate 1200 - RoadMate 1400 - RoadMate 1412 - RoadMate 1430 - RoadMate 2000 - RoadMate 2000 - RoadMate 2200T - RoadMate 3000T - RoadMate 3050T - RoadMate 6000T - RoadMate AAA - - Triton 200 - Triton 300 - Triton 400 - Triton 500 - Triton 1500 - Triton 2000 - - - - diff --git a/xmldoc/formats/magellanx.xml b/xmldoc/formats/magellanx.xml deleted file mode 100644 index ff0742048..000000000 --- a/xmldoc/formats/magellanx.xml +++ /dev/null @@ -1,13 +0,0 @@ - - This is the SD card format used by the Magellan Explorist 400, - Explorist 500, Explorist 600, and Explorist XL and internally on those devices plus the - Explorist 210. Stored waypoints are identical to the Magellan SD format - used by Meridian, but the newer models allow longer waypoint names. Routes are - subtly different. - - - You should name any file containing waypoints created with - this format with a ".upt" extension so the firmware can read it. - Similarly, routes should be named ".rte" and tracks should be - named ".log". - diff --git a/xmldoc/formats/options/magellan-deficon.xml b/xmldoc/formats/options/magellan-deficon.xml deleted file mode 100644 index 50c507efb..000000000 --- a/xmldoc/formats/options/magellan-deficon.xml +++ /dev/null @@ -1,3 +0,0 @@ - - The deficon option is used to control the icon output when writing to this format. It overrides any icon information that might be present in the source data. - diff --git a/xmldoc/formats/options/magellan-maxcmts.xml b/xmldoc/formats/options/magellan-maxcmts.xml deleted file mode 100644 index 70104bbbe..000000000 --- a/xmldoc/formats/options/magellan-maxcmts.xml +++ /dev/null @@ -1,13 +0,0 @@ - -The maxcmts option allows you to specify the number comments that will -be sent to the unit. - - -Magellan receivers allow a maximum of 200 waypoint comments. Unfortunately, -DirectRoute uses waypoint comments to provide next turn directions for -navigation pop-ups and that comes from that pool of 200 comments. It -is therefore sometimes convenient to limit the number of waypoint -comments written to the receiver. For example, a geocacher might want -to upload 400 waypoints, but only 190 with comments so that DirectRoute -could provide driving directions for the next ten turns. - diff --git a/xmldoc/formats/options/magellan1-baud.xml b/xmldoc/formats/options/magellan1-baud.xml deleted file mode 100644 index c6370d684..000000000 --- a/xmldoc/formats/options/magellan1-baud.xml +++ /dev/null @@ -1,8 +0,0 @@ - - This option causes GPSBabel to use the given baud rate for serial - communications. It must match the given baud rate on the receiver. The - default value matches the default on the receiver, 4800. - - - Valid options are 1200, 2400, 4800, 9600, 19200, 57600, and 115200. - diff --git a/xmldoc/formats/options/magellan1-deficon.xml b/xmldoc/formats/options/magellan1-deficon.xml deleted file mode 100644 index f1d272b05..000000000 --- a/xmldoc/formats/options/magellan1-deficon.xml +++ /dev/null @@ -1,15 +0,0 @@ - -This option specifies the icon or waypoint type to write for each waypoint on -output. - - -If this option is specified, its value will be used for all waypoints, not -just those that do not already have descriptions. That is, this option -overrides any icon description that might be in the input file. - - - -This option has no effect on input. - diff --git a/xmldoc/formats/options/magellan1-maxcmts.xml b/xmldoc/formats/options/magellan1-maxcmts.xml deleted file mode 100644 index 70104bbbe..000000000 --- a/xmldoc/formats/options/magellan1-maxcmts.xml +++ /dev/null @@ -1,13 +0,0 @@ - -The maxcmts option allows you to specify the number comments that will -be sent to the unit. - - -Magellan receivers allow a maximum of 200 waypoint comments. Unfortunately, -DirectRoute uses waypoint comments to provide next turn directions for -navigation pop-ups and that comes from that pool of 200 comments. It -is therefore sometimes convenient to limit the number of waypoint -comments written to the receiver. For example, a geocacher might want -to upload 400 waypoints, but only 190 with comments so that DirectRoute -could provide driving directions for the next ten turns. - diff --git a/xmldoc/formats/options/magellan1-noack.xml b/xmldoc/formats/options/magellan1-noack.xml deleted file mode 100644 index 8727166ec..000000000 --- a/xmldoc/formats/options/magellan1-noack.xml +++ /dev/null @@ -1,17 +0,0 @@ - -Magellan's protocol specification strongly encourages the use of software -acknowledgments on every packets. This is a simple "this is what I think -I heard. If you agree that I heard it correctly, let's go to the next packet" -handshake that is used to ensure the integrity of the data transfer. - - -Certain firmware versions have problems handling this which makes transfers -unnecessarily slow. Transfers on all units at high serial speeds are also -severely restricted by this process. - - -In controlled environments (good cables, low electrical noise, receiving -from the unit, not doing donuts with the unit set to "track up" at a 150 -mile scale with 500 waypoints on the screen) it is sometimes useful to -release that safety belt by using the "noack" suboption. - diff --git a/xmldoc/formats/options/magellan1-nukewpt.xml b/xmldoc/formats/options/magellan1-nukewpt.xml deleted file mode 100644 index 57de6cc86..000000000 --- a/xmldoc/formats/options/magellan1-nukewpt.xml +++ /dev/null @@ -1,10 +0,0 @@ - -This option erases all waypoints in the receiver before doing a transfer. - - -This is a convenient option to use in automated processes where you want -to ensure the units starts with a clean state before sending waypoints to -it. Using this option on transmit is a better idea than doing it on -receive since the latter would erase all the waypoints before asking the -unit to send all the waypoints. - diff --git a/xmldoc/formats/options/magellanx-deficon.xml b/xmldoc/formats/options/magellanx-deficon.xml deleted file mode 100644 index 50c507efb..000000000 --- a/xmldoc/formats/options/magellanx-deficon.xml +++ /dev/null @@ -1,3 +0,0 @@ - - The deficon option is used to control the icon output when writing to this format. It overrides any icon information that might be present in the source data. - diff --git a/xmldoc/formats/options/magellanx-maxcmts.xml b/xmldoc/formats/options/magellanx-maxcmts.xml deleted file mode 100644 index 70104bbbe..000000000 --- a/xmldoc/formats/options/magellanx-maxcmts.xml +++ /dev/null @@ -1,13 +0,0 @@ - -The maxcmts option allows you to specify the number comments that will -be sent to the unit. - - -Magellan receivers allow a maximum of 200 waypoint comments. Unfortunately, -DirectRoute uses waypoint comments to provide next turn directions for -navigation pop-ups and that comes from that pool of 200 comments. It -is therefore sometimes convenient to limit the number of waypoint -comments written to the receiver. For example, a geocacher might want -to upload 400 waypoints, but only 190 with comments so that DirectRoute -could provide driving directions for the next ten turns. -