KB8PMY
/
QnetGateway
mirror of https://github.com/n7tae/QnetGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

got rid of rptr.mod[x].desc

Browse Source
pull/14/head
Tom Early 6 years ago
parent 9b249efef3
commit 37b3bd9653
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File

5
QnetGateway.cpp
Unescape View File

@ -308,9 +308,6 @@ bool CQnetGateway::ReadConfig(char *cfgFile)
cfg.GetValue(path+"desc1", estr, rptr.mod[m].desc1, 0, 20); cfg.GetValue(path+"desc1", estr, rptr.mod[m].desc1, 0, 20);
cfg.GetValue(path+"desc2", estr, rptr.mod[m].desc2, 0, 20); cfg.GetValue(path+"desc2", estr, rptr.mod[m].desc2, 0, 20);
cfg.GetValue(path+"url", estr, rptr.mod[m].url, 0, 80); cfg.GetValue(path+"url", estr, rptr.mod[m].url, 0, 80);
if (rptr.mod[m].desc1.empty()) rptr.mod[m].desc2.assign(GW_VERSION);
if (rptr.mod[m].desc2.empty()) rptr.mod[m].desc2.assign("by N7TAE");
rptr.mod[m].desc = trim_copy(rptr.mod[m].desc1) + " " + trim_copy(rptr.mod[m].desc2);
} }
} }
path.append("find_route"); path.append("find_route");
@ -2164,7 +2161,7 @@ void CQnetGateway::APRSBeaconThread()
rptr.mod[i].call.c_str(), rptr.mod[i].call.c_str(), rptr.mod[i].call.c_str(), rptr.mod[i].call.c_str(),
lat_s, (rptr.mod[i].latitude < 0.0) ? 'S' : 'N', lat_s, (rptr.mod[i].latitude < 0.0) ? 'S' : 'N',
lon_s, (rptr.mod[i].longitude < 0.0) ? 'W' : 'E', lon_s, (rptr.mod[i].longitude < 0.0) ? 'W' : 'E',
(unsigned int)rptr.mod[i].range, rptr.mod[i].band.c_str(), rptr.mod[i].desc.c_str()); (unsigned int)rptr.mod[i].range, rptr.mod[i].band.c_str(), GW_VERSION.c_str());
if (LOG_DEBUG) if (LOG_DEBUG)
printf("APRS Beacon =[%s]\n", snd_buf); printf("APRS Beacon =[%s]\n", snd_buf);
strcat(snd_buf, "\r\n"); strcat(snd_buf, "\r\n");

2
aprs.h
Unescape View File

@ -47,7 +47,7 @@ using SRPTR = struct aprs_info {
bool defined; bool defined;
std::string band; /* 23cm ... */ std::string band; /* 23cm ... */
double frequency, offset, latitude, longitude, range, agl; double frequency, offset, latitude, longitude, range, agl;
std::string desc1, desc2, desc, url, package_version; std::string desc1, desc2, url, package_version;
} mod[3]; } mod[3];
}; };

2
defaults
Unescape View File

@ -52,7 +52,7 @@ gateway_send_qrgs_maps_d=true # send frequency, offset, coordinates and u
gateway_ip_d='ANY_PORT' # the g2 port gateway_ip_d='ANY_PORT' # the g2 port
gateway_port_d=40000 # don't change gateway_port_d=40000 # don't change
gateway_ipv6_ip_d='ANY_PORT' gateway_ipv6_ip_d='ANY_PORT'
gateway_ipv6_port_d=9011 # IANA-approved DStar rouing port gateway_ipv6_port_d=9011 # IANA-approved DStar rouing port
gateway_gate2link_d='gate2link' # Unix sockets between qngateway and QnetLink gateway_gate2link_d='gate2link' # Unix sockets between qngateway and QnetLink
gateway_link2gate_d='link2gate' # all Unix sockets are on the file system, but hidden from view gateway_link2gate_d='link2gate' # all Unix sockets are on the file system, but hidden from view
gateway_modem2gate_d='modem2gate' # Unix Sockets between the modem(s) and the gateway (1 in, 3 out) gateway_modem2gate_d='modem2gate' # Unix Sockets between the modem(s) and the gateway (1 in, 3 out)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.