From 8a6d27b85f93c23fea349006a8c495e6ccd95df4 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 19 Jul 2017 15:28:10 +0200 Subject: [PATCH 1/3] Fix APRS beacon bug (incorrect frequency) --- YSFGateway/GPS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSFGateway/GPS.cpp b/YSFGateway/GPS.cpp index 8c26e5f..c3a1651 100644 --- a/YSFGateway/GPS.cpp +++ b/YSFGateway/GPS.cpp @@ -51,7 +51,7 @@ CGPS::~CGPS() void CGPS::setInfo(unsigned int txFrequency, unsigned int rxFrequency, float latitude, float longitude, int height) { - m_writer.setInfo(rxFrequency, rxFrequency, latitude, longitude, height); + m_writer.setInfo(txFrequency, rxFrequency, latitude, longitude, height); } bool CGPS::open() From a87ec7d532d8f08ca30b44d2ebb636ed17b63e31 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 19 Jul 2017 20:05:59 +0100 Subject: [PATCH 2/3] Update the YSF Hosts file. --- YSFGateway/YSFHosts.txt | 153 ++++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 78 deletions(-) diff --git a/YSFGateway/YSFHosts.txt b/YSFGateway/YSFHosts.txt index 971fe80..2dcfdf3 100644 --- a/YSFGateway/YSFHosts.txt +++ b/YSFGateway/YSFHosts.txt @@ -1,77 +1,76 @@ -74652;119-YSF;TG45004 XLX170;210.178.113.106;42000;001 +74652;119-YSF;TG45004 XLX170;210.178.113.106;42000;002 89803;A.O.T. Roma;OndaTelematica;31.14.140.230;42000;000 -02034;Alabama-Link;Alabama-Link;199.119.98.174;42000;016 +02034;Alabama-Link;Alabama-Link;199.119.98.174;42000;019 88060;AREC US FL-727;C4FM Bridge;97.76.81.165;42000;000 38654;ARGENTINA;C4FM Team;212.237.3.87;42000;000 -25223;AT Austria OE1;OE1PHS;77.117.135.164;42000;002 -00396;AT Austria OE3;OE3AAS;77.118.133.226;42000;000 +00396;AT Austria OE3;OE3AAS;77.118.212.232;42000;000 44853;AT OE-Austria;Digitalforce;194.208.150.205;42000;001 -04201;AU YSF001;1st WW YSF;64.137.243.44;42000;011 -93760;BE YSF-Vlaandere;C4FM Vlaandere;81.95.126.168;42000;000 -79520;BE YSF-Wallonie;C4FM Wallon;51.255.193.63;42000;004 +04201;AU YSF001;1st WW YSF;64.137.204.189;42000;007 +93760;BE YSF-Vlaandere;C4FM Vlaandere;81.95.126.168;42000;001 +79520;BE YSF-Wallonie;C4FM Wallon;51.255.193.63;42000;002 67661;BG Bulgaria;Sysop: LZ1LCD;95.43.222.149;42000;000 -96663;BM TG-21468;BM TG-21468;85.214.119.76;42108;002 -14341;BM-TG-208;BrMstr TG 208;51.254.126.212;42000;001 +96663;BM TG-21468;BM TG-21468;85.214.119.76;42108;001 +14341;BM-TG-208;BrMstr TG208;51.254.126.212;42000;004 30745;BM-TG-2080;BrMstr TG2080;51.254.126.212;42080;001 -00872;BM-TG-20820;BrMstr TG20820;51.254.126.212;42020;001 -52846;BM-TG-20859;BrMstr TG20859;51.254.126.212;42059;002 -39552;BM-TG-2087;BrMstr TG2087;51.254.126.212;42007;000 -93206;BM-TG-2088;BrMstr TG 2088;51.254.126.212;42008;002 +00872;BM-TG-20820;BrMstr TG20820;51.254.126.212;42020;002 +52846;BM-TG-20859;BrMstr TG20859;51.254.126.212;42059;001 +39552;BM-TG-2087;BrMstr TG2087;51.254.126.212;42007;002 +93206;BM-TG-2088;BrMstr TG2088;51.254.126.212;42008;002 35402;BM-TG-2089;BrMstr TG2089;51.254.126.212;42009;001 -24399;BM-TG-937;BrMstr TG937;51.254.133.61;42000;002 -85044;C4FM-SEOUL;TG45004 XLX170;210.178.113.45;42000;006 +24399;BM-TG-937;BrMstr TG937;51.254.133.61;42000;004 +85044;C4FM-SEOUL;TG45004 XLX170;210.178.113.45;42000;007 77353;CA Canada;C4FM Ontario;144.217.241.23;42100;003 -49473;CA QUEBEC;QC FR Fusion;64.34.60.44;42000;001 +49473;CA QUEBEC;QC FR Fusion;64.34.60.44;42000;000 52796;CH JOTA;Jota CH;157.161.57.65;42001;000 -31502;CN YSFREFL #1;C4FM by Sonic;52.80.4.154;42000;000 -04523;CT CATALANA;C4FM Catalunya;85.214.119.76;42100;005 -30549;CT WIRESCAT;C4FM Catalunya;85.214.119.76;42000;001 -26541;CZ Czech;TG2300 DCS019V;80.250.3.114;42000;004 +59050;CL CE3FCM;ysfreflector;190.161.179.169;42000;000 +31502;CN YSFREFL #1;C4FM by Sonic;52.80.4.154;42000;002 +04523;CT CATALANA;C4FM Catalunya;85.214.119.76;42100;001 +30549;CT WIRESCAT;C4FM Catalunya;85.214.119.76;42000;004 +26541;CZ Czech;TG2300 DCS019V;80.250.3.114;42000;003 58770;CZ YSF Praha;YSF CZ;185.32.183.148;42000;000 -62829;DE Germany;TG26208;213.202.229.15;42000;014 +62829;DE Germany;TG26208;213.202.229.15;42000;020 10322;DE Germany2;no bridge;213.202.229.15;42001;000 -34983;DENMARK C4FM;YSF C4FM DENMA;172.104.149.202;42000;001 -00561;DVSwitch NA;North America;44.103.32.18;42000;001 -34414;ES ASRABI;C4FM Bizkaia;185.47.129.230;42000;001 -64601;ES EA SPAIN;EA SPAIN;92.187.222.98;42000;000 +00561;DVSwitch NA;North America;44.103.32.18;42000;000 +34414;ES ASRABI;C4FM Bizkaia -;185.47.129.230;42000;002 98529;ES ED2ZAE;YSF DE EA2RCF;85.214.114.27;42000;000 -60318;ES Wires X;WIRES X SPAIN;94.177.199.241;42000;002 +60318;ES Wires X;WIRES X SPAIN;94.177.199.241;42000;005 62659;ES YSF214;C4FM Bizkaia;89.36.214.120;42000;000 -37926;ES YSF906;ED7ZAK;185.50.196.134;42000;000 +37926;ES YSF906;ED7ZAK;185.50.196.134;42000;001 08054;FON-Gateway;AllModes-GW;185.109.201.81;42000;000 -83665;FR YSF-Alpes;Rhone-Alpes;217.182.66.229;42000;001 -60284;FR YSF-Alsace;ALS(F) ROOM;91.121.136.94;42000;002 -19531;FR YSF-Bretagne;Bretagne;78.206.208.208;42000;001 -58617;FR YSF-France;Fusion France;87.98.132.205;42000;016 -46353;FR YSF-Nord;Nord;79.137.74.24;42000;003 -33751;FUSION-ITALY;Italy YSFR;188.213.173.69;42000;002 -35483;FUSION-KOREA;YSF450 KOREA;210.178.113.238;42000;000 +83665;FR YSF-Alpes;Rhone-Alpes;217.182.66.229;42000;002 +60284;FR YSF-Alsace;ALS(F) ROOM;91.121.136.94;42000;000 +58617;FR YSF-France;Fusion France;87.98.132.205;42000;020 +46353;FR YSF-Nord;Nord;79.137.74.24;42000;002 +33751;FUSION-ITALY;Italy YSFR;188.213.173.69;42000;001 91767;GB Fusion Kernow;Fusion SW UK;91.121.101.163;43000;003 -97576;GB N.Ireland;YSF N.Ireland;91.121.101.163;42500;002 -16710;GB SOUTH WEST;YSF REFLECTOR;109.158.31.182;43000;002 -76849;GR YSF202;Fusion Greece;88.198.25.123;42000;002 -62928;HBLINK EA5GVK;HBLINK EA5GVK;95.39.140.240;42000;000 +97576;GB N.Ireland;YSF N.Ireland;91.121.101.163;42500;003 +16710;GB SOUTH WEST;YSF REFLECTOR;86.138.89.66;43000;002 +76849;GR YSF202;Fusion Greece;144.76.101.219;42000;001 +47247;HB C4FM Basel;CISAR Basel;212.237.33.114;42000;001 +62928;HBLINK EA5GVK;HBLINK EA5GVK;84.127.124.188;42000;000 41120;HU Hungary;BM TG2167;213.181.208.141;42100;002 -04251;IE YSF Ireland;Fusion <> DMR;87.44.19.111;42000;002 -67939;IT C4FM LAZIO;773RadioGroup;93.186.255.126;42000;002 -30483;IT C4FM Lodi;Lombardia;87.9.167.104;42000;000 +04251;IE YSF Ireland;Fusion <> DMR;87.44.19.111;42000;006 +67939;IT C4FM LAZIO;773RadioGroup;93.186.255.126;42000;001 +30483;IT C4FM Lodi;Lombardia;213.45.90.232;42000;001 51231;IT C4FM NORD;ITALY-NORD;78.47.154.19;42000;004 -19437;IT C4FM Piemonte;DSP Italy;94.177.173.53;42000;003 -82044;IT YSFROOM-ITALY;WIRES-X ITALY;94.177.187.40;42000;006 -94552;Italia;Italia C4FM YS;31.14.140.230;42005;000 -25383;JP JAPAN;Fusion Japan;202.241.175.133;42000;003 -44770;Lazio;Lazio;31.14.140.230;42003;000 -96455;NL Central;Centraal NL;90.145.156.196;42000;000 -85875;NL Fusion Almere;Flevoland;84.86.62.38;42000;013 -73443;NL PI1DAF;Multi Repeater;77.174.218.149;42000;001 -06036;NL Repeater Lely;pe1sde lelysta;86.95.82.20;42000;002 +19437;IT C4FM Piemonte;DSP Italy;94.177.173.53;42000;002 +64159;IT ITALY-FREE;c4fm bridge;37.187.106.175;42000;002 +82044;IT YSFROOM-ITALY;WIRES-X ITALY;94.177.187.40;42000;004 +67411;IT Zona 4;EmiliaRomagna;212.84.32.29;42000;000 +94552;Italia;Italia C4FM;31.14.140.230;42005;000 +25383;JP JAPAN;Fusion Japan;202.241.175.133;42000;002 +96455;NL Central;Centraal NL;90.145.156.196;42000;003 +85875;NL Fusion Almere;Flevoland;84.86.62.38;42000;007 +73443;NL PI1DAF;Multi Repeater;77.174.30.155;42000;004 66644;NL YSF amprnet;ampr reflector;44.137.33.52;42000;000 -38627;NL YSF444;Dutch Refl.;188.68.37.51;42000;002 -56254;NO YSF006;Norway;80.89.46.242;42000;006 +38627;NL YSF444;Dutch Refl.;188.68.37.51;42000;003 +56254;NO YSF006;Norway;80.89.46.242;42000;007 +49480;NZ NZXLX;XLX626;202.137.244.157;42000;001 +49480;NZ NZXLX;XLX626;202.137.244.157;42000;001 00001;Parrot;Parrot;213.202.229.15;42020;000 -25393;PL 4280;YSF/DMR/DCS132;5.226.117.26;42031;001 +25393;PL 4280;YSF/DMR/DCS132;5.226.117.26;42031;002 98564;PL EmCom;EmCom TG260023;195.26.76.59;42023;001 -29114;PL POLAND;POLAND WiresX;5.226.117.26;42025;005 +29114;PL POLAND;POLAND WiresX;5.226.117.26;42025;007 38274;PL Poland 21;DMR TG260021;195.26.76.59;42021;001 04463;PL Poland 22;DMR TG260022;195.26.76.59;42022;001 55546;PL Silesia;Poland Silesia;188.116.7.66;42001;001 @@ -81,37 +80,35 @@ 61506;PL SR8UD;Ustrzyki;5.226.117.26;42032;000 54644;PL SR8UWD;Wlodawa YSF;5.226.117.26;42027;001 80986;PL YSF260;BM TG260;5.226.117.26;42035;001 -09948;PT YSF009;C4FM-Portugal;109.71.44.237;42000;002 +09948;PT YSF009;C4FM-Portugal;109.71.44.237;42000;001 89355;R.E.E.C.;R.E.E.C.;5.135.137.65;42000;000 -13131;ref.c4fm.se;ref.c4fm.se;176.10.140.161;42000;007 -51586;RO YSF DMR;#51586 <-> TG2;77.81.104.26;42005;001 -99447;RO YSF226;#99447;77.81.104.26;42000;008 +13131;ref.c4fm.se;ref.c4fm.se;176.10.140.161;42000;009 +51586;RO YSF DMR;#51586 <-> TG2;94.176.6.37;42005;002 +99447;RO YSF226;#99447;94.176.6.37;42000;003 18497;Roma;Roma;31.14.140.230;42004;000 -40208;SC Scotland;Scottish YSF;13.69.14.204;42000;004 +40208;SC Scotland;Scottish YSF;13.69.14.204;42000;005 43699;SE SK7ES;SK7ES Fusion;44.140.236.22;42000;000 -77010;SE SW-Sweden;C4FM;109.124.190.230;52000;000 -69846;SE YSF599;Tekniksnack.se;37.123.186.251;42000;001 +77010;SE SW-Sweden;C4FM;46.236.122.101;52000;000 07237;TechTalk24;Engineers talk;195.26.76.59;42024;001 94513;TH YSF520;C4FM THAILAND;202.142.213.58;42000;001 -30743;TW HAMTALK;C4FM @HAMTALK;118.150.164.96;42000;002 -00325;TW YSF886;C4FM Taiwan;118.163.103.178;42000;000 -13201;UK DVMEGA;DVMEGA CHAT;90.145.156.196;42001;003 -83087;UK_YSF_BM_UK;UK_Ref_DN_ONLY;91.121.101.163;42000;004 -74185;US BM-TG3139;WiresX-28498;52.54.69.145;42000;002 +30743;TW HAMTALK;C4FM @HAMTALK;118.150.164.96;42000;001 +00325;TW YSF886;C4FM Taiwan;118.163.103.178;42000;001 +13201;UK DVMEGA;DVMEGA CHAT;90.145.156.196;42001;001 +83087;UK_YSF_BM_UK;UK_Ref_DN_ONLY;91.121.101.163;42000;006 +74185;US BM-TG3139;DMR-313960-To-;52.54.69.145;42000;002 84105;US East PA;MMDVM System;173.49.20.45;42005;000 30725;US K7EVR YSF;EVAR Mesa,AZ;72.201.150.71;42000;000 -02912;US Nationwide;United States;174.36.222.36;42000;005 -85788;US NJ EXP;US NJ EXP;64.137.236.153;42000;001 +02912;US Nationwide;United States;174.36.222.36;42000;009 53594;US Ohio;Ohio;162.243.74.151;42000;000 -62554;US Texas-Nexus;Texas-Nexus;104.2.186.135;42000;004 -38268;US YSF 012;PAPA YSF 012;209.112.244.28;42000;000 -90943;US YSF 858;YSF SDCA-NZ6D;104.236.156.191;42000;002 -08033;US YSF002;KingsOfDigital;104.233.101.49;42000;000 -91768;US YSF082 NYC;KARG & NB2O;108.21.232.23;42000;001 +62554;US Texas-Nexus;Texas-Nexus;104.2.186.135;42000;003 +38268;US YSF 012;PAPA YSF 012;209.112.244.28;42000;002 +90943;US YSF 858;YSF SDCA-NZ6D;104.236.156.191;42000;001 +08033;US YSF002;KingsOfDigital;64.137.181.182;42000;001 +91768;US YSF082 NYC;KARG & NB2O;108.21.232.23;42000;002 23864;US YSF310;K6KD;45.62.213.40;42000;002 -87531;US-QuadNetATL;QuadNet-BM;107.191.121.105;42000;001 -12224;US-YSF-NE;NEW-ENGLAND;54.144.216.63;42000;006 +87531;US-QuadNetATL;QuadNet-BM;107.191.121.105;42000;000 +12224;US-YSF-NE;NEW-ENGLAND;54.144.216.63;42000;009 39117;US-YSF587MiFL;YSF-QNetBridge;96.47.239.135;42000;001 -24519;YSF-EA5 SPAIN;Zona EA5;95.39.140.240;42105;004 -93029;YSF004 MI5 SW2;Crossconnect t;44.103.34.3;42000;001 -55937;YSF017;YSFLatino 914;85.214.119.76;42200;005 +24519;YSF-EA5 SPAIN;Zona EA5;84.127.124.188;42105;003 +93029;YSF004 MI5 SW2;Crossconnect t;44.103.34.3;42000;002 +55937;YSF017;YSFLatino 914;85.214.119.76;42200;002 From 80b315d7c92022fa77c4147380f3dc28d31b729c Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 19 Jul 2017 20:07:07 +0100 Subject: [PATCH 3/3] Bump the version date. --- YSFGateway/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YSFGateway/Version.h b/YSFGateway/Version.h index 58fb73f..b6885be 100644 --- a/YSFGateway/Version.h +++ b/YSFGateway/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20170325"; +const char* VERSION = "20170719"; #endif