Merge "[update]update version of description" into SZZT
diff --git a/src/lynq/framework/lynq-atsvc/src/common.cpp b/src/lynq/framework/lynq-atsvc/src/common.cpp
index 4409a3f..74cf21a 100755
--- a/src/lynq/framework/lynq-atsvc/src/common.cpp
+++ b/src/lynq/framework/lynq-atsvc/src/common.cpp
@@ -165,8 +165,8 @@
case PREF_NET_TYPE_LTE_CMDA_EVDO_GSM_WCDMA : return " LTE, CDMA, EvDo, GSM/WCDMA";
case PREF_NET_TYPE_LTE_ONLY : return " LTE only";
case PREF_NET_TYPE_LTE_WCDMA /*12*/ : return " LTE/WCDMA";
- case PREF_NET_TYPE_LTE_GSM /*30*/ : return " LTE/GSM";
- case PREF_NET_TYPE_LTE_TDD_ONLY /*31*/ : return " LTE only";
+ // case PREF_NET_TYPE_LTE_GSM /*30*/ : return " LTE/GSM";
+ // case PREF_NET_TYPE_LTE_TDD_ONLY /*31*/ : return " LTE only";
case 13: return "TD-SCDMA only";
case 14: return "TD-SCDMA and WCDMA";
case 15: return "TD-SCDMA and LTE";
@@ -177,8 +177,8 @@
case 20: return "TD-SCDMA, GSM/WCDMA and LTE";
case 21: return "TD-SCDMA,EvDo,CDMA,GSM/WCDMA";
case 22: return "TD-SCDMA/LTE/GSM/WCDMA, CDMA, and EvDo";
- //case 30: return "LTE/GSM";
- //case 31: return "LTE TDD Only mode";
+ case 30: return "LTE/GSM";
+ case 31: return "LTE only";
case 32: return "CDMA,GSM(2G Global)";
case 33: return "CDMA,EVDO,GSM";
case 34: return "LTE,CDMA,EVDO,GSM(4G Global, 4M)";
diff --git a/src/lynq/framework/lynq-atsvc/src/factory/lynq_factory.cpp b/src/lynq/framework/lynq-atsvc/src/factory/lynq_factory.cpp
index 2c685fe..d86d0b8 100755
--- a/src/lynq/framework/lynq-atsvc/src/factory/lynq_factory.cpp
+++ b/src/lynq/framework/lynq-atsvc/src/factory/lynq_factory.cpp
@@ -282,15 +282,15 @@
bzero(lynq_adc_log_buf,512);
if(lynq_adc_num == 0)
{
- sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage23_ADC0_raw 2>&1");
+ sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage23_ADC0_input 2>&1");
}
else if(lynq_adc_num == 1)
{
- sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage22_ADC1_raw 2>&1");
+ sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage22_ADC1_input 2>&1");
}
else if(lynq_adc_num == 2)
{
- sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage21_ADC2_raw 2>&1");
+ sprintf(lynq_adc_dev,"cat /sys/bus/iio/devices/iio:device0/in_voltage21_ADC2_input 2>&1");
}
else
{
@@ -466,7 +466,7 @@
pclose(fp);
if(lynq_get_gpio_state[8] == '1')
{
- lynq_gpio_hig = 1;
+ lynq_gpio_hig = 1;
}
bzero(lynq_set_gpio_arr, 256);
@@ -498,10 +498,15 @@
lynq_factory_response_ttyGS3(lynq_show_gpio_state);
// lynq_factory_response_ttyGS3("[gpio][result]:FAIL \n");
}
+ else
+ {
+ sprintf(lynq_show_gpio_state,"gpio%d\n",(char *)lynq_gpio_arr[i]);
+ lynq_factory_response_ttyGS3(lynq_show_gpio_state);
+ }
}
if(lynq_gpio_beta_state == 1)
{
- sprintf(lynq_show_gpio_state,"[gpio][result]:PASS \n",(char *)lynq_gpio_arr[i]);
+ sprintf(lynq_show_gpio_state,"[gpio][result]:PASS \n");
lynq_factory_response_ttyGS3(lynq_show_gpio_state);
}
return 0;
diff --git a/src/lynq/framework/lynq-atsvc/src/lynq_common.cpp b/src/lynq/framework/lynq-atsvc/src/lynq_common.cpp
index 58df14c..8ec13ab 100755
--- a/src/lynq/framework/lynq-atsvc/src/lynq_common.cpp
+++ b/src/lynq/framework/lynq-atsvc/src/lynq_common.cpp
@@ -185,18 +185,25 @@
lynqSetArgv(&(argv[2]),&Point,"0");
token = strtok(str, "=");
//argv[0] = token;
- argv[0] = strstr(token, "+")+1;
- while (token != NULL)
+ if(strstr(token, "+"))
{
- string = token;
- token = strtok(NULL, "=");
+ argv[0] = strstr(token, "+")+1;
+ while (token != NULL)
+ {
+ string = token;
+ token = strtok(NULL, "=");
+ }
+ parameter = strtok(string, ",");
+ int i = 3;
+ while (parameter != NULL)
+ {
+ argv[i++] = parameter;
+ parameter = strtok(NULL, ",");
+ }
}
- parameter = strtok(string, ",");
- int i = 3;
- while (parameter != NULL)
+ else
{
- argv[i++] = parameter;
- parameter = strtok(NULL, ",");
+ argv[0] = token;
}
}
else if(strstr(cmd,"?"))
@@ -229,41 +236,41 @@
else
{
RLOGD("sp test 01");
- if(!strcmp(cmd, "ATA")){
- lynqSetArgv(&(argv[0]),&Point,"ATA");
+ if(!strcmp(cmd, "ATA")){
+ lynqSetArgv(&(argv[0]),&Point,"ATA");
return 3;
}
if(!strcmp(cmd, "AT")){
- lynqSetArgv(&(argv[0]),&Point,"AT");
+ lynqSetArgv(&(argv[0]),&Point,"AT");
return 3;
}
/*UNKNOW*/
else if(!strncmp(cmd, "ATD", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATD");
+ lynqSetArgv(&(argv[0]),&Point,"ATD");
argv[3] = test+3;
return 4;
}
else if(!strncmp(cmd, "ATE", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATE");
+ lynqSetArgv(&(argv[0]),&Point,"ATE");
argv[3] = test+3;
return 4;
}
else if(!strcmp(cmd, "ATH")){
- lynqSetArgv(&(argv[0]),&Point,"ATH");
+ lynqSetArgv(&(argv[0]),&Point,"ATH");
return 3;
}
else if(!strncmp(cmd, "ATI", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATI");
+ lynqSetArgv(&(argv[0]),&Point,"ATI");
argv[3] = test+3;
return 4;
}
else if(!strncmp(cmd, "ATL", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATL");
+ lynqSetArgv(&(argv[0]),&Point,"ATL");
argv[3] = test+3;
return 4;
}
else if(!strncmp(cmd, "ATO", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATO");
+ lynqSetArgv(&(argv[0]),&Point,"ATO");
argv[3] = test+3;
return 3;
}
@@ -271,27 +278,22 @@
/*
*/
else if(!strncmp(cmd, "ATQ", 3)){
- lynqSetArgv(&(argv[0]),&Point,"ATQ");
+ lynqSetArgv(&(argv[0]),&Point,"ATQ");
argv[3] = test+3;
return 4;
}
- else if(!strncmp(cmd, "ATSO", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATSO");
- argv[3] = test+4;
- return 4;
- }
else if(!strncmp(cmd, "ATS3", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATS3");
+ lynqSetArgv(&(argv[0]),&Point,"ATS3");
argv[3] = test+4;
return 4;
}
else if(!strncmp(cmd, "ATS4", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATS4");
+ lynqSetArgv(&(argv[0]),&Point,"ATS4");
argv[3] = test+4;
return 4;
}
else if(!strncmp(cmd, "ATS5", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATS5");
+ lynqSetArgv(&(argv[0]),&Point,"ATS5");
argv[3] = test+4;
return 4;
}
@@ -299,17 +301,17 @@
/*
*/
else if(!strncmp(cmd, "ATS7", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATS7");
+ lynqSetArgv(&(argv[0]),&Point,"ATS7");
argv[3] = test+4;
return 4;
}
else if(!strncmp(cmd, "ATS8", 4)){
- lynqSetArgv(&(argv[0]),&Point,"ATS8");
+ lynqSetArgv(&(argv[0]),&Point,"ATS8");
argv[3] = test+4;
return 4;
}
else if(!strncmp(cmd, "ATS10", 5)){
- lynqSetArgv(&(argv[0]),&Point,"ATS10");
+ lynqSetArgv(&(argv[0]),&Point,"ATS10");
argv[3] = test+5;
return 4;
}