Merge "[Feature][S300AI][task-view-1832][at] optimize AT+GPIO=<n>"
diff --git a/lynq/R305/R305E/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user b/lynq/R305/R305E/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
index d05d3c9..040db8a 100755
--- a/lynq/R305/R305E/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
+++ b/lynq/R305/R305E/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
@@ -497,3 +497,4 @@
#for wefota end
use_network_adb=usb
SSIDbak=
+wifi_switch_status=
diff --git a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
index 51dea59..b234063 100755
--- a/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
+++ b/lynq/R305/ap/app/zte_comm/zte_mmi/mmi_led.c
@@ -396,31 +396,6 @@
mmi_file_operate(LED_BATTERY_100_BLINKSWITCH, LED_BLINKOFF_STATE);
}
-static int mmi_read_battery_now()
-{
- FILE *fd_voltage = NULL;
- char buf_volt[8] = {0};
- int voltagepower = 0;
- int len = 0;
-
- fd_voltage = fopen(CHARGE_VOLTAGE_PATH, "r");
- if (fd_voltage == NULL)
- {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI mmi_read_battery_now open voltage file fail!\n");
- return -1;
- }
- len = fread(buf_volt, 1, 8, fd_voltage);
- if (len > 0)
- {
- voltagepower = atoi(buf_volt);
- fclose(fd_voltage);
- slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI mmi_read_battery_now voltagepower=%d\n",voltagepower);
- return voltagepower;
- }
-
- return -1;
-}
-
static SINT32 mmi_cnccBatteryLedState(T_zMMIBatteryInfo *pBatteryInfo)
{
mmi_Battery_led_opt_blink_off();
@@ -485,32 +460,26 @@
mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
}
- else
+ else if ((pBatteryInfo->bat_pers >= 5) && (pBatteryInfo->bat_pers < 25))
{
- // 3090 <-> 0%|3132 <-> 1%|3174 <-> 2%|3216 <-> 3%|3258 <-> 4%|3300 <-> 5%
- int bat_now = mmi_read_battery_now();
- slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI mmi_cnccBatteryLedState bat_now=%d\n", bat_now);
- if (bat_now >= 3216) // 3 <= bat < 25
- {
- mmi_Battery_led_opt_on(LED_BATTERY_25_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
- }
- else if ((bat_now > 3090) && (bat_now < 3216)) // 0 < bat < 3
- {
- mmi_Battery_led_opt_blink(25);
- mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
- }
- else
- {
- mmi_Battery_led_opt_off(LED_BATTERY_25_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
- mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
- }
+ mmi_Battery_led_opt_on(LED_BATTERY_25_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
+ }
+ else if ((pBatteryInfo->bat_pers > 0) && (pBatteryInfo->bat_pers < 5))
+ {
+ mmi_Battery_led_opt_blink(25);
+ mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
+ }
+ else if (pBatteryInfo->bat_pers == 0)
+ {
+ mmi_Battery_led_opt_off(LED_BATTERY_25_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_50_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_75_BRIGHTNESS);
+ mmi_Battery_led_opt_off(LED_BATTERY_100_BRIGHTNESS);
}
}
diff --git a/lynq/R305/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user b/lynq/R305/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
index 9ae327a..52b2ca9 100755
--- a/lynq/R305/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
+++ b/lynq/R305/ap/project/zx297520v3/prj_cpe_min/fs/normal/rootfs/etc_ro/default/default_parameter_user
@@ -489,3 +489,4 @@
use_network_adb=usb
SSIDbak=
open_lynq_log=0
+wifi_switch_status=