From eed32c8cbe90d7d9fcb293d30167af72abe72d16 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 5 Feb 2018 23:29:57 -0300 Subject: [PATCH 1/5] Fix crash of DelayBuffer --- DMRNetwork.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 0b1edcf..8149019 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -87,8 +87,8 @@ m_beacon(false) m_jitterBuffers[1U] = new CJitterBuffer("DMR Slot 1", 60U, DMR_SLOT_TIME, jitter, 256U, debug); m_jitterBuffers[2U] = new CJitterBuffer("DMR Slot 2", 60U, DMR_SLOT_TIME, jitter, 256U, debug); - m_delayBuffers[1U] = new CDelayBuffer("DMR Slot 1", 60U, DMR_SLOT_TIME, jitter, debug); - m_delayBuffers[2U] = new CDelayBuffer("DMR Slot 2", 60U, DMR_SLOT_TIME, jitter, debug); + m_delayBuffers[1U] = new CDelayBuffer("DMR Slot 1", HOMEBREW_DATA_PACKET_LENGTH, DMR_SLOT_TIME, jitter, debug); + m_delayBuffers[2U] = new CDelayBuffer("DMR Slot 2", HOMEBREW_DATA_PACKET_LENGTH, DMR_SLOT_TIME, jitter, debug); m_id[0U] = id >> 24; m_id[1U] = id >> 16; From ddb3206a30c130bd44c24d82229606488b82b494 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 6 Feb 2018 07:11:00 +0000 Subject: [PATCH 2/5] Fix LCDProc and buffer sizes for the Nextion. Thanks to Tony G0WFV. --- LCDproc.cpp | 4 ++-- Nextion.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LCDproc.cpp b/LCDproc.cpp index 1ca096f..ef7c895 100644 --- a/LCDproc.cpp +++ b/LCDproc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 by Tony Corbett G0WFV + * Copyright (C) 2016, 2017, 2018 by Tony Corbett G0WFV * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -453,7 +453,7 @@ void CLCDproc::clearP25Int() { m_clockDisplayTimer.stop(); // Stop the clock display - socketPrintf(m_socketfd, "widget_set P25 Line3 1 2 15 2 h 3 Listening"); + socketPrintf(m_socketfd, "widget_set P25 Line2 1 2 15 2 h 3 Listening"); socketPrintf(m_socketfd, "widget_set P25 Line3 1 3 15 3 h 3 \"\""); socketPrintf(m_socketfd, "widget_set P25 Line4 1 4 15 4 h 3 \"\""); socketPrintf(m_socketfd, "output 2"); // Set LED2 color green diff --git a/Nextion.cpp b/Nextion.cpp index cbdc9c1..3214a45 100644 --- a/Nextion.cpp +++ b/Nextion.cpp @@ -209,7 +209,7 @@ void CNextion::writeDStarRSSIInt(unsigned char rssi) m_rssiCount1++; if (m_rssiCount1 == DSTAR_RSSI_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t3.txt=\"-%udBm\"", m_rssiAccum1 / DSTAR_RSSI_COUNT); sendCommand(text); sendCommandAction(47U); @@ -224,7 +224,7 @@ void CNextion::writeDStarBERInt(float ber) m_berCount1++; if (m_berCount1 == DSTAR_BER_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t4.txt=\"%.1f%%\"", m_berAccum1 / float(DSTAR_BER_COUNT)); sendCommand(text); sendCommandAction(48U); @@ -325,7 +325,7 @@ void CNextion::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi) m_rssiCount1++; if (m_rssiCount1 == DMR_RSSI_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t4.txt=\"-%udBm\"", m_rssiAccum1 / DMR_RSSI_COUNT); sendCommand(text); sendCommandAction(66U); @@ -337,7 +337,7 @@ void CNextion::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi) m_rssiCount2++; if (m_rssiCount2 == DMR_RSSI_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t5.txt=\"-%udBm\"", m_rssiAccum2 / DMR_RSSI_COUNT); sendCommand(text); sendCommandAction(74U); @@ -407,7 +407,7 @@ void CNextion::writeDMRBERInt(unsigned int slotNo, float ber) m_berCount1++; if (m_berCount1 == DMR_BER_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t6.txt=\"%.1f%%\"", m_berAccum1 / DMR_BER_COUNT); sendCommand(text); sendCommandAction(67U); @@ -419,7 +419,7 @@ void CNextion::writeDMRBERInt(unsigned int slotNo, float ber) m_berCount2++; if (m_berCount2 == DMR_BER_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t7.txt=\"%.1f%%\"", m_berAccum2 / DMR_BER_COUNT); sendCommand(text); sendCommandAction(75U); @@ -503,7 +503,7 @@ void CNextion::writeFusionRSSIInt(unsigned char rssi) m_rssiCount1++; if (m_rssiCount1 == YSF_RSSI_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t3.txt=\"-%udBm\"", m_rssiAccum1 / YSF_RSSI_COUNT); sendCommand(text); sendCommandAction(85U); @@ -518,7 +518,7 @@ void CNextion::writeFusionBERInt(float ber) m_berCount1++; if (m_berCount1 == YSF_BER_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t4.txt=\"%.1f%%\"", m_berAccum1 / float(YSF_BER_COUNT)); sendCommand(text); sendCommandAction(86U); @@ -574,7 +574,7 @@ void CNextion::writeP25RSSIInt(unsigned char rssi) m_rssiCount1++; if (m_rssiCount1 == P25_RSSI_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / P25_RSSI_COUNT); sendCommand(text); sendCommandAction(104U); @@ -589,7 +589,7 @@ void CNextion::writeP25BERInt(float ber) m_berCount1++; if (m_berCount1 == P25_BER_COUNT) { - char text[20U]; + char text[25U]; ::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(P25_BER_COUNT)); sendCommand(text); sendCommandAction(105U); From 54267967e2cd1ddf0944ce121feabf5cdb6959f8 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 6 Feb 2018 18:38:29 +0000 Subject: [PATCH 3/5] New NXDN Id lookup file. --- MMDVM.ini | 2 +- NXDN.csv | 405 +++++++++++++++++++++++++++++++++++++++++++++++ NXDNLookup.cpp | 8 +- nxuid_export.csv | 404 ---------------------------------------------- 4 files changed, 411 insertions(+), 408 deletions(-) create mode 100644 NXDN.csv delete mode 100644 nxuid_export.csv diff --git a/MMDVM.ini b/MMDVM.ini index c43590a..4cd86a1 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -37,7 +37,7 @@ File=DMRIds.dat Time=24 [NXDN Id Lookup] -File=nxuid_export.csv +File=NXDN.csv Time=24 [Modem] diff --git a/NXDN.csv b/NXDN.csv new file mode 100644 index 0000000..0024978 --- /dev/null +++ b/NXDN.csv @@ -0,0 +1,405 @@ +UID,Call,Name,Location,Notes +2,W2FLY/M,Harry,Southern NJ,UHF NX-800 mobile +3,WB2OOM/M,Tina,Southern NJ,UHF NX-800 Mobile +4,W2FLY/M,Harry,Southern NJ,UHF NX-800 Van +7,F1PRY,Emmanuel,BEAUVAIS FR, +8,W2FLY/P,Harry,Southern NJ,UHF NX-820 Port 2 +9,KE8BGA,Lowell Katz,"Cleveland, Ohio","on the north shore, NX-800" +17,KC2SNI,Jim Hannon,"West Berlin, New Jersey",My Radio is an Icom IC-3161DT +25,WB2RUH/P,Bruce,Southern NJ,UHF NX-320 +26,WB2RUH/M,Bruce,Southern NJ,UHF NX-800 mobile +30,KD4MOJ,Doug,,Doug +74,N2IXC,Ed,Chatsworth NJ, +76,W2FLY/P,Harry,Southern NJ,UFH NX5300 Port 1 +77,W2FLY/P,Harry,"Somers Point, NJ",UHF NX-800 Shore Base +78,W2FLY,Harry,"Mullica Hill, NJ",UHF NX-800 +79,W2FLY/M,Harry,Southern NJ,UHF NX-5800 +80,W2FLY/M,Harry,Southern NJ,VHF NX-5700 mobile +82,W2FLY/P,Harry,"Somers Point, NJ",VHF NX-700 Shore Base +85,W2FLY/M,Harry,Southern NJ,VHF NX_700 van +86,W2FLY,Harry,"Mullica Hill, NJ",VHF NX-700 base +87,W2FLY/M,Harry,Southern NJ,VHF NX-700 mobile +88,W2FLY/P,Harry,Southern NJ,VHF NX-220 portable +89,WB2RUH,Bruce,Vineland NJ,VHF NX-700 base +99,K1ZSG,Don,,Mobile +134,N2SRO,Mike,Pitman,Mobile Radio +134,N2SRO,Mike,NJ, +141,KF2M,Greg Popovich,"Mt Laurel, NJ",IC-F4161DT +401,W1KFR,Bill,,Bill +901,K1IFF,Cliff,CT,Cliff NX320 +902,K1IFF,Cliff,CT,Cliff NX320 - demo +903,K1IFF,Cliff,CT,Cliff NX800H +905,WA1LMV,Rick,,Rick NX320 +906,K1IFF,Cliff,CT,Cliff NX200 +907,K1IFF,Cliff,CT,Future +908,W4CLL,Chuck,,CHUCK +909,AB1UB V,Woody,"Bristol, CT", +909,AB1UB,Woody,"Bristol, CT", +909,AB1UB,Woody,,Woody NX300 +909,W4CCL,Chuck,,CHUCK +910,W4CLL,Chuck,,CHUCK +911,W4CLL,Chuck,,CHUCK +912,W4CCL,Chuck,,CHUCK +920,N1XDN,Bob,CT,Bob P1 UHF NX300 +921,N1XDN,Bob,CT,Bob P1 VHF NX220 +922,N1XDN,Bob,CT,Bob P2 UHF NX300 +923,N1XDN,Bob,CT,Bob M1 VHF NX700 +924,N1XDN,Bob,CT,Bob P3 UHF NX-5300 +925,N1XDN,Bob,CT,Bob P2 VHF NX-5200 +926,N1XDN,Bob,CT,Bob M1 UHF NX-5800 +928,N1XDN,Bob,CT,Icom portable +930,K1IFF,Cliff,CT,NX300 +931,K1IFF,Cliff,CT,NX300 +936,W1GPO,John,,NX300 +951,K1KGQ,Joel,,Joel NX800H +952,K1KGQ,Joel,CT,Truck radio +952,K1GML,Gail,,Gail NX800H +953,K1KGQ,Joel,,Joel NX320-1 +954,K1KGQ,Joel,, +955,K1KGQ,Joel,, +956,K1KGQ,Joel,, +957,K1KGQ,Joel,, +958,K1KGQ,Joel,,Joel F4161 +959,K1KGQ,Joel,,Future +960,K1ZXX,Gary,,Gary - Icom All radios +961,WA1SSB,Joe,,Joe NX800H +962,N1MAT,Dennis,,Dennis F4161 +963,N1MAT,Dennis,,Dennis F4161 +970,KB1VRI,Nick,CT, +970,KB1VRI,Nick,,Nick +971,N1ELE,Paul,CT, +972,N1ODJ,Kenny Schmitz,Middletown, +973,W1VLF,Paul,CT, +980,W1RHS,Rick,Connecticut, +995,K1IFF/Base,Cliff,"Brsitol, CT",NXR710 link radio +1001,KE4GWW,James,AL,NX200 Portable #1 +1002,KE4GWW,James,AL,NX200 Portable #2 +1003,KE4GWW,James,AL,NX300 Portable #1 +1004,KE4GWW,James,AL,NX300 Portable #2 +1005,KE4GWW,James,AL,NX700 Base +1006,KE4GWW,James,AL,NX800 Base +1007,KE4GWW,James M. Nelson,"Dothan, AL",NX700 Mobile#1 +1008,DK6PX,Stefan,Germany nr Bad Toelz,Coming up FR6000 +1008,KE4GWW,James,AL,NX700 Mobile#2 +1009,KE4GWW,James,AL,NX800 Mobile#1 +1010,KE4GWW,James,AL,NX800 Mobile#2 +1066,KM4JXP,Peter Tasker,Longboat Key,NX5300 +1954,W4BPT,BILLY TAYLOR,"RINGGOLD,GA.", +1956,KC7SDD,Dana Hanford,"Bainbridge Island, WA","Member BARC, W7NPC.org" +1963,N5JRN,David Barts,"Bainbridge Island, WA","Handheld, Icom 4161" +1966,ZS6IIX,Henry,Petit South Africa, +1997,KC1AJR,Giovanni,East Hampton CT,kenwood NX800 K2 +3070,W4ORL,Ralph,,Ralph - Mobile +3071,W4LOV,Mike,,Mike - NX800 +3072,N4JTK,John,,John - NX800 +3074,W4MCA,Michael,,Michael - NX300 +3075,W4LOV,Mike,,Mike - NX800 +3079,NN4TT,Dave,Orlando,NX300 +3079,W4ORL,Ralph,,Ralph - Portable +3081,W4MCA,Michael,,Michael - NX800 +3082,W4LOV,Mike,,Mike - Portable +3083,KD4TWJ,Dean,,Dean - Mobile NX800 +3271,N4KEG,Richard,,RICHARD - Mobile and or ht's N4KEG (UHF) +3274,KD4EFM,Evans,FL, +3275,KD4EFM,Evans,FL, +3278,KD4EFM,Evans,FL, +3279,N4KEG,Richard,, +3280,KD4EFM,Evans,"Lakeland, Florida",work radio +3280,KD4EFM,Evans,FL,Evans Mobile(s) +3280,KD4EFM,Evans,FL, +3281,N4KEG,Richard,, +3450,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",My Portable +3451,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",My Base Station +3452,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",Mobile Radio +4020,K4XXX,Ed,"London, KY",NX820 Base +4802,hb3yrb,Alex,Verbier,nx5300 +4804,hb9fmf,Didier,Rougemont,NX5300 +5001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-820" +5002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-720" +5003,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-820" +5004,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-720" +5005,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR" +5006,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR" +5007,N5LKE,James,AR,"N5LKE, James Ferguson, Searcy, AR - Kenwood NX-800" +5008,AF5WN,Mason,AR,"AF5WN, Mason Creager, Cabot, AR - Kenwood NX-700H" +5009,KJ5SF,Stan,AR,"KJ5SF, Stan Rongey, Searcy, AR - Kenwood NX-800" +5100,K5SRS,Michael Smith,"Fayetteville, AR",NX-5800 Mobile +5101,KC5YQB,Paul Blair,"Fayetteville, AR", +5125,AE5OQ,Armstead,"Higden, AR", +5125,AE5OQ,Armstead,AR,entered by k1iff +5134,AE5OQ,Armstead,AR,"AE5OQ, Armstead M Feland, IV, Higdon, AR - Kenwood NX-200" +5150,WY6NN,Doug,"Los Angeles, CA",NX-300/5300 +5151,KC6HFJ,Tamara,"Los Angeles, CA",NX-300 +5170,K5WMZ,Gary,AR,"K5WMZ, Gary D Partlow, Ward, AR - Kenwood NX-700" +5599,W1ZM,Ryan,,"W1ZM, Ryan Nelson, NX-5300" +5987,W5ZN,Joel,AR,"W5ZN, Joel Harrison, Judsonia, AR - Kenwood NX-800" +6430,K4GFD,Norm,FL,Norm Greensboro Fla +6431,K4GFD,Norm,, +6432,K4GFD,Norm,, +6439,N4NKV,George,,George +6801,hb9vsd,relais de verbier,verbier, +6802,HB9YRB,Alex,Verbier, +6804,HB9FMF,Didier,Rougemont, +7737,N4NKV,George,,George +9834,VA7NY,PJ,,PJ +12002,W4KJP,Kevin,,KEVIN +12005,KD4TWJ,Dean,,Dean - Portable IC-F4161 +12006,W4MO,Stewart,,STEWART NX300 / 320 +12007,W4MO,Stewart,,STEWART NX800 +12010,kd4dwp,Ben,Orlando, +12013,K4NBC,Miguel Orama,"Palm Bay, Florida",Icom F4146DS UHF Portable +12014,K4NBC,Miguel Orama,"Palm Bay, Florida",Kenwood NX200 VHF HT +12015,K4NBC,K4NBC-Miguel UHF Mobile,"Palm Bay, Florida",Future UHF Mobile +12016,K4NBC,Miguel,"Palm Bay, Florida",M2 Icom F6061D +12017,N4JFZ,,, +12021,W4PJT,Paul,,Paul +12023,KD4NWL,John,,JOHN +12127,W4KDM,Rick,,Rick - Portable NX300 +12136,WA4KWK,John,,John F6121 +12200,NB9X,Paul,FL, +12201,NB9X,Paul,FL,PAUL +12202,NB9X,Paul,FL, +12203,NB9X,Paul,FL, +12204,WX3C,Juan Arias,Florida,Orlando metro +12204,NB9X,Paul,FL, +12210,N4APG,Bill,,Bill Pfost +12211,N4APG,Bill,,Bill Pfost +12212,N4APG,Bill,,Bill Pfost +12213,N4APG,Bill,,Bill Pfost +12214,N4APG,Bill,,Bill Pfost +12215,WA4ISB,Ed,,ED Mobile +12216,WA4ISB,Ed,, +12220,N4PK,Paul,,PAUK K. +12221,N4PK,Paul,, +12222,W4PJT,Paul,, +12223,W4PJT,Paul,, +12226,KI4SWY,William,, +12230,KQ4KX,Richard,,Richard Sharp +12231,KQ4KX,Richard,, +12234,KD4TWJ,Dean,EL98, +12235,N1IC,Nick,,Nic +12236,N1IC,Nick,, +12240,KR4X,Larry,, +12241,KR4X,Larry,, +12245,KD4ACG,Jason,"Hudson, FL",Icom Mobile +12245,KD4ACG,Jason,,JASON +12246,KD4ACG,Jason,"Hudson, FL",Icom Portable +12246,KD4ACG,Jason,,JASON +12247,K2MCI,,, +12250,KE4GYX,,, +12272,KE4OSL,,, +12273,KE4OSL,,, +12374,KF4I,Thom,,Thom Base +12375,KF4I,Thom,,Thom Mobile +12523,KM4JVE,Ana,,Ana - IC-F4161 +12577,N2DLX,Richard,,Rich Dunajewski NX-5800 +12604,K4CBN,Greg,,GREG +12605,K4CBN,Greg,, +12606,K4CBN,Greg,, +12607,K4CBN,Greg,, +12608,K4CBN,Greg,, +12666,KI4SWY,William,,William Stillwel ( All Radios ) +12691,KE3WDW,Sam,,Sam +12780,KC4YUA,Brett,,BRETT +13105,W7QO,Alan,, +13106,W7QO,Alan,, +13107,W7QO,Alan,, +13121,W4CML,Chuck,, +13122,W4CML,Chuck,, +13125,KD4APP,Don,,Don - NX300 +13126,KD4APP,Don,,Don - F6061D +13127,KD4APP,Don,,Don - NX200 +13131,W5JR,Mike,, +13132,W5JR,Mike,, +13401,W1KFR,Bill,,Bill +13815,KG4BKO,Bill,GA,nx320 +14020,K4XXX,Ed,"London, KY",NX5300 +14021,K4XXX,Ed,"London, KY",NX5200 +15001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-800H (Vehicle 1)" +15002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-700 (Vehicle 1)" +15003,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-800 (Vehicle 2)" +15004,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-700 (Vehicle 2)" +15005,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 1)" +15006,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 1)" +15007,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 2)" +15008,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 2)" +15009,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 3)" +15010,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 3)" +15011,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-800" +15012,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-800" +15013,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-700" +15014,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-700" +15015,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR Motorcycle Mobile" +15016,KG5KS,Kenny,,"KG5KS, Kenny Thompson - Kenwood NX-700HK" +15017,KG5KS,Kenny,,"KG5KS, Kenny Thompson - Kenwood NX-800HK" +15018,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR ATV Mobile" +15019,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR ATV Mobile" +15020,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR, Kenwood NX-700" +15021,KD5HRT,Heath,AR,"KD5HRT, Heath Taylor, McRae, AR, Kenwood NX-800" +15022,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-800" +15023,N5ZA,Joel,AR,"N5ZA, Joe Belew, Beebe, AR - Kenwood NX-700" +15024,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR NX-700" +15025,KE5YZP,Ryan,AR,"KE5YZP, Ryan Schwarck, Batesville, AR NX-700" +15026,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR" +15027,KB5RFF,Scott,AR,"KB5RFF, Scott Gray, Searcy, AR - Kenwood NX-800" +17002,KC9GMX,Stephen,,Stephen - Base F6121D +17004,KC9GMX,Stephen,,Stephen - F6061D +17005,KC9NPJ,Jarrett,,Jarrett F6121D +17006,KC9GMX,Stephen,,Stephen - F4161DS +17007,KC9NPJ,Jarrett,,Jarrett F4231DS +17008,KC9RHH,Jesse,,F4101D +17009,KC9PHK,Michael,,F4061DS +17011,N9BRG,Dan,,Dan kenwood nx800k2 +17855,AG6RN,Demian,CA,NX-210 +21007,WA1LMV,Rick,,Rick +21014,K2BUI,Eric,,Eric +24020,K4XXX,Ed,"London, KY",NX5800 +24021,K4XXX,Ed,"London, KY",NX5700 +25001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-300" +25002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-200" +25003,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-300" +25004,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-200" +25005,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-320" +25006,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-340U" +25007,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-300" +25008,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-200" +25009,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-300" +25010,KD5OOW,Tom,AR,"KD5OOW, Tom McGee, Searcy, AR - Kenwood NX-300" +25011,W5ZN,Joel,AR,"W5ZN, Joel Harrison, Judsonia, AR - Kenwood NX-300" +25012,KD5HRT,Heath,AR,"KD5HRT, Heath Taylor, McRae, AR - Kenwood NX-300" +25013,KK5WA,Darin,AR,"KK5WA, Darin Dykes, Beebe, AR - Kenwood NX-320" +25014,N5LKE,James,AR,"N5LKE, James Ferguson, Searcy, AR - Kenwood NX-5300" +25015,KJ5ORD,John,AR,"KJ5ORD, John Ord, Searcy, AR - Kenwood NX-300" +25016,KB5RFF,Scott,AR,"KB5RFF, Scott Gray, Searcy, AR - Kenwood NX-300" +25017,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-320" +25018,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-340" +25019,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-340" +25020,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-320" +25021,KE5UZU,Raymond Prince,"England, AR",Kenwood Handheld +25021,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR" +25022,KE5UZU,Raymond Prince,"England, AR",Icom Handheld +25022,KE5YZP,Ryan,AR,"KE5YZP, Ryan A Schwarck, Batesville, AR - Icom" +25023,KE5YZP,Ryan,AR,"KE5YZP, Ryan A Schwarck, Batesville, AR - Icom" +25024,KG5CHM,Colt,AR,"KG5CHM, Colt Boyd, Searcy, AR - Kenwood NX-300" +25025,KJ5ORD,John,AR,"KJ5ORD, John Ord, Searcy, AR - Kenwood NX-xxx VHF" +25026,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-320" +25027,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR - Kenwood NX-200" +25028,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-220" +25029,KF5WHX,Trey,AR,"KF5WHX, Trey Ferguson, Searcy, AR - Kenwood NX-320" +25030,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR" +25031,KJ5SF,Stan,AR,"KJ5SF, Stan Rongey, Searcy, AR - Kenwood NX-340" +25032,KC5DFH,Kirk,AR,"KC5DFH, Kirk Williams, Searcy, AR - Kenwood NX-340" +25033,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR, Icom F4161DS" +25034,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR - ICOM 4161" +25035,KG5BMB,Glenda,AR,"KG5BMB, Glenda McCord, Searcy, AR, Icom F4161DS" +25039,KC1JET,Jim,,JIM (BASE) +25068,N1QD,Joe,, +25069,N1COP,Bob,,Bob +25070,WD1L,John,,John +25125,N1TI,Tim,"Mattapoisett, MA", +25125,N1TI,Tim,"Mattapoisett, MA", +25144,W1WCF,Walter,,Walter +25221,N0XIA,James,,James - Kenwood Mobile and Portable +25222,KE4SDC,Ron,,Ron - Portable NX300 +25246,WG1U,Ken,"Assonet, MA", +25333,W1AKN,Jack,,Jack Mobile +25390,KC1JET,Jim,,JIM (MOBILE) +25390,KC1JET,Jim,,JIM +25444,W1TAV,Steve,,Steve +25555,WA1MNQ,Mike,,Mike +25582,N1KXJ,Ray,"E. Bridgewater, MA.",Port. +25582,N1KXJ,Ray Wall,East Bridgewater, +25585,N1AVA,Ken Howland,"DARTMOUTH,MA", +25700,NN1D,Tony Souza,"Swansea, MA", +25740,WG1U,Kenny,,KEN +25743,WG1U,Kenny,,KEN +25746,N1OTY,John,,JOHN +25777,W1BON,Bump,,Bump +25830,KB1CHU,Steve,MA, +25863,N1ZZN,Jeff,,JEFF +25874,KB1KVD,Jason,,Jason - Icom Mob & Port +25888,K1WGU,Bob,,Bob +25889,AB1CQ,Gary,,Gary +25900,N1ZZR,Matt,,Matt - mobile +25901,N1MRC,Matt,"Bridgewater, MA",N1MRC P-1 +25901,N1ZZR,Matt,,Matt +25957,KC1HO,Steve,,STEVE +27101,KI4SWB,Mark,"Melbourne Beach, FL",Icom Portable +27102,KP4OO,Carlos,"Palm Bay, FL",Icom Portable +27201,KI4SWB,Mark,"Melbourne Beach, FL",Icom Mobile +27202,KP4OO,Carlos,"Palm Bay, FL",Icom Mobile +28001,K3KRS,rYAN,CLEVLAND,OHIO +30505,KG6MQE,Jim,MT, +30571,WX4RCF,Ryan F.,"Tampa, FL", +31117,K4QHR,Pete,,Pete +31124,KM4JXP,Peter,,NX5300 +31146,KD2KWD,Michael Santamaria,"Brandon, FL",Kenwood +33000,N1PA-R,Paul,NH,PAUL - NEW HAMPSHIRE REPEATER +33001,N1PA,Paul,NH,PAUL - NEW HAMPSHIRE +33002,N1PA,Paul,NH,PAUL - NEW HAMPSHIRE +34001,N2WNS,Bill,NJ,N2WNS Portable +34002,N2WNS,Bill,NJ,N2WNS Base +36001,W2CCR,Chris,NY,"Chris, Galway, NY NX300" +36002,KC2VOB,Asad,NY,"Asad, NYC, NX-5800" +36003,KC2VOB,Asad,NY,"Asad, NYC, NX-300GK" +36134,N2SRO,Mike,"Pitman, NJ",Portable +37001,KA4YMY,Steve,NC,"Steve, Charlotte, NC NX320" +37009,KA4YMY,Steve,"Charlotte, NC", +37010,KA4YMY,Steve,"Charlotte, NC", +37010,KA4YMY,Steve,"Charlotte, NC", +40024,N5YEI,Jeff Dalrymple,"Jay, Oklahoma",NX-5800 Mobile +40124,N5YEI,Jeff Dalrymple,"Jay, Oklahoma",NX-5300 Portable +43751,N4IRS,Steve,,Steve +44001,K2BUI,Eric,RI, +44002,K2BUI,Eric,"Providence, RI", +44007,W2DAN,Dave,,Dave - NX700 +44298,N1JBC,Jed,,JED +49101,WX7Y-1,Bret Mills,Castle Dale Utah,WX7y-1 Hand Held 1 +49102,WX7Y-2,Bret Mills,"Caslte Dale, Utah",WX7Y-2 Hand held +49104,WX7Y-4,Bret Mills,"Castle Dale, Utah",WX7Y-4 Mobile +49106,WX7Y-6,Bret Mills,Castle Dale,WX7Y-6 Mobile +55700,WB9HKE,Rick,WI, +55704,WB9HKE,Rick,WI, +57000,VE3SP,Andre,"Toronto, ON",mobile +57001,VE3SP,Andre,"Toronto, ON",handheld +57001,VE3EI,Eric,,Eric - Portable +57002,VE3OKZ,Janusz,"Toronto, ON",mobile +57002,VE3EI,Eric,,Eric - Dongle +57003,VE3OKZ,Janusz,"Toronto, ON",handheld +57004,VE3CCD,Curtis,"Scarborough, ON",handheld +57005,VE3NBI,Anoop,"Scarborough, ON",handheld +57006,VE3JLU,Sherwin,"Scarborough, ON",handheld +57007,va3rq,Jon,"Oakville, ON",handheld +57008,ve3ogb,Randy,"Toronto, ON",handheld +57009,va3mk,Mark,"Oakville, ON",handheld +57010,va3mk,Mark,"Oakville, ON",mobile +57011,VA3WZW,Andre,"Durham, ON",mobile +57012,VA3WZW,Andre,"Durham, ON",mobile +57013,VA3AGV,cottage,"Toronto, ON",mobile +57014,VE3BWP,Brian,"Caledon, ON",handheld +57015,VE3HY,Frank,"Caledon, ON",handheld +57016,VE3UBI,Paul,"Scarborough, ON",mobile +57017,VE3UBI,Paul,"Scarborough, ON",handheld +57018,VE3RZR,Richard,"Toronto, ON",handheld +57019,VE3AEP,Dom,"Toronto, ON",mobile +57020,VA3PEO,Adrian,"Toronto, ON",handheld +57021,va3wjo,Walter,"Toronto, ON",handheld +57022,ve3fkn,Tom,"Stoney Creek, ON",handheld +57023,ve3ips,John,"Toronto, ON",handheld +57024,VA3CQA,Brian,"Scarborough, ON",handheld +57025,VA3PAD,Andrew,"Scarborough, ON",mobile +57026,VA3PAD,Andrew,"Scarborough, ON",handheld +57027,VA3VAD,Arpad,"Hamilton, ON",handheld +57028,VA3KY,Shelly,"Thornhill, ON",mobile +57029,VA3KY,Shelly,"Thornhill, ON",handheld +57030,VE3KFQ,Doug,"Toronto, ON",mobile +57031,VE3KFQ,Doug,"Toronto, ON",handheld +57032,VE3AEP,Dom 2,"Toronto, ON",handheld +57033,VE3DJZ,Huey,"Hamilton, ON",mobile +57034,VE3DJZ,Huey,"Hamilton, ON",handheld +57035,VA3RQ,Jon,Oakville ON,Mobile +3106418,N5ICK,Nicholas Nixon,"Rialto, Ca", +3112205,N2HUC,Phil Roberts,"Port St. Lucie, FL",DV4MINI AMBE voice +3118365,NA9VY,Chris Gilbert,"New Palestine, IN", +3118366,N9UMJ,Rick Nicholson,Buddha Indiana, +3142058,N3BAH,L. Abraham Smith,Southwestern Pennsylvania, diff --git a/NXDNLookup.cpp b/NXDNLookup.cpp index 7cfc152..2c621b6 100644 --- a/NXDNLookup.cpp +++ b/NXDNLookup.cpp @@ -137,10 +137,12 @@ bool CNXDNLookup::load() if (p1 != NULL && p2 != NULL) { unsigned int id = (unsigned int)::atoi(p1); - for (char* p = p2; *p != 0x00U; p++) - *p = ::toupper(*p); + if (id > 0U) { + for (char* p = p2; *p != 0x00U; p++) + *p = ::toupper(*p); - m_table[id] = std::string(p2); + m_table[id] = std::string(p2); + } } } diff --git a/nxuid_export.csv b/nxuid_export.csv deleted file mode 100644 index d1e2d1a..0000000 --- a/nxuid_export.csv +++ /dev/null @@ -1,404 +0,0 @@ -UID,Call,Name,Location,Notes,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12246,KD4ACG,Jason,"Hudson, FL",Icom Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12245,KD4ACG,Jason,"Hudson, FL",Icom Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25068,N1QD,Joe,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12204,WX3C,Juan Arias,Florida,Orlando metro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6801,hb9vsd,relais de verbier,verbier,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57035,VA3RQ,Jon,Oakville ON,Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -74,N2IXC,Ed,Chatsworth NJ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3452,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",Mobile Radio,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3451,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",My Base Station,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3450,K0KAD,CHAD TAYLOR,"SPOKANE VALLEY, WA",My Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12016,K4NBC,Miguel,"Palm Bay, Florida",M2 Icom F6061D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57034,VE3DJZ,Huey,"Hamilton, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57033,VE3DJZ,Huey,"Hamilton, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57032,VE3AEP,Dom 2,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57031,VE3KFQ,Doug,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57030,VE3KFQ,Doug,"Toronto, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57029,VA3KY,Shelly,"Thornhill, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57028,VA3KY,Shelly,"Thornhill, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57027,VA3VAD,Arpad,"Hamilton, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57026,VA3PAD,Andrew,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57025,VA3PAD,Andrew,"Scarborough, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57024,VA3CQA,Brian,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57023,ve3ips,John,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57022,ve3fkn,Tom,"Stoney Creek, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57021,va3wjo,Walter,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57020,VA3PEO,Adrian,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57019,VE3AEP,Dom,"Toronto, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57018,VE3RZR,Richard,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57017,VE3UBI,Paul,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57016,VE3UBI,Paul,"Scarborough, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57015,VE3HY,Frank,"Caledon, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57014,VE3BWP,Brian,"Caledon, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57013,VA3AGV,cottage,"Toronto, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57012,VA3WZW,Andre,"Durham, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57011,VA3WZW,Andre,"Durham, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57010,va3mk,Mark,"Oakville, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57009,va3mk,Mark,"Oakville, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57008,ve3ogb,Randy,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57007,va3rq,Jon,"Oakville, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57006,VE3JLU,Sherwin,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57005,VE3NBI,Anoop,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57004,VE3CCD,Curtis,"Scarborough, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57003,VE3OKZ,Janusz,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57002,VE3OKZ,Janusz,"Toronto, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57001,VE3SP,Andre,"Toronto, ON",handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57000,VE3SP,Andre,"Toronto, ON",mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25901,N1MRC,Matt,"Bridgewater, MA",N1MRC P-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -4020,K4XXX,Ed,"London, KY",NX820 Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -24020,K4XXX,Ed,"London, KY",NX5800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -24021,K4XXX,Ed,"London, KY",NX5700,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -14020,K4XXX,Ed,"London, KY",NX5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -14021,K4XXX,Ed,"London, KY",NX5200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1066,KM4JXP,Peter Tasker,Longboat Key,NX5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -995,K1IFF/Base,Cliff,"Brsitol, CT",NXR710 link radio,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -28001,K3KRS,rYAN,CLEVLAND,OHIO,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1954,W4BPT,BILLY TAYLOR,"RINGGOLD,GA.",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5101,KC5YQB,Paul Blair,"Fayetteville, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5100,K5SRS,Michael Smith,"Fayetteville, AR",NX-5800 Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -40124,N5YEI,Jeff Dalrymple,"Jay, Oklahoma",NX-5300 Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -40024,N5YEI,Jeff Dalrymple,"Jay, Oklahoma",NX-5800 Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1997,KC1AJR,Giovanni,East Hampton CT,kenwood NX800 K2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -9,KE8BGA,Lowell Katz,"Cleveland, Ohio","on the north shore, NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12015,K4NBC,K4NBC-Miguel UHF Mobile,"Palm Bay, Florida",Future UHF Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12014,K4NBC,Miguel Orama,"Palm Bay, Florida",Kenwood NX200 VHF HT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12013,K4NBC,Miguel Orama,"Palm Bay, Florida",Icom F4146DS UHF Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -30571,WX4RCF,Ryan F.,"Tampa, FL",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -27202,KP4OO,Carlos,"Palm Bay, FL",Icom Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -27102,KP4OO,Carlos,"Palm Bay, FL",Icom Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -27201,KI4SWB,Mark,"Melbourne Beach, FL",Icom Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -27101,KI4SWB,Mark,"Melbourne Beach, FL",Icom Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -49106,WX7Y-6,Bret Mills,Castle Dale,WX7Y-6 Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -49104,WX7Y-4,Bret Mills,"Castle Dale, Utah",WX7Y-4 Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -49102,WX7Y-2,Bret Mills,"Caslte Dale, Utah",WX7Y-2 Hand held,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -49101,WX7Y-1,Bret Mills,Castle Dale Utah,WX7y-1 Hand Held 1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6802,HB9YRB,Alex,Verbier,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6804,HB9FMF,Didier,Rougemont,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12234,KD4TWJ,Dean,EL98,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -980,W1RHS,Rick,Connecticut,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3112205,N2HUC,Phil Roberts,"Port St. Lucie, FL",DV4MINI AMBE voice,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -31146,KD2KWD,Michael Santamaria,"Brandon, FL",Kenwood,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -4804,hb9fmf,Didier,Rougemont,NX5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -4802,hb3yrb,Alex,Verbier,nx5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1966,ZS6IIX,Henry,Petit South Africa,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5151,KC6HFJ,Tamara,"Los Angeles, CA",NX-300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5150,WY6NN,Doug,"Los Angeles, CA",NX-300/5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5125,AE5OQ,Armstead,"Higden, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3280,KD4EFM,Evans,"Lakeland, Florida",work radio,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25585,N1AVA,Ken Howland,"DARTMOUTH,MA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25582,N1KXJ,Ray,"E. Bridgewater, MA.",Port.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3118365,NA9VY,Chris Gilbert,"New Palestine, IN",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3142058,N3BAH,L. Abraham Smith,Southwestern Pennsylvania,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3118366,N9UMJ,Rick Nicholson,Buddha Indiana,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3106418,N5ICK,Nicholas Nixon,"Rialto, Ca",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -141,KF2M,Greg Popovich,"Mt Laurel, NJ",IC-F4161DT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -37009,KA4YMY,Steve,"Charlotte, NC",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -37010,KA4YMY,Steve,"Charlotte, NC",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25022,KE5UZU,Raymond Prince,"England, AR",Icom Handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25021,KE5UZU,Raymond Prince,"England, AR",Kenwood Handheld,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3079,NN4TT,Dave,Orlando,NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25125,N1TI,Tim,"Mattapoisett, MA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25246,WG1U,Ken,"Assonet, MA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25125,N1TI,Tim,"Mattapoisett, MA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -37010,KA4YMY,Steve,"Charlotte, NC",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -7,F1PRY,Emmanuel,BEAUVAIS FR,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25700,NN1D,Tony Souza,"Swansea, MA",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1008,DK6PX,Stefan,Germany nr Bad Toelz,Coming up FR6000,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25582,N1KXJ,Ray Wall,East Bridgewater,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17,KC2SNI,Jim Hannon,"West Berlin, New Jersey",My Radio is an Icom IC-3161DT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -80,W2FLY/M,Harry,Southern NJ,VHF NX-5700 mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -88,W2FLY/P,Harry,Southern NJ,VHF NX-220 portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -85,W2FLY/M,Harry,Southern NJ,VHF NX_700 van,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -86,W2FLY,Harry,"Mullica Hill, NJ",VHF NX-700 base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -87,W2FLY/M,Harry,Southern NJ,VHF NX-700 mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -82,W2FLY/P,Harry,"Somers Point, NJ",VHF NX-700 Shore Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -89,WB2RUH,Bruce,Vineland NJ,VHF NX-700 base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -26,WB2RUH/M,Bruce,Southern NJ,UHF NX-800 mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25,WB2RUH/P,Bruce,Southern NJ,UHF NX-320,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -8,W2FLY/P,Harry,Southern NJ,UHF NX-820 Port 2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -4,W2FLY/M,Harry,Southern NJ,UHF NX-800 Van,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -2,W2FLY/M,Harry,Southern NJ,UHF NX-800 mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3,WB2OOM/M,Tina,Southern NJ,UHF NX-800 Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -76,W2FLY/P,Harry,Southern NJ,UFH NX5300 Port 1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -77,W2FLY/P,Harry,"Somers Point, NJ",UHF NX-800 Shore Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -78,W2FLY,Harry,"Mullica Hill, NJ",UHF NX-800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -79,W2FLY/M,Harry,Southern NJ,UHF NX-5800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -36134,N2SRO,Mike,"Pitman, NJ",Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -134,N2SRO,Mike,Pitman,Mobile Radio,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5125,AE5OQ,Armstead,AR,entered by k1iff,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25830,KB1CHU,Steve,MA,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12010,kd4dwp,Ben,Orlando,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -972,N1ODJ,Kenny Schmitz,Middletown,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -909,AB1UB V,Woody,"Bristol, CT",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1956,KC7SDD,Dana Hanford,"Bainbridge Island, WA","Member BARC, W7NPC.org",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1963,N5JRN,David Barts,"Bainbridge Island, WA","Handheld, Icom 4161",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -44002,K2BUI,Eric,"Providence, RI",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -30505,KG6MQE,Jim,MT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17855,AG6RN,Demian,CA,NX-210,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13815,KG4BKO,Bill,GA,nx320,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -973,W1VLF,Paul,CT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1010,KE4GWW,James,AL,NX800 Mobile#2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1009,KE4GWW,James,AL,NX800 Mobile#1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1008,KE4GWW,James,AL,NX700 Mobile#2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1006,KE4GWW,James,AL,NX800 Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1005,KE4GWW,James,AL,NX700 Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1004,KE4GWW,James,AL,NX300 Portable #2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1003,KE4GWW,James,AL,NX300 Portable #1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1002,KE4GWW,James,AL,NX200 Portable #2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1001,KE4GWW,James,AL,NX200 Portable #1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -971,N1ELE,Paul,CT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -970,KB1VRI,Nick,CT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -1007,KE4GWW,James M. Nelson,"Dothan, AL",NX700 Mobile#1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -909,AB1UB,Woody,"Bristol, CT",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -952,K1KGQ,Joel,CT,Truck radio,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -134,N2SRO,Mike,NJ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -55704,WB9HKE,Rick,WI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -55700,WB9HKE,Rick,WI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -44001,K2BUI,Eric,RI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57002,VE3EI,Eric,,Eric - Dongle,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -57001,VE3EI,Eric,,Eric - Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -44298,N1JBC,Jed,,JED,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -44007,W2DAN,Dave,,Dave - NX700,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -43751,N4IRS,Steve,,Steve,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -37001,KA4YMY,Steve,NC,"Steve, Charlotte, NC NX320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -36003,KC2VOB,Asad,NY,"Asad, NYC, NX-300GK",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -36002,KC2VOB,Asad,NY,"Asad, NYC, NX-5800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -36001,W2CCR,Chris,NY,"Chris, Galway, NY NX300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -34002,N2WNS,Bill,NJ,N2WNS Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -34001,N2WNS,Bill,NJ,N2WNS Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -33002,N1PA,Paul,NH,PAUL - NEW HAMPSHIRE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -33001,N1PA,Paul,NH,PAUL - NEW HAMPSHIRE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -33000,N1PA-R,Paul,NH,PAUL - NEW HAMPSHIRE REPEATER,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -31117,K4QHR,Pete,,Pete,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25957,KC1HO,Steve,,STEVE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25901,N1ZZR,Matt,,Matt,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25900,N1ZZR,Matt,,Matt - mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25889,AB1CQ,Gary,,Gary,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25888,K1WGU,Bob,,Bob,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25874,KB1KVD,Jason,,Jason - Icom Mob & Port,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25863,N1ZZN,Jeff,,JEFF,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25777,W1BON,Bump,,Bump,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25746,N1OTY,John,,JOHN,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25743,WG1U,Kenny,,KEN,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25740,WG1U,Kenny,,KEN,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25555,WA1MNQ,Mike,,Mike,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25444,W1TAV,Steve,,Steve,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25390,KC1JET,Jim,,JIM (MOBILE),,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25390,KC1JET,Jim,,JIM,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25333,W1AKN,Jack,,Jack Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25222,KE4SDC,Ron,,Ron - Portable NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25221,N0XIA,James,,James - Kenwood Mobile and Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25144,W1WCF,Walter,,Walter,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25070,WD1L,John,,John,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25069,N1COP,Bob,,Bob,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25039,KC1JET,Jim,,JIM (BASE),,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25035,KG5BMB,Glenda,AR,"KG5BMB, Glenda McCord, Searcy, AR, Icom F4161DS",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25034,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR - ICOM 4161",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25033,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR, Icom F4161DS",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25032,KC5DFH,Kirk,AR,"KC5DFH, Kirk Williams, Searcy, AR - Kenwood NX-340",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25031,KJ5SF,Stan,AR,"KJ5SF, Stan Rongey, Searcy, AR - Kenwood NX-340",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25030,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25029,KF5WHX,Trey,AR,"KF5WHX, Trey Ferguson, Searcy, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25028,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-220",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25027,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR - Kenwood NX-200",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25026,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25025,KJ5ORD,John,AR,"KJ5ORD, John Ord, Searcy, AR - Kenwood NX-xxx VHF",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25024,KG5CHM,Colt,AR,"KG5CHM, Colt Boyd, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25023,KE5YZP,Ryan,AR,"KE5YZP, Ryan A Schwarck, Batesville, AR - Icom",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25022,KE5YZP,Ryan,AR,"KE5YZP, Ryan A Schwarck, Batesville, AR - Icom",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25021,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25020,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25019,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-340",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25018,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-340",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25017,KB5ZUH,Todd,AR,"KB5ZUH, Todd Williams, Searcy, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25016,KB5RFF,Scott,AR,"KB5RFF, Scott Gray, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25015,KJ5ORD,John,AR,"KJ5ORD, John Ord, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25014,N5LKE,James,AR,"N5LKE, James Ferguson, Searcy, AR - Kenwood NX-5300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25013,KK5WA,Darin,AR,"KK5WA, Darin Dykes, Beebe, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25012,KD5HRT,Heath,AR,"KD5HRT, Heath Taylor, McRae, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25011,W5ZN,Joel,AR,"W5ZN, Joel Harrison, Judsonia, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25010,KD5OOW,Tom,AR,"KD5OOW, Tom McGee, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25009,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25008,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-200",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25007,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25006,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-340U",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25005,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-320",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25004,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-200",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25003,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-200",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -25001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -21014,K2BUI,Eric,,Eric,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -21007,WA1LMV,Rick,,Rick,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17011,N9BRG,Dan,,Dan kenwood nx800k2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17009,KC9PHK,Michael,,F4061DS,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17008,KC9RHH,Jesse,,F4101D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17007,KC9NPJ,Jarrett,,Jarrett F4231DS,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17006,KC9GMX,Stephen,,Stephen - F4161DS,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17005,KC9NPJ,Jarrett,,Jarrett F6121D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17004,KC9GMX,Stephen,,Stephen - F6061D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -17002,KC9GMX,Stephen,,Stephen - Base F6121D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15027,KB5RFF,Scott,AR,"KB5RFF, Scott Gray, Searcy, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15026,AF5OD,Landon,AR,"AF5OD, Landon McCord, Searcy, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15025,KE5YZP,Ryan,AR,"KE5YZP, Ryan Schwarck, Batesville, AR NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15024,KF5TPF,Ryan,AR,"KF5TPF, Ryan Nelson, Edgemont, AR NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15023,N5ZA,Joel,AR,"N5ZA, Joe Belew, Beebe, AR - Kenwood NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15022,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15021,KD5HRT,Heath,AR,"KD5HRT, Heath Taylor, McRae, AR, Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15020,WA8UBL,Allen,AR,"WA8UBL, Allen Herrick, Beebe, AR, Kenwood NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15019,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR ATV Mobile",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15018,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR ATV Mobile",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15017,KG5KS,Kenny,,"KG5KS, Kenny Thompson - Kenwood NX-800HK",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15016,KG5KS,Kenny,,"KG5KS, Kenny Thompson - Kenwood NX-700HK",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15015,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR Motorcycle Mobile",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15014,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15013,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15012,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15011,N5QT,Dawn,AR,"N5QT, Dawn Gray, Searcy, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15010,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 3)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15009,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 3)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15008,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 2)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15007,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 2)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15006,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-700 (Vehicle 1)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15005,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-800 (Vehicle 1)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15004,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-700 (Vehicle 2)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15003,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-800 (Vehicle 2)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-700 (Vehicle 1)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -15001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-800H (Vehicle 1)",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13401,W1KFR,Bill,,Bill,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13132,W5JR,Mike,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13131,W5JR,Mike,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13127,KD4APP,Don,,Don - NX200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13126,KD4APP,Don,,Don - F6061D,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13125,KD4APP,Don,,Don - NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13122,W4CML,Chuck,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13121,W4CML,Chuck,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13107,W7QO,Alan,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13106,W7QO,Alan,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -13105,W7QO,Alan,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12780,KC4YUA,Brett,,BRETT,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12691,KE3WDW,Sam,,Sam,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12666,KI4SWY,William,,William Stillwel ( All Radios ),,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12608,K4CBN,Greg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12607,K4CBN,Greg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12606,K4CBN,Greg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12605,K4CBN,Greg,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12604,K4CBN,Greg,,GREG,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12577,N2DLX,Richard,,Rich Dunajewski NX-5800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12523,KM4JVE,Ana,,Ana - IC-F4161,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12375,KF4I,Thom,,Thom Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12374,KF4I,Thom,,Thom Base,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12273,KE4OSL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12272,KE4OSL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12250,KE4GYX,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12247,K2MCI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12246,KD4ACG,Jason,,JASON,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12245,KD4ACG,Jason,,JASON,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12241,KR4X,Larry,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12240,KR4X,Larry,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12236,N1IC,Nick,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12235,N1IC,Nick,,Nic,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12231,KQ4KX,Richard,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12230,KQ4KX,Richard,,Richard Sharp,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12226,KI4SWY,William,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12223,W4PJT,Paul,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12222,W4PJT,Paul,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12221,N4PK,Paul,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12220,N4PK,Paul,,PAUK K.,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12216,WA4ISB,Ed,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12215,WA4ISB,Ed,,ED Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12214,N4APG,Bill,,Bill Pfost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12213,N4APG,Bill,,Bill Pfost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12212,N4APG,Bill,,Bill Pfost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12211,N4APG,Bill,,Bill Pfost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12210,N4APG,Bill,,Bill Pfost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12204,NB9X,Paul,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12203,NB9X,Paul,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12202,NB9X,Paul,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12201,NB9X,Paul,FL,PAUL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12200,NB9X,Paul,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12136,WA4KWK,John,,John F6121,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12127,W4KDM,Rick,,Rick - Portable NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12023,KD4NWL,John,,JOHN,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12021,W4PJT,Paul,,Paul,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12017,N4JFZ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12007,W4MO,Stewart,,STEWART NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12006,W4MO,Stewart,,STEWART NX300 / 320,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12005,KD4TWJ,Dean,,Dean - Portable IC-F4161,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -12002,W4KJP,Kevin,,KEVIN,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -9834,VA7NY,PJ,,PJ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -7737,N4NKV,George,,George,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6439,N4NKV,George,,George,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6432,K4GFD,Norm,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6431,K4GFD,Norm,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -6430,K4GFD,Norm,FL,Norm Greensboro Fla,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5987,W5ZN,Joel,AR,"W5ZN, Joel Harrison, Judsonia, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5599,W1ZM,Ryan,,"W1ZM, Ryan Nelson, NX-5300",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5170,K5WMZ,Gary,AR,"K5WMZ, Gary D Partlow, Ward, AR - Kenwood NX-700",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5134,AE5OQ,Armstead,AR,"AE5OQ, Armstead M Feland, IV, Higdon, AR - Kenwood NX-200",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5009,KJ5SF,Stan,AR,"KJ5SF, Stan Rongey, Searcy, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5008,AF5WN,Mason,AR,"AF5WN, Mason Creager, Cabot, AR - Kenwood NX-700H",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5007,N5LKE,James,AR,"N5LKE, James Ferguson, Searcy, AR - Kenwood NX-800",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5006,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5005,AC5AV,Larry,AR,"AC5AV, Larry Sicks, Searcy, AR",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5004,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-720",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5003,N5QS,Roger,AR,"N5QS, Roger Gray, Searcy, AR - Kenwood NX-820",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5002,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-720",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -5001,N5QZ,Ryan,AR,"N5QZ, Ryan McAfee, Searcy, AR - Kenwood NX-820",,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3281,N4KEG,Richard,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3280,KD4EFM,Evans,FL,Evans Mobile(s),,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3280,KD4EFM,Evans,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3279,N4KEG,Richard,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3278,KD4EFM,Evans,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3275,KD4EFM,Evans,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3274,KD4EFM,Evans,FL,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3271,N4KEG,Richard,,RICHARD - Mobile and or ht's N4KEG (UHF),,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3083,KD4TWJ,Dean,,Dean - Mobile NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3082,W4LOV,Mike,,Mike - Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3081,W4MCA,Michael,,Michael - NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3079,W4ORL,Ralph,,Ralph - Portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3075,W4LOV,Mike,,Mike - NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3074,W4MCA,Michael,,Michael - NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3072,N4JTK,John,,John - NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3071,W4LOV,Mike,,Mike - NX800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -3070,W4ORL,Ralph,,Ralph - Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -970,KB1VRI,Nick,,Nick,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -963,N1MAT,Dennis,,Dennis F4161,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -962,N1MAT,Dennis,,Dennis F4161,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -961,WA1SSB,Joe,,Joe NX800H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -960,K1ZXX,Gary,,Gary - Icom All radios,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -959,K1KGQ,Joel,,Future,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -958,K1KGQ,Joel,,Joel F4161,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -957,K1KGQ,Joel,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -956,K1KGQ,Joel,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -955,K1KGQ,Joel,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -954,K1KGQ,Joel,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -953,K1KGQ,Joel,,Joel NX320-1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -952,K1GML,Gail,,Gail NX800H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -951,K1KGQ,Joel,,Joel NX800H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -936,W1GPO,John,,NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -931,K1IFF,Cliff,CT,NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -930,K1IFF,Cliff,CT,NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -928,N1XDN,Bob,CT,Icom portable,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -926,N1XDN,Bob,CT,Bob M1 UHF NX-5800,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -925,N1XDN,Bob,CT,Bob P2 VHF NX-5200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -924,N1XDN,Bob,CT,Bob P3 UHF NX-5300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -923,N1XDN,Bob,CT,Bob M1 VHF NX700,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -922,N1XDN,Bob,CT,Bob P2 UHF NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -921,N1XDN,Bob,CT,Bob P1 VHF NX220,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -920,N1XDN,Bob,CT,Bob P1 UHF NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -912,W4CCL,Chuck,,CHUCK,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -911,W4CLL,Chuck,,CHUCK,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -910,W4CLL,Chuck,,CHUCK,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -909,AB1UB,Woody,,Woody NX300,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -909,W4CCL,Chuck,,CHUCK,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -908,W4CLL,Chuck,,CHUCK,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -907,K1IFF,Cliff,CT,Future,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -906,K1IFF,Cliff,CT,Cliff NX200,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -905,WA1LMV,Rick,,Rick NX320,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -903,K1IFF,Cliff,CT,Cliff NX800H,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -902,K1IFF,Cliff,CT,Cliff NX320 - demo,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -901,K1IFF,Cliff,CT,Cliff NX320,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -401,W1KFR,Bill,,Bill,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -99,K1ZSG,Don,,Mobile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -30,KD4MOJ,Doug,,Doug,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, From 9fcc4b59ebf1c281ebb21096760a2bbf8f548760 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 6 Feb 2018 19:00:01 +0000 Subject: [PATCH 4/5] Fix outgoing NXDN networking. --- NXDNControl.cpp | 28 ++++++++++++++++------------ NXDNControl.h | 2 +- NXDNNetwork.cpp | 22 +++++++++++++++------- NXDNNetwork.h | 5 +++-- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 4eeea24..4023dc6 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -230,7 +230,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(data + 2U); - // writeNetwork(data, m_rfFrames, ); + writeNetwork(data, false); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -401,7 +401,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(start + 2U); - // writeNetwork(start, m_rfFrames, ); + writeNetwork(start, false); #if defined(DUMP_NXDN) writeFile(start + 2U); @@ -515,7 +515,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne scrambler(data + 2U); - // writeNetwork(data, m_rfFrames, ); + writeNetwork(data, false); #if defined(DUMP_NXDN) writeFile(data + 2U); @@ -575,6 +575,9 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) LogMessage("NXDN, received RF data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames); + m_rfLayer3 = layer3; + m_rfFrames = 0U; + m_rfState = RS_RF_DATA; #if defined(DUMP_NXDN) @@ -607,21 +610,20 @@ bool CNXDNControl::processData(unsigned char option, unsigned char *data) scrambler(data + 2U); - writeQueueNet(data); + writeNetwork(data, true); if (m_duplex) writeQueueRF(data); + m_rfFrames++; + #if defined(DUMP_NXDN) writeFile(data + 2U); #endif - if (validUDCH) { - unsigned char type = layer3.getMessageType(); - if (type == NXDN_MESSAGE_TYPE_TX_REL) { - LogMessage("NXDN, ended RF data transmission"); - writeEndRF(); - } + if (data[0U] == TAG_EOT) { + LogMessage("NXDN, ended RF data transmission"); + writeEndRF(); } return true; @@ -753,7 +755,7 @@ void CNXDNControl::writeQueueNet(const unsigned char *data) m_queue.addData(data, len); } -void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count, bool end) +void CNXDNControl::writeNetwork(const unsigned char *data, bool dat) { assert(data != NULL); @@ -767,7 +769,9 @@ void CNXDNControl::writeNetwork(const unsigned char *data, unsigned int count, b unsigned short dstId = m_rfLayer3.getDestinationGroupId(); bool grp = m_rfLayer3.getIsGroup(); - m_network->write(data + 2U, srcId, grp, dstId, count % 256U, end); + bool end = data[0U] == TAG_EOT; + + m_network->write(data + 2U, srcId, grp, dstId, dat, m_rfFrames, end); } void CNXDNControl::scrambler(unsigned char* data) const diff --git a/NXDNControl.h b/NXDNControl.h index 5f000e7..d0934b6 100644 --- a/NXDNControl.h +++ b/NXDNControl.h @@ -86,7 +86,7 @@ private: void writeQueueRF(const unsigned char* data); void writeQueueNet(const unsigned char* data); - void writeNetwork(const unsigned char* data, unsigned int count, bool end); + void writeNetwork(const unsigned char* data, bool dat); void writeNetwork(); void scrambler(unsigned char* data) const; diff --git a/NXDNNetwork.cpp b/NXDNNetwork.cpp index 6453829..53cfb05 100644 --- a/NXDNNetwork.cpp +++ b/NXDNNetwork.cpp @@ -32,11 +32,14 @@ CNXDNNetwork::CNXDNNetwork(const std::string& myAddress, unsigned int myPort, co m_socket(myAddress, myPort), m_address(), m_port(gatewayPort), +m_callsign(callsign), m_debug(debug), m_enabled(false), m_buffer(1000U, "NXDN Network"), m_pollTimer(1000U, 5U) { + m_callsign.resize(10U, ' '); + m_address = CUDPSocket::lookup(gatewayAddress); } @@ -56,7 +59,7 @@ bool CNXDNNetwork::open() return m_socket.open(); } -bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned char cnt, bool end) +bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, unsigned char cnt, bool end) { assert(data != NULL); @@ -72,7 +75,8 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp buffer[6U] = (src >> 8) & 0xFFU; buffer[7U] = grp ? 0x01U : 0x00U; - buffer[7U] |= end ? 0x80U : 0x00U; + buffer[7U] |= dat ? 0x02U : 0x00U; + buffer[7U] |= end ? 0x04U : 0x00U; buffer[8U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 8) & 0xFFU; @@ -97,10 +101,13 @@ bool CNXDNNetwork::writePoll() buffer[3U] = 'N'; buffer[4U] = 'P'; - if (m_debug) - CUtils::dump(1U, "NXDN Network Poll Sent", buffer, 5U); + for (unsigned int i = 0U; i < 10U; i++) + buffer[5U + i] = m_callsign.at(i); - return m_socket.write(buffer, 5U, m_address, m_port); + if (m_debug) + CUtils::dump(1U, "NXDN Network Poll Sent", buffer, 15U); + + return m_socket.write(buffer, 15U, m_address, m_port); } void CNXDNNetwork::clock(unsigned int ms) @@ -142,7 +149,7 @@ void CNXDNNetwork::clock(unsigned int ms) m_buffer.addData(buffer, 59U); } -unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned char& cnt, bool& end) +unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, unsigned char& cnt, bool& end) { assert(data != NULL); @@ -154,7 +161,8 @@ unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& src = (buffer[5U] << 8) + buffer[6U]; grp = (buffer[7U] & 0x01U) == 0x01U; - end = (buffer[7U] & 0x80U) == 0x80U; + dat = (buffer[7U] & 0x02U) == 0x02U; + end = (buffer[7U] & 0x04U) == 0x04U; dst = (buffer[8U] << 8) + buffer[9U]; cnt = buffer[10U]; diff --git a/NXDNNetwork.h b/NXDNNetwork.h index c69602a..3ef9fda 100644 --- a/NXDNNetwork.h +++ b/NXDNNetwork.h @@ -36,9 +36,9 @@ public: void enable(bool enabled); - bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, unsigned char cnt, bool end); + bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, unsigned char cnt, bool end); - unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, unsigned char& cnt, bool& end); + unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, unsigned char& cnt, bool& end); void reset(); @@ -50,6 +50,7 @@ private: CUDPSocket m_socket; in_addr m_address; unsigned int m_port; + std::string m_callsign; bool m_debug; bool m_enabled; CRingBuffer m_buffer; From 9e83f577a604f7174a62b1ed7454710c4cc39f50 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 6 Feb 2018 20:40:29 +0000 Subject: [PATCH 5/5] Finish off the networking interface. --- NXDNControl.cpp | 183 ++++++++++++++++++++++++++++++++++++++++++++++-- NXDNNetwork.cpp | 6 +- NXDNNetwork.h | 4 +- 3 files changed, 184 insertions(+), 9 deletions(-) diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 4023dc6..4c33741 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -238,7 +238,7 @@ bool CNXDNControl::processVoice(unsigned char usc, unsigned char option, unsigne if (m_duplex) writeQueueRF(data); - if (type == NXDN_MESSAGE_TYPE_TX_REL) { + if (data[0U] == TAG_EOT) { m_rfFrames++; if (m_rssi != 0U) LogMessage("NXDN, received RF end of transmission, %.1f seconds, BER: %.1f%%, RSSI: -%u/-%u/-%u dBm", float(m_rfFrames) / 25.0F, float(m_rfErrs * 100U) / float(m_rfBits), m_minRSSI, m_maxRSSI, m_aveRSSI / m_rssiCount); @@ -681,17 +681,189 @@ void CNXDNControl::writeEndNet() void CNXDNControl::writeNetwork() { -#ifdef notdef + unsigned short srcId = 0U; + unsigned short dstId = 0U; + unsigned char count = 0U; + bool grp = false; + bool dat = false; + bool efr = false; + bool end = false; unsigned char data[200U]; - unsigned int length = m_network->read(data); + unsigned int length = m_network->read(data + 2U, srcId, grp, dstId, dat, efr, count, end); if (length == 0U) return; if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE) return; + if (end && m_netState == RS_NET_IDLE) + return; + m_networkWatchdog.start(); -#endif + + scrambler(data + 2U); + + if (dat) { + CNXDNUDCH udch; + bool valid = udch.decode(data + 2U); + if (valid) { + if (m_netState == RS_NET_IDLE) { + unsigned char buffer[23U]; + udch.getData(buffer); + + CNXDNLayer3 layer3; + layer3.decode(buffer, 184U); + + unsigned char type = layer3.getMessageType(); + if (type == NXDN_MESSAGE_TYPE_DCALL_HDR) { + unsigned short srcId = layer3.getSourceUnitId(); + unsigned short dstId = layer3.getDestinationGroupId(); + bool grp = layer3.getIsGroup(); + + unsigned char frames = layer3.getDataBlocks(); + + std::string source = m_lookup->find(srcId); + + m_display->writeNXDN(source.c_str(), grp, dstId, "N"); + + LogMessage("NXDN, received network data header from %s to %s%u, %u blocks", source.c_str(), grp ? "TG " : "", dstId, frames); + + m_netState = RS_NET_DATA; + } + } + + if (m_netState == RS_NET_DATA) { + data[0U] = end ? TAG_EOT : TAG_DATA; + data[1U] = 0x00U; + + CSync::addNXDNSync(data + 2U); + + CNXDNLICH lich; + lich.decode(data + 2U); + lich.encode(data + 2U); + + udch.setRAN(m_ran); + udch.encode(data + 2U); + + scrambler(data + 2U); + + writeQueueNet(data); + + if (end) { + LogMessage("NXDN, ended network data transmission"); + writeEndNet(); + } + } + } + } else { + if (m_netState == RS_NET_IDLE) { + std::string source = m_lookup->find(srcId); + LogMessage("NXDN, received network transmission from %s to %s%u", source.c_str(), grp ? "TG " : "", dstId); + m_display->writeNXDN(source.c_str(), grp, dstId, "N"); + + m_netTimeoutTimer.start(); + m_packetTimer.start(); + m_elapsed.start(); + m_netState = RS_NET_AUDIO; + m_netFrames = 0U; + m_netLost = 0U; + m_netErrs = 0U; + m_netBits = 1U; + m_netN = 0U; + } + + m_netFrames++; + + data[0U] = end ? TAG_EOT : TAG_DATA; + data[1U] = 0x00U; + + CSync::addNXDNSync(data + 2U); + + CNXDNLICH lich; + lich.decode(data + 2U); + lich.encode(data + 2U); + unsigned char option = lich.getOption(); + + CNXDNSACCH sacch; + bool valid = sacch.decode(data + 2U); + if (valid) { + sacch.setRAN(m_ran); + sacch.encode(data + 2U); + } + + if (option == NXDN_LICH_STEAL_NONE) { + CAMBEFEC ambe; + unsigned int errors = 0U; + if (efr) { + errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES); + errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U); + m_netErrs += errors; + m_netBits += 288U; + } else { + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES); + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 9U); + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U); + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 27U); + m_netErrs += errors; + m_netBits += 188U; + } + } else if (option == NXDN_LICH_STEAL_FACCH1_1) { + CNXDNFACCH1 facch1; + bool valid = facch1.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); + if (valid) + facch1.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); + + CAMBEFEC ambe; + unsigned int errors = 0U; + if (efr) { + errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U); + m_netErrs += errors; + m_netBits += 144U; + } else { + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 18U); + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 27U); + m_netErrs += errors; + m_netBits += 94U; + } + } else if (option == NXDN_LICH_STEAL_FACCH1_2) { + CAMBEFEC ambe; + unsigned int errors = 0U; + if (efr) { + errors += ambe.regenerateIMBE(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES); + m_netErrs += errors; + m_netBits += 144U; + } else { + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES); + errors += ambe.regenerateYSFDN(data + 2U + NXDN_FSW_LICH_SACCH_LENGTH_BYTES + 9U); + m_netErrs += errors; + m_netBits += 94U; + } + + CNXDNFACCH1 facch1; + bool valid = facch1.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS); + if (valid) + facch1.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS); + } else { + CNXDNFACCH1 facch11; + bool valid1 = facch11.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); + if (valid1) + facch11.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS); + + CNXDNFACCH1 facch12; + bool valid2 = facch12.decode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS); + if (valid2) + facch12.encode(data + 2U, NXDN_FSW_LENGTH_BITS + NXDN_LICH_LENGTH_BITS + NXDN_SACCH_LENGTH_BITS + NXDN_FACCH1_LENGTH_BITS); + } + + scrambler(data + 2U); + + writeQueueNet(data); + + if (end) { + LogMessage("NXDN, received network end of transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", float(m_netFrames) / 25.0F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); + writeEndNet(); + } + } } void CNXDNControl::clock(unsigned int ms) @@ -768,10 +940,11 @@ void CNXDNControl::writeNetwork(const unsigned char *data, bool dat) unsigned short srcId = m_rfLayer3.getSourceUnitId(); unsigned short dstId = m_rfLayer3.getDestinationGroupId(); bool grp = m_rfLayer3.getIsGroup(); + bool efr = m_rfLayer3.getVoiceMode() == NXDN_VOICE_CALL_OPTION_9600_EFR; bool end = data[0U] == TAG_EOT; - m_network->write(data + 2U, srcId, grp, dstId, dat, m_rfFrames, end); + m_network->write(data + 2U, srcId, grp, dstId, dat, efr, m_rfFrames, end); } void CNXDNControl::scrambler(unsigned char* data) const diff --git a/NXDNNetwork.cpp b/NXDNNetwork.cpp index 53cfb05..8e90987 100644 --- a/NXDNNetwork.cpp +++ b/NXDNNetwork.cpp @@ -59,7 +59,7 @@ bool CNXDNNetwork::open() return m_socket.open(); } -bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, unsigned char cnt, bool end) +bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, bool efr, unsigned char cnt, bool end) { assert(data != NULL); @@ -77,6 +77,7 @@ bool CNXDNNetwork::write(const unsigned char* data, unsigned short src, bool grp buffer[7U] = grp ? 0x01U : 0x00U; buffer[7U] |= dat ? 0x02U : 0x00U; buffer[7U] |= end ? 0x04U : 0x00U; + buffer[7U] |= efr ? 0x08U : 0x00U; buffer[8U] = (dst >> 8) & 0xFFU; buffer[9U] = (dst >> 8) & 0xFFU; @@ -149,7 +150,7 @@ void CNXDNNetwork::clock(unsigned int ms) m_buffer.addData(buffer, 59U); } -unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, unsigned char& cnt, bool& end) +unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, bool& efr, unsigned char& cnt, bool& end) { assert(data != NULL); @@ -163,6 +164,7 @@ unsigned int CNXDNNetwork::read(unsigned char* data, unsigned short& src, bool& grp = (buffer[7U] & 0x01U) == 0x01U; dat = (buffer[7U] & 0x02U) == 0x02U; end = (buffer[7U] & 0x04U) == 0x04U; + efr = (buffer[7U] & 0x08U) == 0x08U; dst = (buffer[8U] << 8) + buffer[9U]; cnt = buffer[10U]; diff --git a/NXDNNetwork.h b/NXDNNetwork.h index 3ef9fda..4febcc1 100644 --- a/NXDNNetwork.h +++ b/NXDNNetwork.h @@ -36,9 +36,9 @@ public: void enable(bool enabled); - bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, unsigned char cnt, bool end); + bool write(const unsigned char* data, unsigned short src, bool grp, unsigned short dst, bool dat, bool efr, unsigned char cnt, bool end); - unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, unsigned char& cnt, bool& end); + unsigned int read(unsigned char* data, unsigned short& src, bool& grp, unsigned short& dst, bool& dat, bool& efr, unsigned char& cnt, bool& end); void reset();