[MTS-MTQ] refactoring: moved common consts and static methods to ICellularRadio

1 files changed, 0 insertions, 274 deletions

diff --git a/src/MTS_IO_TelitRadio.cpp b/src/MTS_IO_TelitRadio.cpp
index de863c3..8209d0f 100644
--- a/src/MTS_IO_TelitRadio.cpp
+++ b/src/MTS_IO_TelitRadio.cpp
@@ -36,108 +36,6 @@
 
 using namespace MTS::IO;
 
-const char TelitRadio::ETX    = 0x03;  //Ends socket connection
-const char TelitRadio::DLE    = 0x10;  //Escapes ETX and DLE within Payload
-const char TelitRadio::CR     = 0x0D;
-const char TelitRadio::NL     = 0x0A;
-const char TelitRadio::CTRL_Z = 0x1A;
-
-const std::string TelitRadio::RSP_ERROR("ERROR");
-const std::string TelitRadio::RSP_OK("OK");
-
-
-const std::string TelitRadio::DEFAULT_RADIO_PORT("/dev/modem_at1");
-const std::string TelitRadio::DEFAULT_RADIO_DIR("/var/run/radio/");
-const std::string TelitRadio::VALUE_UNKNOWN("Unknown");
-const std::string TelitRadio::VALUE_UNAVAILABLE("Unavailable");
-const std::string TelitRadio::VALUE_NOT_SUPPORTED("Not Supported");
-
-const std::string TelitRadio::VALUE_NOT_REGISTERED("NOT REGISTERED");
-const std::string TelitRadio::VALUE_REGISTERED("REGISTERED");
-const std::string TelitRadio::VALUE_SEARCHING("SEARCHING");
-const std::string TelitRadio::VALUE_DENIED("DENIED");
-const std::string TelitRadio::VALUE_ROAMING("ROAMING");
-
-//Static Data
-const std::string TelitRadio::KEY_TYPE("type");                    //!< GSM or CDMA
-const std::string TelitRadio::KEY_CODE("code");                    //!< Product Code : H5, H6, C2, EV3, G3
-const std::string TelitRadio::KEY_MODEL("model");                  //!< Model : HE910, LE910, CE910, DE910, GE910
-const std::string TelitRadio::KEY_MANUFACTURER("manufacturer");    //!< Manufacturer: Telit
-const std::string TelitRadio::KEY_HARDWARE("hardware");            //!< Radio Hardware Version
-const std::string TelitRadio::KEY_FIRMWARE("firmware");            //!< Radio Firmware Version
-const std::string TelitRadio::KEY_FIRMWARE_BUILD("firmwarebuild"); //!< Radio Firmware Build
-
-const std::string TelitRadio::KEY_CARRIER("carrier");   //!< Cellular Service Provider (Home Network)
-const std::string TelitRadio::VALUE_CARRIER_VERIZON("Verizon");
-const std::string TelitRadio::VALUE_CARRIER_AERIS("Aeris");
-const std::string TelitRadio::VALUE_CARRIER_SPRINT("Sprint");
-const std::string TelitRadio::VALUE_CARRIER_USCELLULAR("U.S. Cellular");
-const std::string TelitRadio::VALUE_CARRIER_ATT("AT&T");
-const std::string TelitRadio::VALUE_CARRIER_TMOBILE("T-Mobile");
-
-const std::string TelitRadio::KEY_IMEI("imei");          //!< International Mobile Station Equipment Identity
-const std::string TelitRadio::KEY_MEID("meid");          //!< Mobile Equipment Identifier
-const std::string TelitRadio::KEY_IMSI("imsi");          //!< International Mobile Subscriber Identity
-const std::string TelitRadio::KEY_MSID("msid");          //!< Mobil Station ID / Mobile Identification Number (MSID/MIN) (CDMA-Only)
-const std::string TelitRadio::KEY_MDN("mdn");            //!< Mobile Directory Number : Actual phone number dialed to reach radio
-const std::string TelitRadio::KEY_ICCID("iccid");        //!< Integrated Circuit Card Identifier
-const std::string TelitRadio::KEY_MSL("msl");            //!< Master Subsidy Lock
-
-//Dynamic Data
-const std::string TelitRadio::KEY_ROAMING("roaming");    //!< Indicates whether or not using Home Network
-const std::string TelitRadio::KEY_DATETIME("datetime");  //!< Date and Time from tower
-const std::string TelitRadio::KEY_SERVICE("service");    //!< Service Connection Type [GPRS, EGPRS, WCDMA, HSDPA, 1xRTT, EVDO]
-const std::string TelitRadio::KEY_NETWORK("network");    //!< Cellular Service Provider
-const std::string TelitRadio::KEY_NETWORK_REG("netreg"); //!< Network Registration
-const std::string TelitRadio::KEY_CID("cid");            //!< Cellular ID (Tower) in HEX
-const std::string TelitRadio::KEY_LAC("lac");            //!< Location Area Code in HEX
-const std::string TelitRadio::KEY_RAC("rac");            //!< Routing Area Code in HEX
-const std::string TelitRadio::KEY_RSSI("rssi");          //!< Signal Strength
-const std::string TelitRadio::KEY_RSSIDBM("rssidBm");    //!< Signal Strength in dBm
-const std::string TelitRadio::KEY_MCC("mcc");            //!< Country Code
-const std::string TelitRadio::KEY_MNC("mnc");            //!< Operator Code
-const std::string TelitRadio::KEY_CHANNEL("channel");    //!< ARFCN or UARFCN Assigned Radio Channel
-const std::string TelitRadio::KEY_TXPWR("txpwr");        //!< Transmit Power
-const std::string TelitRadio::KEY_PSC("psc");            //!< Active Primary Synchronization Code (PSC)
-const std::string TelitRadio::KEY_ECIO("ecio");          //!< Active Ec/Io (chip energy per total wideband power in dBm)
-const std::string TelitRadio::KEY_RSCP("rscp");          //!< Active RSCP (Received Signal Code Power in dBm)
-const std::string TelitRadio::KEY_DRX("drx");            //!< Discontinuous reception cycle length (ms)
-const std::string TelitRadio::KEY_MM("mm");              //!< Mobility Management State
-const std::string TelitRadio::KEY_RR("rr");              //!< Radio Resource State
-const std::string TelitRadio::KEY_NOM("nom");            //!< Network Operator Mode
-const std::string TelitRadio::KEY_ABND("abnd");          //!< Active Band
-const std::string TelitRadio::KEY_BLER("bler");          //!< Block Error Rate (percentage)
-const std::string TelitRadio::KEY_SD("sd");              //!< Service Domain
-const std::string TelitRadio::KEY_DEBUG("debug");        //!< Debug Information
-
-const std::string TelitRadio::KEY_MIP("mipProfile");                      //!< Mobile IP Information
-const std::string TelitRadio::KEY_MIP_ID("id");                           //!< Mobile IP ID
-const std::string TelitRadio::KEY_MIP_ENABLED("enabled");                 //!< Mobile IP Enabled/Disabled
-const std::string TelitRadio::KEY_MIP_NAI("nai");                         //!< Network Access Identifier
-const std::string TelitRadio::KEY_MIP_HOMEADDRESS("homeAddress");         //!< Home Address
-const std::string TelitRadio::KEY_MIP_PRIMARYHA("primaryAddress");        //!< Primary Home Agent
-const std::string TelitRadio::KEY_MIP_SECONDARYHA("secondaryAddress");    //!< Secondary Home Agent
-const std::string TelitRadio::KEY_MIP_MNAAASPI("mnAaaSpi");               //!< Mobile Node Authentication, Authorization, and Accounting Server Security Parameter Index
-const std::string TelitRadio::KEY_MIP_MNHASPI("mnHaSpi");                 //!< Mobile Node Home Agent Security Server Parameter Index
-const std::string TelitRadio::KEY_MIP_REVTUN("revTun");                   //!< Reverse Tunneling Enabled
-const std::string TelitRadio::KEY_MIP_MNAAASS("mnAaaSs");                 //!< Mobile Node Authentication, Authorization, and Accounting Server Shared Secret
-const std::string TelitRadio::KEY_MIP_MNHASS("mnHaSs");                   //!< Mobile Node Home Agent Shared Secret
-
-const std::string TelitRadio::VALUE_TYPE_GSM("GSM");
-const std::string TelitRadio::VALUE_TYPE_LTE("LTE");
-const std::string TelitRadio::VALUE_TYPE_CDMA("CDMA");
-
-const std::string TelitRadio::VALUE_SD_NO_SERVICE("NO SERVICE");
-const std::string TelitRadio::VALUE_SD_CS_ONLY("CS ONLY");
-const std::string TelitRadio::VALUE_SD_PS_ONLY("PS ONLY");
-const std::string TelitRadio::VALUE_SD_CSPS("CS+PS");
-
-const std::string TelitRadio::VALUE_ABND_GSM_850("GSM 850");
-const std::string TelitRadio::VALUE_ABND_GSM_900("GSM 900");
-const std::string TelitRadio::VALUE_ABND_DCS_1800("DCS 1800");
-const std::string TelitRadio::VALUE_ABND_PCS_1900("PCS 1900");
-
-const std::vector<std::string> TelitRadio::DEFAULT_BAIL_STRINGS = { TelitRadio::RSP_OK, TelitRadio::RSP_ERROR };
 
 TelitRadio::TelitRadio(const std::string& sName, const std::string& sRadioPort)
 : m_sName(sName)
@@ -266,178 +164,6 @@ TelitRadio::CODE TelitRadio::getModel(std::string& sModel) {
     return SUCCESS;
 }
 
-TelitRadio::CODE TelitRadio::convertModelToMtsShortCode(const std::string& sModel, std::string& sCode, TelitRadio *radioObject) {
-    CODE eCode = FAILURE;
-
-    if(sModel.find("HE910-D") == 0) {
-        sCode = "H5";
-        eCode = SUCCESS;
-    } else if (sModel.find("HE910-EUD") == 0) {
-        sCode = "H6";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-JN1") == 0) {
-        sCode = "LDC3";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE866A1-JS") == 0) {
-        sCode = "LSB3";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-NAG") == 0) {
-        sCode = "LAT1";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C4-NF") == 0) {
-        sCode = "L4N1";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-NA1") == 0) {
-        if (NULL == radioObject) {
-            sCode = VALUE_NOT_SUPPORTED;
-            eCode = ERROR;
-        } else {
-            std::string sValue;
-            eCode = radioObject->getActiveFirmware(sValue);
-            if (eCode == SUCCESS) {
-                sCode = "LNA3";
-            } else {
-                sCode = "LAT3";
-            }
-        }
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-SVG") == 0) {
-        sCode = "LVW2";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C1-NS") == 0) {
-    	sCode = "LSP3";
-    	eCode = SUCCESS;
-    } else if (sModel.find("LE910C1-AP") == 0) {
-    	sCode = "LAP3";
-    	eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-NA") == 0) {
-        sCode = "MAT1";
-        eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-NV") == 0) {
-        sCode = "MVW1";
-        eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-WW") == 0) {
-        sCode = "MNG2";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-EUG") == 0) {
-        sCode = "LEU1";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C4-EU") == 0) {
-        sCode = "L4E1";
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-EU1") == 0) {
-        sCode = "LEU3";
-        eCode = SUCCESS;
-    } else if (sModel.find("GE910") == 0) {
-        sCode = "G3";
-        eCode = SUCCESS;
-    } else if (sModel.find("CE910") == 0) {
-        sCode = "C2";
-        eCode = SUCCESS;
-    } else if (sModel.find("DE910") == 0) {
-        sCode = "EV3";
-        eCode = SUCCESS;
-    } else {
-        sCode = VALUE_NOT_SUPPORTED;
-        printError("RADIO| Could not identify MTS short code from model. [%s]", sModel.c_str());
-        eCode = ERROR;
-    }
-    return eCode;
-}
-
-TelitRadio::CODE TelitRadio::convertServiceDomainToString(SERVICEDOMAIN eSd, std::string& sSd) {
-    CODE eCode = FAILURE;
-    switch(eSd) {
-        case NO_SERVICE: sSd = VALUE_SD_NO_SERVICE; eCode = SUCCESS; break;
-        case CS_ONLY: sSd = VALUE_SD_CS_ONLY; eCode = SUCCESS; break;
-        case PS_ONLY: sSd = VALUE_SD_PS_ONLY; eCode = SUCCESS; break;
-        case CSPS: sSd = VALUE_SD_CSPS; eCode = SUCCESS; break;
-        default: sSd = VALUE_UNKNOWN; eCode = FAILURE; break;
-    }
-    return eCode;
-}
-
-TelitRadio::CODE TelitRadio::convertActiveBandToString(ACTIVEBAND eBand, std::string& sBand) {
-    CODE eCode = FAILURE;
-    switch(eBand) {
-        case GSM_850: sBand = VALUE_ABND_GSM_850; eCode = SUCCESS; break;
-        case GSM_900: sBand = VALUE_ABND_GSM_900; eCode = SUCCESS; break;
-        case DCS_1800: sBand = VALUE_ABND_DCS_1800; eCode = SUCCESS; break;
-        case PCS_1900: sBand = VALUE_ABND_PCS_1900; eCode = SUCCESS; break;
-        default: sBand = VALUE_UNKNOWN; eCode = FAILURE; break;
-    }
-    return eCode;
-}
-
-TelitRadio::CODE TelitRadio::convertModelToType(const std::string& sModel, std::string& sType) {
-    CODE eCode = FAILURE;
-    sType = VALUE_NOT_SUPPORTED;
-
-    if(sModel.find("HE910-D") == 0) {
-        sType = VALUE_TYPE_GSM;
-        eCode = SUCCESS;
-    } else if (sModel.find("HE910-EUD") == 0) {
-        sType = VALUE_TYPE_GSM;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-JN1") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE866A1-JS") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-NAG") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C4-NF") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-NA1") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-SVG") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-EUG") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C4-EU") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910-EU1") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("LE910C1-NS") == 0) {
-    	sType = VALUE_TYPE_LTE;
-    	eCode = SUCCESS;
-    } else if (sModel.find("LE910C1-AP") == 0) {
-    	sType = VALUE_TYPE_LTE;
-    	eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-NA") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-NV") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("ME910C1-WW") == 0) {
-        sType = VALUE_TYPE_LTE;
-        eCode = SUCCESS;
-    } else if (sModel.find("GE910") == 0) {
-        sType = VALUE_TYPE_GSM;
-        eCode = SUCCESS;
-    } else if (sModel.find("CE910") == 0) {
-        sType = VALUE_TYPE_CDMA;
-        eCode = SUCCESS;
-    } else if (sModel.find("DE910") == 0) {
-        sType = VALUE_TYPE_CDMA;
-        eCode = SUCCESS;
-    } else {
-        sType = VALUE_TYPE_GSM;
-        eCode = ERROR;
-        printError("RADIO| Could not identify type from model. [%s].  Assuming [%s]", sModel.c_str(), sType.c_str());
-    }
-    return eCode;
-}
-
 TelitRadio::CODE TelitRadio::getFirmware(std::string& sFirmware) {
     printTrace("%s| Get Firmware", m_sName.c_str());
     sFirmware = VALUE_NOT_SUPPORTED;