Merge remote-tracking branch 'origin/tetra-contrib' into tetra-sip-usrp
This commit is contained in:
Adi Bier / DL1HRC
commit
03f9a7c22a
|
|
@ -323,6 +323,12 @@ void Reflector::updateQsostate(Json::Value eventmessage)
|
|||
} /* Reflector::updateQsostate */
|
||||
|
||||
|
||||
void Reflector::updateRssistate(Json::Value eventmessage)
|
||||
{
|
||||
cout << jsonToString(eventmessage) << endl;
|
||||
} /* Reflector::updateRssistate */
|
||||
|
||||
|
||||
void Reflector::nodeList(std::vector<std::string>& nodes) const
|
||||
{
|
||||
nodes.clear();
|
||||
|
|
|
|||
|
|
@ -184,22 +184,28 @@ class Reflector : public sigc::trackable
|
|||
|
||||
/**
|
||||
* @brief Updates the user information
|
||||
* @param user array with all data of the useres
|
||||
* @param user array with all data of the users
|
||||
*/
|
||||
void updateUserdata(Json::Value eventmessage);
|
||||
|
||||
/**
|
||||
* @brief Update Sds information
|
||||
* @param ToDo
|
||||
* @param event message with sds data
|
||||
*/
|
||||
void updateSdsdata(Json::Value eventmessage);
|
||||
|
||||
/**
|
||||
* @brief Update Qso information
|
||||
* @param ToDo
|
||||
* @param event message with Qso information
|
||||
*/
|
||||
void updateQsostate(Json::Value eventmessage);
|
||||
|
||||
/**
|
||||
* @brief Update Rssi information
|
||||
* @param event message with rssi info
|
||||
*/
|
||||
void updateRssistate(Json::Value eventmessage);
|
||||
|
||||
private:
|
||||
typedef std::map<uint32_t, ReflectorClient*> ReflectorClientMap;
|
||||
typedef std::map<Async::FramedTcpConnection*,
|
||||
|
|
|
|||
|
|
@ -677,6 +677,10 @@ void ReflectorClient::handleStateEvent(std::istream& is)
|
|||
{
|
||||
m_reflector->updateQsostate(eventmessage);
|
||||
}
|
||||
else if (msg.name() == "Rssi:info")
|
||||
{
|
||||
m_reflector->updateRssistate(eventmessage);
|
||||
}
|
||||
} /* ReflectorClient::handleStateEvent */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ DAPNET_RUBRIC_REGISTRATION=RicRegistration
|
|||
#DAPNET_WEBPATH=/calls
|
||||
#DAPNET_TXGROUP=dl-all
|
||||
#PEI_PTY=/tmp/pei_pty
|
||||
#CHECK_QOS=5
|
||||
#CHECK_QOS=10
|
||||
#QOS_EMAIL_TO=test@svxlink.abc
|
||||
#QOS_SDS_TO=90116383002620055
|
||||
#QOS_LIMIT=-90
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ using namespace SvxLink;
|
|||
#define ERROR 1
|
||||
#define CALL_BEGIN 3
|
||||
#define GROUPCALL_END 4
|
||||
|
||||
#define REGISTRATION 5
|
||||
#define SDS 6
|
||||
#define TEXT_SDS 7
|
||||
#define CNUMF 8
|
||||
|
|
@ -132,7 +132,7 @@ using namespace SvxLink;
|
|||
|
||||
#define MAX_TRIES 5
|
||||
|
||||
#define TETRA_LOGIC_VERSION "15122022"
|
||||
#define TETRA_LOGIC_VERSION "22122022"
|
||||
|
||||
/****************************************************************************
|
||||
*
|
||||
|
|
@ -207,9 +207,10 @@ TetraLogic::TetraLogic(void)
|
|||
proximity_warning(3.1), time_between_sds(3600), own_lat(0.0),
|
||||
own_lon(0.0), endCmd(""), new_sds(false), inTransmission(false),
|
||||
cmgs_received(true), share_userinfo(true), current_cci(0), dmnc(0),
|
||||
dmcc(0), infosds(""), is_tx(false), last_sdsid(0), pei_pty_path(""), pei_pty(0),
|
||||
ai(-1), check_qos(0), qos_sds_to("0815"), qos_limit(-90),
|
||||
qosTimer(300000, Timer::TYPE_ONESHOT, false)
|
||||
dmcc(0), dissi(0), infosds(""), is_tx(false), last_sdsid(0), pei_pty_path(""),
|
||||
pei_pty(0), ai(-1), check_qos(0), qos_sds_to("0815"), qos_limit(-90),
|
||||
qosTimer(300000, Timer::TYPE_ONESHOT, false), min_rssi(100), max_rssi(100),
|
||||
reg_cell(0), reg_la(0), reg_mni(0)
|
||||
{
|
||||
peiComTimer.expired.connect(mem_fun(*this, &TetraLogic::onComTimeout));
|
||||
peiActivityTimer.expired.connect(mem_fun(*this,
|
||||
|
|
@ -1066,6 +1067,10 @@ void TetraLogic::handlePeiAnswer(std::string m_message)
|
|||
handleRssi(m_message);
|
||||
break;
|
||||
|
||||
case REGISTRATION:
|
||||
handleCreg(m_message);
|
||||
break;
|
||||
|
||||
case INVALID:
|
||||
log(LOGWARN, "+++ Pei answer not known, ignoring ;)");
|
||||
|
||||
|
|
@ -1879,6 +1884,7 @@ void TetraLogic::handleCnumf(std::string m_message)
|
|||
}
|
||||
dmcc = t_mcc;
|
||||
dmnc = t_mnc;
|
||||
dissi = t_issi;
|
||||
|
||||
if (atoi(issi.c_str()) != t_issi)
|
||||
{
|
||||
|
|
@ -2025,6 +2031,7 @@ int TetraLogic::handleMessage(std::string mesg)
|
|||
mre["^\\+CTDGR:"] = CTDGR;
|
||||
mre["^\\+CLVL:"] = CLVL;
|
||||
mre["^\\+CSQ:"] = RSSI;
|
||||
mre["^\\+CREG:"] = REGISTRATION;
|
||||
mre["^01"] = OTAK;
|
||||
mre["^02"] = SIMPLE_TEXT_SDS;
|
||||
mre["^03"] = SIMPLE_LIP_SDS;
|
||||
|
|
@ -2385,6 +2392,10 @@ void TetraLogic::handleRssi(std::string m_message)
|
|||
{
|
||||
m_message.erase(0,6);
|
||||
int rssi = -113 + 2 * getNextVal(m_message);
|
||||
rssi_list.push_back(rssi);
|
||||
if (rssi_list.size() > 20) rssi_list.pop_back();
|
||||
if (rssi < min_rssi) min_rssi = rssi; // store min rssi value
|
||||
if (rssi > max_rssi) max_rssi = rssi; // store max rssi value
|
||||
|
||||
stringstream ss;
|
||||
ss << "rssi " << rssi;
|
||||
|
|
@ -2397,8 +2408,24 @@ void TetraLogic::handleRssi(std::string m_message)
|
|||
m +=").";
|
||||
log(LOGDEBUG, m);
|
||||
|
||||
// send the rssi value to the refelctor network for further handling
|
||||
Json::Value event(Json::arrayValue);
|
||||
Json::Value t_rssi(Json::objectValue);
|
||||
t_rssi["issi"] = dissi;
|
||||
t_rssi["mni"] = reg_mni;
|
||||
t_rssi["la"] = reg_la;
|
||||
t_rssi["rssi"] = rssi;
|
||||
t_rssi["max_rssi"] = *max_element(rssi_list.begin(), rssi_list.end());
|
||||
t_rssi["min_rssi"] = *min_element(rssi_list.begin(), rssi_list.end());
|
||||
event.append(t_rssi);
|
||||
publishInfo("Rssi:info", event);
|
||||
|
||||
checkReg();
|
||||
|
||||
// no action if the value is above the defined limit
|
||||
if (rssi > qos_limit) return;
|
||||
|
||||
// send email (via the tcl framework) to the administrator
|
||||
if (qos_email_to.length() > 5)
|
||||
{
|
||||
string s = "rssi_limit ";
|
||||
|
|
@ -2410,6 +2437,7 @@ void TetraLogic::handleRssi(std::string m_message)
|
|||
processEvent(s);
|
||||
}
|
||||
|
||||
// send sds to the administrator
|
||||
if (qos_sds_to.length() > 1)
|
||||
{
|
||||
string sds;
|
||||
|
|
@ -2430,7 +2458,28 @@ void TetraLogic::handleRssi(std::string m_message)
|
|||
}
|
||||
} /* TetraLogic::handleRssi */
|
||||
|
||||
|
||||
void TetraLogic::checkReg(void)
|
||||
{
|
||||
log(LOGDEBUG, "Checking registration state (AT+CREG?)");
|
||||
sendPei("AT+CREG?");
|
||||
} /* TetraLogic::checkReg */
|
||||
|
||||
|
||||
void TetraLogic::handleCreg(std::string m_message)
|
||||
{
|
||||
// +CREG: 1,1,90109999
|
||||
if (m_message.length()>5) m_message.erase(0,6);
|
||||
reg_state = getNextVal(m_message);
|
||||
reg_la = getNextVal(m_message); // 14-bit Location Area code
|
||||
reg_mni = getNextVal(m_message); // 24-bit Mobile Network Identity
|
||||
stringstream ss;
|
||||
ss << "Registration LA=" << reg_la << ", MNI=" <<
|
||||
reg_mni << ", state=" << RegStat[reg_state];
|
||||
|
||||
log(LOGDEBUG, ss.str());
|
||||
} /* TetraLogic::handleCreg */
|
||||
|
||||
/*
|
||||
* This file has not been truncated
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -243,6 +243,7 @@ class TetraLogic : public Logic
|
|||
char aprs_tab;
|
||||
time_t last_activity = 0;
|
||||
time_t sent_last_sds = 0;
|
||||
int rssi = 100;
|
||||
};
|
||||
std::map<std::string, User> userdata;
|
||||
|
||||
|
|
@ -299,10 +300,16 @@ class TetraLogic : public Logic
|
|||
|
||||
typedef enum
|
||||
{
|
||||
TMO=0, DMO_MS=1, GATEWAY=5
|
||||
|
||||
TMO=0, DMO_MS=1, VD_DUAL_WATCH_DMO=2, DMO_DUAL_WATCH_DV=3, GATEWAY=5,
|
||||
DMO_REPEATER=6
|
||||
} aiMode;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
NOT_REGISTERED = 0, REGISTERED = 1, NO_NETWORK = 2, REJECTED = 3,
|
||||
UNKNOWN = 4, VISITED_NETWORK = 5
|
||||
} regState;
|
||||
|
||||
bool sds_when_dmo_on;
|
||||
bool sds_when_dmo_off;
|
||||
bool sds_when_proximity;
|
||||
|
|
@ -340,6 +347,7 @@ class TetraLogic : public Logic
|
|||
int current_cci;
|
||||
int dmnc;
|
||||
int dmcc;
|
||||
int dissi;
|
||||
std::string infosds;
|
||||
bool is_tx;
|
||||
int last_sdsid;
|
||||
|
|
@ -351,6 +359,13 @@ class TetraLogic : public Logic
|
|||
std::string qos_email_to;
|
||||
int qos_limit;
|
||||
Async::Timer qosTimer;
|
||||
std::vector<int> rssi_list;
|
||||
int min_rssi;
|
||||
int max_rssi;
|
||||
int reg_cell;
|
||||
int reg_la;
|
||||
int reg_mni;
|
||||
int reg_state;
|
||||
|
||||
void initPei(void);
|
||||
void onCharactersReceived(char *buf, int count);
|
||||
|
|
@ -402,6 +417,8 @@ class TetraLogic : public Logic
|
|||
void onQosTimeout(Async::Timer *timer);
|
||||
void getRssi(void);
|
||||
void handleRssi(std::string m_message);
|
||||
void handleCreg(std::string m_message);
|
||||
void checkReg(void);
|
||||
}; /* class TetraLogic */
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue