[Feature][MD310][task-view-792][webui] add fota led && fix at+led
Change-Id: Ic65bb1a274f543add4d7762e4de41e01a6a2f595
diff --git a/lynq/MD310/ap/app/fota_upi/src/upi_led.c b/lynq/MD310/ap/app/fota_upi/src/upi_led.c
index 8938510..2ed298d 100755
--- a/lynq/MD310/ap/app/fota_upi/src/upi_led.c
+++ b/lynq/MD310/ap/app/fota_upi/src/upi_led.c
@@ -39,7 +39,9 @@
#define SIGNAL_2_LED "/sys/class/leds/signal_status2_led/"
#define SIGNAL_3_LED "/sys/class/leds/signal_status3_led/"
-#define WIFI_BLUE_LED "/sys/class/leds/wifi_led/"
+#define WIFI_RED_LED "/sys/class/leds/wifi_r_led/"
+#define WIFI_GREEN_LED "/sys/class/leds/wifi_g_led/"
+#define WIFI_BLUE_LED "/sys/class/leds/wifi_b_led/"
#define BATTERY_RED_LED "/sys/class/leds/battery_r_led/"
@@ -103,7 +105,7 @@
{
int ret = -1;
int fd = -1;
-
+
fd = open(filepath, O_RDWR|O_TRUNC);
if (fd < 0)
{
@@ -122,17 +124,17 @@
{
upi_log("write counts: %d\n", ret);
}
-
+
ret = close(fd);
if(ret < 0)
{
upi_err("close file fail [%s], error:%d[%s]\n", filepath, errno, strerror(errno));
return -1;
}
-
+
return 0;
}
-
+
/**
* @brief ÉèÖÃLEDµÈÁÁÃð¼°ÉÁ˸
@@ -181,22 +183,22 @@
snprintf(content, sizeof(content), "%s", blinkSwitch);
snprintf(path, sizeof(path), "%s%s", ledName, BLINKSWITDH);
ret_1 = write_led_file(path, content);
-
+
memset(content, 0, sizeof(content));
memset(path, 0, sizeof(path));
snprintf(content, sizeof(content), "%d", onMs);
snprintf(path, sizeof(path), "%s%s", ledName, BLINKTIMEON);
ret_2 = write_led_file(path, content);
-
+
memset(content, 0, sizeof(content));
memset(path, 0, sizeof(path));
snprintf(content, sizeof(content), "%d", offMs);
snprintf(path, sizeof(path), "%s%s", ledName, BLINKTIMEOFF);
ret_3 = write_led_file(path, content);
-
+
upi_log("set_led_blink set [%s] blink: %dms on, %dms off, ret=%d|%d|%d \n", ledName, onMs, offMs, ret_1, ret_2, ret_3);
ret = (ret_1 & ret_2 & ret_3);
-
+
break;
}
@@ -226,19 +228,13 @@
void set_upi_leds_on(void)
{
int i = 0;
- char* led_list[] = {MODEM_BLUE_LED, MODEM_GREEN_LED, WIFI_BLUE_LED, SMS_LED, MODEM_RED_LED, NULL};
+ char* led_list[] = {MODEM_GREEN_LED, WIFI_GREEN_LED, BATTERY_GREEN_LED, NULL};
int led_list_len = sizeof(led_list) / sizeof(char*);
// ϨÃðÆäËûLEDµÆ
- led_handle(WL_LED, LEDOFF, LEDBLINKOFF, 0, 0);
-
- led_handle(SIGNAL_1_LED, LEDOFF, LEDBLINKOFF, 0, 0);
- led_handle(SIGNAL_2_LED, LEDOFF, LEDBLINKOFF, 0, 0);
- led_handle(SIGNAL_3_LED, LEDOFF, LEDBLINKOFF, 0, 0);
-
- led_handle(SMS_LED, LEDOFF, LEDBLINKOFF, 0, 0);
-
+ led_handle(WIFI_RED_LED, LEDOFF, LEDBLINKOFF, 0, 0);
+ led_handle(WIFI_GREEN_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(WIFI_BLUE_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(BATTERY_RED_LED, LEDOFF, LEDBLINKOFF, 0, 0);
@@ -272,12 +268,14 @@
void set_upi_leds_off(void)
{
led_handle(WIFI_BLUE_LED, LEDOFF, LEDBLINKOFF, 0, 0);
+ led_handle(WIFI_GREEN_LED, LEDOFF, LEDBLINKOFF, 0, 0);
+ led_handle(WIFI_RED_LED, LEDOFF, LEDBLINKOFF, 0, 0);
+ led_handle(BATTERY_RED_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(BATTERY_GREEN_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(BATTERY_BLUE_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(MODEM_GREEN_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(MODEM_BLUE_LED, LEDOFF, LEDBLINKOFF, 0, 0);
led_handle(MODEM_RED_LED, LEDOFF, LEDBLINKOFF, 0, 0);
- led_handle(SMS_LED, LEDOFF, LEDBLINKOFF, 0, 0);
}
diff --git a/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/extat_softap_register.c b/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/extat_softap_register.c
index 23ee0c7..b00ad68 100755
--- a/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/extat_softap_register.c
+++ b/lynq/MD310/ap/app/zte_comm/at_ctl/src/atconfig/extat_softap_register.c
@@ -159,16 +159,16 @@
return AT_END;
memset(opt, 0 , sizeof(restart_info));
void *p[2] = {&opt->action, &opt->subaction};
-
+
parse_param2("%d,%d", at_paras, p);
-
+
if (3 != strlen(at_paras) || opt->action < Restart_Action_RESTART || opt->action > Restart_Action_RESET || opt->subaction < Operate_By_MCU || opt->subaction > Operate_By_SOC)
{
*res_msg = at_err_build(ATERR_PARAM_INVALID);
*res_msglen = strlen(*res_msg);
return AT_END;
}
-
+
printf("ext_restart_req action=%d,subaction=%d ,len=%d \n",opt->action, opt->subaction,strlen(at_paras));
*res_msg = opt;
*res_msglen = sizeof(restart_info);
@@ -246,12 +246,12 @@
snprintf(nv_atv,12,"%d",g_atv);
snprintf(nv_atq,12,"%d",g_atq);
snprintf(nv_at_d,12,"%d",g_at_d);
-
+
cfg_set("at_atv", nv_atv);
cfg_set("at_atq", nv_atq);
cfg_set("at_at_d", nv_at_d);
cfg_save();
-
+
return AT_END;
}
@@ -311,11 +311,11 @@
}
else
sprintf(at_str,"\r\n+CME ERROR: %d\r\n",101);
-
+
}
else
sprintf(at_str,"\r\n+CME ERROR: %d\r\n",102);
-
+
*res_msg = at_str;
return AT_END;
}
@@ -372,7 +372,7 @@
}
else
sprintf(at_str,"\r\n+CME ERROR: %d\r\n",102);
-
+
*res_msg = at_str;
return AT_END;
}
@@ -424,11 +424,11 @@
}
else
sprintf(at_str,"\r\n+CME ERROR: %d\r\n",101);
-
+
}
else
sprintf(at_str,"\r\n+CME ERROR: %d\r\n",102);
-
+
*res_msg = at_str;
return AT_END;
}
@@ -525,23 +525,26 @@
int ext_at_led_func(char *at_paras, void ** res_msg)
{
int i = 0;
- char *led_list[6] = {
+ char *led_list[9] = {
"battery_g_led",
"modem_g_led",
+ "wifi_g_led",
"battery_r_led",
"modem_r_led",
- "wifi_led",
- "modem_b_led",};
- set_led_states(led_list, 0, 6, 0); // turn off all leds
- set_led_states(led_list, 0, 2, 1); // turn on all green leds
+ "wifi_r_led",
+ "battery_b_led",
+ "modem_b_led",
+ "wifi_b_led",};
+ set_led_states(led_list, 0, 9, 0); // turn off all leds
+ set_led_states(led_list, 0, 3, 1); // turn on all green leds
usleep(500000);
- set_led_states(led_list, 0, 2, 0); // turn off all green leds
- set_led_states(led_list, 2, 2, 1); // turn on all red leds
+ set_led_states(led_list, 0, 3, 0); // turn off all green leds
+ set_led_states(led_list, 3, 3, 1); // turn on all red leds
usleep(500000);
- set_led_states(led_list, 2, 2, 0); // turn off all red leds
- set_led_states(led_list, 4, 2, 1); // turn on all blue leds
+ set_led_states(led_list, 3, 3, 0); // turn off all red leds
+ set_led_states(led_list, 6, 3, 1); // turn on all blue leds
usleep(500000);
- set_led_states(led_list, 4, 2, 0); // turn off all blue leds
+ set_led_states(led_list, 6, 3, 0); // turn off all blue leds
return AT_END;
}
@@ -560,7 +563,7 @@
MSG_CMD_WIFI_CFG_PWD_RSP,
ext_wifi_cfg_auth_req, ext_wifi_operate_rsp);
-
+
register_serv_func2("ZRESET",MODULE_ID_MAIN_CTRL,MSG_CMD_RESET_REQUEST,MSG_CMD_RESTART_RSP,ext_reset_req,ext_restart_rsp);//½ö¹©Éú²ú²âÊÔÓÃ
register_serv_func2("ZRESTART=",MODULE_ID_MAIN_CTRL,MSG_CMD_RESTART_REQUEST,MSG_CMD_RESTART_RSP,ext_restart_req,ext_restart_rsp);//ZRESTART=0,0,²ÎÊý1±íʾRESET /RESTART£¬²ÎÊý2±íʾʵ¼ÊÖØÆô²Ù×÷ÊÇ·ñÓɱ¾ºË×Ô¼ºÊµÏÖ
register_serv_func("TC_CONTROL=",MODULE_ID_MAIN_CTRL,ext_tc_control_func);