1.usb驱动移植--未完成；2.4g默认开启测试

BSP/linux-kernel/arch/arm/configs/na51089_evb_cardv_defconfig_release

@@ -867,7 +867,7 @@ CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
+CONFIG_OF_MDIO=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -1007,7 +1007,7 @@ CONFIG_BLK_DEV_SD=m
 # CONFIG_MD is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
-CONFIG_MII=m
+CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
@@ -1075,15 +1075,15 @@ CONFIG_NOVATEK_DWC_ETH_QOS_NA51089=m
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=m
+CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 # CONFIG_MDIO_MSCC_MIIM is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
 
 #
@@ -1103,7 +1103,7 @@ CONFIG_SWPHY=y
 # CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
-CONFIG_FIXED_PHY=m
+CONFIG_FIXED_PHY=y
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_INTEL_XWAY_PHY is not set
 # CONFIG_LSI_ET1011C_PHY is not set
@@ -1128,11 +1128,48 @@ CONFIG_NVT_PHY_NA51055=m
 # CONFIG_MICREL_KS8995MA is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-
+CONFIG_USB_NET_DRIVERS=y
-#
+# CONFIG_USB_CATC is not set
-# Host-side USB support is needed for USB Network Adapter support
+# CONFIG_USB_KAWETH is not set
-#
+# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_NET_DRIVERS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_RTL8152 is not set
+# CONFIG_USB_LAN78XX is not set
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_AX88179_178A=y
+CONFIG_USB_NET_CDCETHER=y
+# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_CDC_NCM=y
+# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
+CONFIG_USB_NET_CDC_MBIM=y
+# CONFIG_USB_NET_DM9601 is not set
+# CONFIG_USB_NET_SR9700 is not set
+# CONFIG_USB_NET_SR9800 is not set
+# CONFIG_USB_NET_SMSC75XX is not set
+# CONFIG_USB_NET_SMSC95XX is not set
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=y
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+CONFIG_USB_NET_RNDIS_HOST=y
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=y
+CONFIG_USB_NET_CDC_SUBSET=y
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=y
+# CONFIG_USB_NET_CX82310_ETH is not set
+# CONFIG_USB_NET_KALMIA is not set
+CONFIG_USB_NET_QMI_WWAN=y
+# CONFIG_USB_NET_INT51X1 is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_VL600 is not set
+# CONFIG_USB_NET_CH9200 is not set
 CONFIG_WLAN=y
 # CONFIG_WIRELESS_WDS is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
@@ -1729,9 +1766,9 @@ CONFIG_USB_HID=m
 # CONFIG_I2C_HID is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
+CONFIG_USB=y
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
 
 #
@@ -1767,9 +1804,9 @@ CONFIG_USB_EHCI_HCD_NVTIVOT=y
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_ACM is not set
+CONFIG_USB_ACM=y
 # CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
+CONFIG_USB_WDM=y
 # CONFIG_USB_TMC is not set
 
 #
@@ -1811,7 +1848,61 @@ CONFIG_USB_STORAGE=m
 #
 # USB port drivers
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
+# CONFIG_USB_SERIAL_GENERIC is not set
+# CONFIG_USB_SERIAL_SIMPLE is not set
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_F81232 is not set
+# CONFIG_USB_SERIAL_F8153X is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+CONFIG_USB_SERIAL_IPW=y
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_MXUPORT is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+CONFIG_USB_SERIAL_QUALCOMM=y
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_WWAN=y
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
+CONFIG_USB_SERIAL_OPTICON=y
+# CONFIG_USB_SERIAL_XSENS_MT is not set
+# CONFIG_USB_SERIAL_WISHBONE is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_UPD78F0730 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
 
 #
 # USB Miscellaneous drivers

BSP/linux-kernel/drivers/usb/serial/option.c

@@ -569,6 +569,19 @@ static void option_instat_callback(struct urb *urb);
 
 
 static const struct usb_device_id option_ids[] = {
+    #if 1 //Added by Quectel
+    { USB_DEVICE(0x05C6, 0x9090) }, /* Quectel UC15 */
+    { USB_DEVICE(0x05C6, 0x9003) }, /* Quectel UC20 */
+    { USB_DEVICE(0x2C7C, 0x0125) }, /* Quectel EC25 */
+    { USB_DEVICE(0x2C7C, 0x0121) }, /* Quectel EC21 */
+    { USB_DEVICE(0x05C6, 0x9215) }, /* Quectel EC20 */
+    { USB_DEVICE(0x2C7C, 0x0191) }, /* Quectel EG91 */
+    { USB_DEVICE(0x2C7C, 0x0195) }, /* Quectel EG95 */
+    { USB_DEVICE(0x2C7C, 0x0306) }, /* Quectel EG06/EP06/EM06 */
+    { USB_DEVICE(0x2C7C, 0x0296) }, /* Quectel BG96 */
+    { USB_DEVICE(0x2C7C, 0x0435) }, /* Quectel AG35 */
+    #endif
+
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
@@ -2037,6 +2050,9 @@ static struct usb_serial_driver option_1port_device = {
 #ifdef CONFIG_PM
 	.suspend           = usb_wwan_suspend,
 	.resume            = usb_wwan_resume,
+    #if 1 //Added by Quectel
+    .reset_resume = usb_wwan_resume,
+    #endif  
 #endif
 };
 
@@ -2072,6 +2088,60 @@ static int option_probe(struct usb_serial *serial,
 	if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)
 		return -ENODEV;
     
+    #if 1 //Added by Quectel
+    //For USB Auto Suspend
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&    serial->dev->descriptor.idProduct == cpu_to_le16(0x9090)) {
+      pm_runtime_set_autosuspend_delay(&serial->dev->dev, 3000);
+      usb_enable_autosuspend(serial->dev);
+     }
+      
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&  serial->dev->descriptor.idProduct == cpu_to_le16(0x9003)) {
+      pm_runtime_set_autosuspend_delay(&serial->dev->dev, 3000);
+      usb_enable_autosuspend(serial->dev);
+     }
+      
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&  serial->dev->descriptor.idProduct == cpu_to_le16(0x9215)) {
+      pm_runtime_set_autosuspend_delay(&serial->dev->dev, 3000); 
+      usb_enable_autosuspend(serial->dev);
+    }
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x2C7C)) {
+      pm_runtime_set_autosuspend_delay(&serial->dev->dev, 3000);
+      usb_enable_autosuspend(serial->dev);
+    }
+    #endif
+     #if 1 //Added by Quectel
+     //Quectel UC20's interface 4 can be used as USB Network device
+     if  (serial->dev->descriptor.idVendor  ==  cpu_to_le16(0x05C6)  &&   serial->dev->descriptor.idProduct == cpu_to_le16(0x9003)
+     && serial->interface->cur_altsetting->desc.bInterfaceNumber >= 4)
+    return -ENODEV;
+    
+     //Quectel EC20's interface 4 can be used as USB Network device
+     if  (serial->dev->descriptor.idVendor  ==  cpu_to_le16(0x05C6)  &&   serial->dev->descriptor.idProduct == cpu_to_le16(0x9215)
+     && serial->interface->cur_altsetting->desc.bInterfaceNumber >= 4)
+     return -ENODEV;
+    
+     //Quectel EC25&EC21&EC20 R2.0&EG91&EG95&EG06&EP06&EM06&BG96's interface 4 can be   used as USB Network device
+     if (serial->dev->descriptor.idVendor == cpu_to_le16(0x2C7C)   && serial->interface->cur_altsetting->desc.bInterfaceNumber >= 4)
+       return -ENODEV;
+    
+     #endif
+     
+    #if 1 //Added by Quectel
+    //For USB Remote Wakeup
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&  serial->dev->descriptor.idProduct == cpu_to_le16(0x9090)) {
+      device_init_wakeup(&serial->dev->dev, 1); //usb remote wakeup
+    }
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&  serial->dev->descriptor.idProduct == cpu_to_le16(0x9003)) {
+      device_init_wakeup(&serial->dev->dev, 1); //usb remote wakeup
+    }
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) &&  serial->dev->descriptor.idProduct == cpu_to_le16(0x9215)) {
+      device_init_wakeup(&serial->dev->dev, 1); //usb remote wakeup
+    }
+    if (serial->dev->descriptor.idVendor == cpu_to_le16(0x2C7C)) {
+      device_init_wakeup(&serial->dev->dev, 1); //usb remote wakeup
+    }
+    #endif
+
 	/* Store the device flags so we can use them during attach. */
 	usb_set_serial_data(serial, (void *)device_flags);
 

BSP/linux-kernel/drivers/usb/serial/usb_wwan.c

@@ -499,6 +499,19 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port,
 	usb_fill_bulk_urb(urb, serial->dev,
 			  usb_sndbulkpipe(serial->dev, endpoint) | dir,
 			  buf, len, callback, ctx);
+    #if 1 //Added by Quectel for zero packet
+    if (dir == USB_DIR_OUT) {
+      struct usb_device_descriptor *desc = &serial->dev->descriptor;
+    if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9090))
+      urb->transfer_flags |= URB_ZERO_PACKET;
+    if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9003))
+     urb->transfer_flags |= URB_ZERO_PACKET;
+    if (desc->idVendor == cpu_to_le16(0x05C6) && desc->idProduct == cpu_to_le16(0x9215))
+      urb->transfer_flags |= URB_ZERO_PACKET;
+    if (desc->idVendor == cpu_to_le16(0x2C7C))
+      urb->transfer_flags |= URB_ZERO_PACKET;
+    }
+    #endif
 
 	return urb;
 }

code/application/source/cardv/SrcCode/System/main.c

@@ -354,6 +354,7 @@ int NvtMain(void)
 		sf_mcu_init();
 		sf_get_power_on_mode();
 		sf_mcu_wdg_set(30);        
+		//sf_mcu_reg_set(SF_MCU_CTRL_MODULE_PIR, 1);
         sf_sd_exist_reg_cb(DrvCARD_DetStrgCard);
         /*led init*/
 	    sf_led_init();

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h

@@ -175,7 +175,7 @@
 #define DEFAULT_PIR_SWITCH    SF_ON
 #define DEFAULT_TIMELAPSE_SWITCH    SF_ON
 #define DEFAULT_PIR_DELAY_SWITCH    SF_OFF
-#define DEFAULT_GPRS_MODE    SF_REMOTE_CONTROL_OFF
+#define DEFAULT_GPRS_MODE    SF_REMOTE_CONTROL_REAL_TIME
 #define DEFAULT_DAILY_REPORT_SWITCH    SF_ON
 #define DEFAULT_GPS_SWITCH    SF_OFF
 #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h

@@ -38,92 +38,11 @@ typedef struct _UISysInfo {
 UISysInfo;
 
 // Maximum system flag number
-#define MAX_SYS_FLAG_NUM            256
+#define MAX_SYS_FLAG_NUM            512
 
 //PStore
 #define VER_STR_MAX     32
 
-/**
-    @brief UIMenuStoreInfo is the data structure
-    for keep data in pstore;permanent storage
-*/
-typedef struct _UIMenuUIMenuStoreInfo {
-	//Common
-	CHAR        strMakerString[VER_STR_MAX];
-	CHAR        strModelString[VER_STR_MAX];
-	CHAR        strSoftwareVer[VER_STR_MAX];
-	CHAR        strMakeNote[VER_STR_MAX];
-	CHAR        strImageDescription[VER_STR_MAX];
-	UINT32      uhInfoSize;
-	UINT32      UIParameter[MAX_SYS_FLAG_NUM];
-	UINT32 ulmodeIndex ; //Record Last Mode Index
-	UINT32 cbYear;
-	UINT32 cbMonth;
-	UINT32 cbDay;
-	UINT32 cbFileID;
-	UINT32 ubLanguageIndex;
-	//photo menu
-	UINT32 ubAFWindowIndex;
-	UINT32 ubAFBeamIndex;
-	UINT32 ubContAF;
-	UINT32 ubAEmode;
-	UINT32 ubQviewIndex;
-	UINT32 ubDzoom;
-	UINT32 ubBlinkDet;
-	UINT32 ubSlowShutter;
-	UINT32 ubContshotIndex;
-	UINT32 ubTimelapseIndex;
-	UINT32 ubDatePrint;
-	UINT32 ubPanModeIndex;
-	UINT32 ubFlashIndex;
-	UINT32 ubEVIndex;
-	UINT32 ubSizeIndex;
-	UINT32 ubQualityIndex;
-	UINT32 ubWBIndex;
-	UINT32 ubColorIndex;
-	UINT32 ubISOIndex;
-	UINT32 ubFDIndex ;
-	UINT32 ubSharpnessIndex;
-	UINT32 ubPhotoDispMode;
-#if(WIFI_FUNC==ENABLE)
-	//wifi
-	CHAR   strSSID[NVT_WSC_MAX_SSID_LEN];
-	CHAR   strPASSPHRASE[NVT_MAX_WEP_KEY_LEN];
-
-	CHAR   strSSID_hotspot_1[NVT_WSC_MAX_SSID_LEN];
-	CHAR   strPASSPHRASE_hotspot_1[NVT_MAX_WEP_KEY_LEN];
-#endif
-
-	//============Sifar==============///Payton
-	SF_PARA_TIME_S TimelapseTime;
-	SF_WORKTIME_S WorkTime[SF_TIMER_MAX_NUMBER];
-	SF_PARA_TIME_S PirDelayTime;
-	SF_PARA_TIME_S DailyReportTime;
-	SF_PARA_TIME_S DailyReportTime2;
-    #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
-    SF_PARA_TIME_S TimeSend1;
-	SF_PARA_TIME_S TimeSend2;
-	SF_PARA_TIME_S TimeSend3;
-	SF_PARA_TIME_S TimeSend4;
-    #endif
-	CHAR CamNameStr[13];
-    CHAR PwdStr[7];
-    CHAR Latitude[16];
-	CHAR Longitude[16];
-    CHAR Sim4gApn[40];
-	CHAR Sim4gUsr[40];
-	CHAR Sim4gPwd[20];/* */
-	CHAR SimPinStr[8];/* */
-	CHAR ModuleImei[20];
-    CHAR ModuleVer[50];
-	CHAR ModuleSubver[50];
-	CHAR AcmIp[60];
-	CHAR AcmPort[5];
-	CHAR WebIp[70];
-	//============Sifar==============///Payton
-
-} UIMenuStoreInfo;
-
 
 
 typedef enum {
@@ -420,6 +339,87 @@ typedef enum {
 	FL_IndexInfoMAX
 } UI_IndexInfo;
 
+/**
+    @brief UIMenuStoreInfo is the data structure
+    for keep data in pstore;permanent storage
+*/
+typedef struct _UIMenuUIMenuStoreInfo {
+	//Common
+	CHAR        strMakerString[VER_STR_MAX];
+	CHAR        strModelString[VER_STR_MAX];
+	CHAR        strSoftwareVer[VER_STR_MAX];
+	CHAR        strMakeNote[VER_STR_MAX];
+	CHAR        strImageDescription[VER_STR_MAX];
+	UINT32      uhInfoSize;
+	UINT32      UIParameter[FL_IndexInfoMAX];
+	UINT32 ulmodeIndex ; //Record Last Mode Index
+	UINT32 cbYear;
+	UINT32 cbMonth;
+	UINT32 cbDay;
+	UINT32 cbFileID;
+	UINT32 ubLanguageIndex;
+	//photo menu
+	UINT32 ubAFWindowIndex;
+	UINT32 ubAFBeamIndex;
+	UINT32 ubContAF;
+	UINT32 ubAEmode;
+	UINT32 ubQviewIndex;
+	UINT32 ubDzoom;
+	UINT32 ubBlinkDet;
+	UINT32 ubSlowShutter;
+	UINT32 ubContshotIndex;
+	UINT32 ubTimelapseIndex;
+	UINT32 ubDatePrint;
+	UINT32 ubPanModeIndex;
+	UINT32 ubFlashIndex;
+	UINT32 ubEVIndex;
+	UINT32 ubSizeIndex;
+	UINT32 ubQualityIndex;
+	UINT32 ubWBIndex;
+	UINT32 ubColorIndex;
+	UINT32 ubISOIndex;
+	UINT32 ubFDIndex ;
+	UINT32 ubSharpnessIndex;
+	UINT32 ubPhotoDispMode;
+#if(WIFI_FUNC==ENABLE)
+	//wifi
+	CHAR   strSSID[NVT_WSC_MAX_SSID_LEN];
+	CHAR   strPASSPHRASE[NVT_MAX_WEP_KEY_LEN];
+
+	CHAR   strSSID_hotspot_1[NVT_WSC_MAX_SSID_LEN];
+	CHAR   strPASSPHRASE_hotspot_1[NVT_MAX_WEP_KEY_LEN];
+#endif
+
+	//============Sifar==============///Payton
+	SF_PARA_TIME_S TimelapseTime;
+	SF_WORKTIME_S WorkTime[SF_TIMER_MAX_NUMBER];
+	SF_PARA_TIME_S PirDelayTime;
+	SF_PARA_TIME_S DailyReportTime;
+	SF_PARA_TIME_S DailyReportTime2;
+    #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
+    SF_PARA_TIME_S TimeSend1;
+	SF_PARA_TIME_S TimeSend2;
+	SF_PARA_TIME_S TimeSend3;
+	SF_PARA_TIME_S TimeSend4;
+    #endif
+	CHAR CamNameStr[13];
+    CHAR PwdStr[7];
+    CHAR Latitude[16];
+	CHAR Longitude[16];
+    CHAR Sim4gApn[40];
+	CHAR Sim4gUsr[40];
+	CHAR Sim4gPwd[20];/* */
+	CHAR SimPinStr[8];/* */
+	CHAR ModuleImei[20];
+    CHAR ModuleVer[50];
+	CHAR ModuleSubver[50];
+	CHAR AcmIp[60];
+	CHAR AcmPort[5];
+	CHAR WebIp[70];
+	//============Sifar==============///Payton
+
+} UIMenuStoreInfo;
+
 
 //#NT#2016/06/14#Charlie Chang -begin
 //#NT# support contrast ,two way audio in , two way audio in sample rate, flip, quality set

code/lib/source/sifar/code/source/mcu/sf_mcu_client.c

@@ -1316,7 +1316,7 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
         return FAIL;
     }
 
-	printf("sf_mcu_reg_set attrId=%d val=%d\n", attrId, val);
+	printf("%s:%d attrId=%d val=%d\n", __FUNCTION__, __LINE__, attrId, val);
 
 	if((simCardInsert) && (1 == SysGetFlag(NeedTimeSyncStartUp)))
 	{	

configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-gpio.dtsi

@@ -200,5 +200,5 @@
 
 	pgpio11{gpio_config = <P_GPIO(11) 1>;};	/*led*/
     pgpio7{gpio_config = <P_GPIO(7) 0>;};	
-
+	pgpio2{gpio_config = <P_GPIO(2) 0>;};/*USB_MUX_S : set 0 to host, set 1 to 4G*/
 };

configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S530/nvt-storage-partition.dtsi

@@ -12,11 +12,11 @@
 	partition_fdt.app     {	label = "fdt.app";    	reg = <0x0 0x30000   0x0 0x20000>; }; /* Fixed */
 	partition_uboot {       label = "uboot";        reg = <0x0 0x50000  0x0 0xA0000>; };
 	partition_uenv {        label = "uenv";         reg = <0x0 0xF0000  0x0 0x10000>; };
-	partition_kernel {      label = "kernel";       reg = <0x0 0x100000  0x0 0x260000>; };
+	partition_kernel {      label = "kernel";       reg = <0x0 0x100000  0x0 0x290000>; };
-	partition_rootfs {      label = "rootfs";       reg = <0x0 0x360000  0x0 0x3E0000>; };
+	partition_rootfs {      label = "rootfs";       reg = <0x0 0x390000  0x0 0x3E0000>; };
-	partition_rootfs1 {     label = "rootfs1";      reg = <0x0 0x740000  0x0 0x810000>; };
+	partition_rootfs1 {     label = "rootfs1";      reg = <0x0 0x770000  0x0 0x810000>; };
-	partition_rtos {        label = "rtos";         reg = <0x0 0xF50000 0x0 0x900000>; };
+	partition_rtos {        label = "rtos";         reg = <0x0 0xF80000 0x0 0x900000>; };
-	partition_app {       	label = "app";          reg = <0x0 0x1850000 0x0 0x50000>; }; /* app size depneds on hdal/samples/vendor_cfg/Makeile: ROOTFS_UBI_MAX_LEB_COUNT */
+	partition_app {       	label = "app";          reg = <0x0 0x1880000 0x0 0x50000>; }; /* app size depneds on hdal/samples/vendor_cfg/Makeile: ROOTFS_UBI_MAX_LEB_COUNT */
-	partition_sys {		label = "sys";       	reg = <0x0 0x18A0000 0x0 0x10000>; };
+	partition_sys {		label = "sys";       	reg = <0x0 0x18D0000 0x0 0x10000>; };
 	partition_all {		label = "all";          reg = <0x0 0x0000000 0x0 0x2000000>; };
 };

rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c

@@ -151,6 +151,7 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void)
         printf("%s:%d ret:%d\n", __FUNCTION__, __LINE__,ret);
         value = sf_get_power_on_mode();
 		sf_mcu_wdg_set(5);
+		sf_mcu_reg_set(SF_MCU_CTRL_MODULE_PIR, 1);
 
         switch(value)
         {

rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h

@@ -175,13 +175,13 @@
 #define DEFAULT_PIR_SWITCH    SF_ON
 #define DEFAULT_TIMELAPSE_SWITCH    SF_ON
 #define DEFAULT_PIR_DELAY_SWITCH    SF_OFF
-#define DEFAULT_GPRS_MODE    SF_REMOTE_CONTROL_OFF
+#define DEFAULT_GPRS_MODE    SF_REMOTE_CONTROL_REAL_TIME
 #define DEFAULT_DAILY_REPORT_SWITCH    SF_ON
 #define DEFAULT_GPS_SWITCH    SF_OFF
 #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
 #define DEFAULT_PIR_SENSITIVITY    SF_PIR_SENSITIVITY_HIGH
 #elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
-#define DEFAULT_PIR_SENSITIVITY    SF_PIR_SENSITIVITY_HIGH//SF_PIR_SENSITIVITY_7
+#define DEFAULT_PIR_SENSITIVITY    SF_PIR_SENSITIVITY_0//SF_PIR_SENSITIVITY_7
 #endif
 #define DEFAULT_NET_WORK_NEED_SEARCH    SF_OFF
 #define DEFAULT_GPRS_SWITCH    SF_OFF

rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h

@@ -38,92 +38,11 @@ typedef struct _UISysInfo {
 UISysInfo;
 
 // Maximum system flag number
-#define MAX_SYS_FLAG_NUM            256
+#define MAX_SYS_FLAG_NUM            512
 
 //PStore
 #define VER_STR_MAX     32
 
-/**
-    @brief UIMenuStoreInfo is the data structure
-    for keep data in pstore;permanent storage
-*/
-typedef struct _UIMenuUIMenuStoreInfo {
-	//Common
-	CHAR        strMakerString[VER_STR_MAX];
-	CHAR        strModelString[VER_STR_MAX];
-	CHAR        strSoftwareVer[VER_STR_MAX];
-	CHAR        strMakeNote[VER_STR_MAX];
-	CHAR        strImageDescription[VER_STR_MAX];
-	UINT32      uhInfoSize;
-	UINT32      UIParameter[MAX_SYS_FLAG_NUM];
-	UINT32 ulmodeIndex ; //Record Last Mode Index
-	UINT32 cbYear;
-	UINT32 cbMonth;
-	UINT32 cbDay;
-	UINT32 cbFileID;
-	UINT32 ubLanguageIndex;
-	//photo menu
-	UINT32 ubAFWindowIndex;
-	UINT32 ubAFBeamIndex;
-	UINT32 ubContAF;
-	UINT32 ubAEmode;
-	UINT32 ubQviewIndex;
-	UINT32 ubDzoom;
-	UINT32 ubBlinkDet;
-	UINT32 ubSlowShutter;
-	UINT32 ubContshotIndex;
-	UINT32 ubTimelapseIndex;
-	UINT32 ubDatePrint;
-	UINT32 ubPanModeIndex;
-	UINT32 ubFlashIndex;
-	UINT32 ubEVIndex;
-	UINT32 ubSizeIndex;
-	UINT32 ubQualityIndex;
-	UINT32 ubWBIndex;
-	UINT32 ubColorIndex;
-	UINT32 ubISOIndex;
-	UINT32 ubFDIndex ;
-	UINT32 ubSharpnessIndex;
-	UINT32 ubPhotoDispMode;
-#if(WIFI_FUNC==ENABLE)
-	//wifi
-	CHAR   strSSID[NVT_WSC_MAX_SSID_LEN];
-	CHAR   strPASSPHRASE[NVT_MAX_WEP_KEY_LEN];
-
-	CHAR   strSSID_hotspot_1[NVT_WSC_MAX_SSID_LEN];
-	CHAR   strPASSPHRASE_hotspot_1[NVT_MAX_WEP_KEY_LEN];
-#endif
-
-	//============Sifar==============///Payton
-	SF_PARA_TIME_S TimelapseTime;
-	SF_WORKTIME_S WorkTime[SF_TIMER_MAX_NUMBER];
-	SF_PARA_TIME_S PirDelayTime;
-	SF_PARA_TIME_S DailyReportTime;
-	SF_PARA_TIME_S DailyReportTime2;
-    #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
-    SF_PARA_TIME_S TimeSend1;
-	SF_PARA_TIME_S TimeSend2;
-	SF_PARA_TIME_S TimeSend3;
-	SF_PARA_TIME_S TimeSend4;
-    #endif
-	CHAR CamNameStr[13];
-    CHAR PwdStr[7];
-    CHAR Latitude[16];
-	CHAR Longitude[16];
-    CHAR Sim4gApn[40];
-	CHAR Sim4gUsr[40];
-	CHAR Sim4gPwd[20];/* */
-	CHAR SimPinStr[8];/* */
-	CHAR ModuleImei[20];
-    CHAR ModuleVer[50];
-	CHAR ModuleSubver[50];
-	CHAR AcmIp[60];
-	CHAR AcmPort[5];
-	CHAR WebIp[70];
-	//============Sifar==============///Payton
-
-} UIMenuStoreInfo;
-
 
 
 typedef enum {
@@ -420,6 +339,87 @@ typedef enum {
 	FL_IndexInfoMAX
 } UI_IndexInfo;
 
+/**
+    @brief UIMenuStoreInfo is the data structure
+    for keep data in pstore;permanent storage
+*/
+typedef struct _UIMenuUIMenuStoreInfo {
+	//Common
+	CHAR        strMakerString[VER_STR_MAX];
+	CHAR        strModelString[VER_STR_MAX];
+	CHAR        strSoftwareVer[VER_STR_MAX];
+	CHAR        strMakeNote[VER_STR_MAX];
+	CHAR        strImageDescription[VER_STR_MAX];
+	UINT32      uhInfoSize;
+	UINT32      UIParameter[FL_IndexInfoMAX];
+	UINT32 ulmodeIndex ; //Record Last Mode Index
+	UINT32 cbYear;
+	UINT32 cbMonth;
+	UINT32 cbDay;
+	UINT32 cbFileID;
+	UINT32 ubLanguageIndex;
+	//photo menu
+	UINT32 ubAFWindowIndex;
+	UINT32 ubAFBeamIndex;
+	UINT32 ubContAF;
+	UINT32 ubAEmode;
+	UINT32 ubQviewIndex;
+	UINT32 ubDzoom;
+	UINT32 ubBlinkDet;
+	UINT32 ubSlowShutter;
+	UINT32 ubContshotIndex;
+	UINT32 ubTimelapseIndex;
+	UINT32 ubDatePrint;
+	UINT32 ubPanModeIndex;
+	UINT32 ubFlashIndex;
+	UINT32 ubEVIndex;
+	UINT32 ubSizeIndex;
+	UINT32 ubQualityIndex;
+	UINT32 ubWBIndex;
+	UINT32 ubColorIndex;
+	UINT32 ubISOIndex;
+	UINT32 ubFDIndex ;
+	UINT32 ubSharpnessIndex;
+	UINT32 ubPhotoDispMode;
+#if(WIFI_FUNC==ENABLE)
+	//wifi
+	CHAR   strSSID[NVT_WSC_MAX_SSID_LEN];
+	CHAR   strPASSPHRASE[NVT_MAX_WEP_KEY_LEN];
+
+	CHAR   strSSID_hotspot_1[NVT_WSC_MAX_SSID_LEN];
+	CHAR   strPASSPHRASE_hotspot_1[NVT_MAX_WEP_KEY_LEN];
+#endif
+
+	//============Sifar==============///Payton
+	SF_PARA_TIME_S TimelapseTime;
+	SF_WORKTIME_S WorkTime[SF_TIMER_MAX_NUMBER];
+	SF_PARA_TIME_S PirDelayTime;
+	SF_PARA_TIME_S DailyReportTime;
+	SF_PARA_TIME_S DailyReportTime2;
+    #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
+    SF_PARA_TIME_S TimeSend1;
+	SF_PARA_TIME_S TimeSend2;
+	SF_PARA_TIME_S TimeSend3;
+	SF_PARA_TIME_S TimeSend4;
+    #endif
+	CHAR CamNameStr[13];
+    CHAR PwdStr[7];
+    CHAR Latitude[16];
+	CHAR Longitude[16];
+    CHAR Sim4gApn[40];
+	CHAR Sim4gUsr[40];
+	CHAR Sim4gPwd[20];/* */
+	CHAR SimPinStr[8];/* */
+	CHAR ModuleImei[20];
+    CHAR ModuleVer[50];
+	CHAR ModuleSubver[50];
+	CHAR AcmIp[60];
+	CHAR AcmPort[5];
+	CHAR WebIp[70];
+	//============Sifar==============///Payton
+
+} UIMenuStoreInfo;
+
 
 //#NT#2016/06/14#Charlie Chang -begin
 //#NT# support contrast ,two way audio in , two way audio in sample rate, flip, quality set
@@ -1749,7 +1749,7 @@ typedef enum
 
 typedef enum
 {
-	SF_PIR_SENSITIVITY_HIGH = 0x00,
+	SF_PIR_SENSITIVITY_0 = 0x00,
 	SF_PIR_SENSITIVITY_1,
 	SF_PIR_SENSITIVITY_2,
 	SF_PIR_SENSITIVITY_3,
@@ -1763,7 +1763,6 @@ typedef enum
 } SF_PIR_SENSITIVITY;
 #endif
 
-
 typedef enum {
 	SF_BATT_ALKALINE  = 0, 
 	SF_BATT_NI_MH,