summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Hatch <jhatch@multitech.com>2022-06-16 12:45:46 -0500
committerJeff Hatch <jhatch@multitech.com>2022-06-16 12:45:46 -0500
commitf354088944ec65e5faf6755b867b9140cabe616f (patch)
tree5c23af2fce87329e687e6aff1a65aec68a45eaa2
parent4d78dc6e08e3917589db8fb94e6134c5466d1787 (diff)
parent48837118e1f99dfbe93167b3f11dc5dc96f872cd (diff)
downloadradio-cmd-1.0.0.tar.gz
radio-cmd-1.0.0.tar.bz2
radio-cmd-1.0.0.zip
Merge branch 'ym/MTX-4503_remove_verizon_fota_feature' into 'master' 1.0.0
[MTX-4503] mPower R.6.0.X: Remove Verizon FOTA feature from the code GP-1610 See merge request !10
-rw-r--r--main.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/main.cpp b/main.cpp
index d29d2ad..59023c6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -66,7 +66,6 @@ std::string g_sMIPMnAaaSs;
std::string g_sMIPMnHaSs;
std::string g_sRxDiversity;
std::string g_sActiveFirmware;
-std::string g_sConfigFile;
Json::Value g_jData;
std::string g_sSimPin;
std::string g_sCellularMode;
@@ -107,7 +106,6 @@ const uint32_t OPT_MDN = 0x00400000;
const uint32_t OPT_MSID = 0x00800000;
const uint32_t OPT_SETRXDIVERSITY = 0x01000000;
const uint32_t OPT_SETACTIVEFIRMWARE = 0x02000000;
-const uint32_t OPT_CONFIG_FILE = 0x04000000;
const uint32_t OPT_SET_CELLULAR_MODE = 0x08000000;
const uint32_t OPT_UNLOCK_SIM_CARD = 0x20000000;
const uint32_t OPT_RESET_RADIO = 0x40000000;
@@ -136,7 +134,6 @@ static struct option long_options[] = {
{ "version", no_argument, 0, 'v' },
{ "printlvl", required_argument, 0, 'p' },
{ "device", required_argument, 0, 'd' },
- { "config-file", required_argument, 0, 'c' },
{ "set-mdn", required_argument, 0, 'n' },
{ "set-msl", required_argument, 0, 'm' },
{ "set-msid", required_argument, 0, 's' },
@@ -352,10 +349,7 @@ int main(int argc, char** argv) {
result = g_apRadio->updatePrl(jArgs, cb);
printf("%s\n", code2str(result));
} else if(g_iOptions & OPT_INIT_FUMO) {
- Json::Value jArgs(Json::objectValue);
- if(g_iOptions & OPT_CONFIG_FILE) {
- jArgs["config-file"] = g_sConfigFile;
- }
+ Json::Value jArgs(Json::nullValue);
result = g_apRadio->updateFumo(jArgs, cb);
printf("%s\n", code2str(result));
} else if(g_iOptions & OPT_INIT_RTN) {
@@ -536,13 +530,6 @@ void parseOptions(int argc, char** argv)
g_iOptions |= OPT_SETMSL;
break;
- case 'c':
- if(optarg != 0) {
- g_sConfigFile = optarg;
- }
- g_iOptions |= OPT_CONFIG_FILE;
- break;
-
case 'l':
if(optarg != 0) {
g_sMSL = optarg;
@@ -700,7 +687,7 @@ void printHelp(const std::string& sApp) {
printf("\t<AT_COMMAND> [ -t <TIMEOUT> -d <DEVICE> ] : send AT command. Timeout and device are optional\n");
printf("\t--device (d) <device> : modem device to use, default: /dev/modem_at1\n");
printf("\t--init-dc : initiate device configuration update\n");
- printf("\t--init-fumo [ --config-file <PATH> ] : initiate module/modem firmware update\n");
+ printf("\t--init-fumo : initiate module/modem firmware update\n");
printf("\t--init-prl : initiate PRL update\n");
printf("\t--init-activation [ --msid <MSID> --mdn <MDN>]\n");
printf("\t : initiate account activation. Some carriers require MDN and MSID\n");