1.mcu相关修改

code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c

@@ -162,7 +162,8 @@ unsigned char sf_mcu_power_on_para_get (MCUParam_t attrId)
         dataTemp2 = mcuData[i++];
     	IRSHTTER = (dataTemp2 << 8) | dataTemp1;
 	}
-	printf(" start mode = %d IRSHTTER = %d\n", startMode, IRSHTTER);
+
+	printf(" start mode = %d IRSHTTER = %d McuVersion:%d.%d.%d\n", startMode, IRSHTTER, (McuVersion>>8)&0xFF, McuVersion & 0xFF, McuSubVersion);
     sf_mcu_rtc_get(&time);
     if(SF_TRUE == sf_sys_rtc_time_check((SF_PARA_TIME_S*)&time)){
         sf_sys_rtc_time_set((SF_PARA_TIME_S*)&time);
@@ -1039,7 +1040,7 @@ unsigned short sf_get_mcu_ver(void)
 *************************************************/
 void sf_mcu_version_get(UINT8 *mcuVer)
 {
-	sprintf((char *)mcuVer, "%d.%d.%d", (McuVersion>>4)&0x0F, McuVersion & 0x0F, McuSubVersion);
+	sprintf((char *)mcuVer, "%d.%d.%d", (McuVersion>>8)&0xFF, McuVersion & 0xFF, McuSubVersion);
 }
 
 

code/lib/source/sifar/code/include/sf_common.h

@@ -109,4 +109,5 @@ UINT8 sf_cardv_battery_type_get(void);
 BOOL sf_is_flash_voltage_abnormal(void);
 void sf_4g_usb_remove(void);
 void sf_stamp_temperature_get(INT16 *fTem,INT16 *cTem);
+BOOL sf_cmd_cardv_4g_usb_boot(unsigned char argc, char **argv);
 #endif

code/lib/source/sifar/code/source/common/sf_common.c

@@ -89,12 +89,6 @@ static SF_THREAD_S UpgradeTskParam =
     .TskId = -1,
 };
 
-/*static SF_THREAD_S ModeuleUpgradeTskParam =
-{
-    .IsRun = 0,
-    .TskId = -1,
-};
-*/
 static SF_THREAD_S ParaTskCfg =
 {
 	.IsRun = 0,
@@ -1474,6 +1468,7 @@ static SINT32 sf_cardv_proccess_cmd_mcu(SF_MESSAGE_BUF_S *pMessageBuf)
 		case SF_MCU_CMD_MCU_VER:
             sf_set_mcu_sub_ver(pMessageBuf->arg2);
             sf_set_mcu_ver(pMessageBuf->arg3);
+            MLOGI("%d.%d.%d\n",(pMessageBuf->arg3>>4)&0x0F, pMessageBuf->arg3 & 0x0F, pMessageBuf->arg2);
 
             if((0 == sf_get_fw_update()) && (sf_get_mode_flag()) && (0 == wifistart))
             {
@@ -1980,6 +1975,7 @@ void* sf_sys_do_upgrade(void *arg)
         sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR);
     }
     else{
+        sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1);
         sf_set_fw_update(1);
         sf_set_send_statu(TRUE);
         sf_sys_status_led_set(SF_LED_SYS_STATE_UPDATE);
@@ -1990,6 +1986,7 @@ void* sf_sys_do_upgrade(void *arg)
         else {
             SysResetFlag();
         }
+        sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1);
         sf_set_send_statu(FALSE);
         sf_set_fw_update(0);
         vos_util_delay_ms(1000);
@@ -2206,4 +2203,15 @@ void sf_stamp_temperature_get(INT16 *fTem,INT16 *cTem) /*0:F  1:C*/
 {
     *fTem = fTemper;
     *cTem = cTemper;
+}
+
+BOOL sf_cmd_cardv_4g_usb_boot(unsigned char argc, char **argv)
+{
+	printf("[%s:%d] s\n", __FUNCTION__, __LINE__);
+	gpio_direction_output(GPIO_4G_USB_BOOT, 1);
+	gpio_set_value(GPIO_4G_USB_BOOT, 1);
+    sf_mcu_reg_set(SF_MCU_RESET_MODULE, 0);
+    sleep(2);
+    printf("[%s:%d] e\n", __FUNCTION__, __LINE__);
+    return TRUE;
 }

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

@@ -45,6 +45,7 @@
 #include <time.h>
 #include <io/gpio.h>
 #include "UIInfo/UIInfo.h"
+#include "sf_param_enum.h"
 //#include "../../../application/source/cardv/SrcCode/PrjInc.h"
 
 
@@ -627,7 +628,7 @@ void sf_mcu_version_get(UINT8 *mcuVer)
 *************************************************/
 void sf_mcu_version_get(UINT8 *mcuVer)
 {
-	sprintf((char *)mcuVer, "%d.%d.%d", (McuVersion>>4)&0x0F, McuVersion & 0x0F, McuSubVersion);
+	sprintf((char *)mcuVer, "%d.%d.%d", (McuVersion>>8)&0xFF, McuVersion & 0xFF, McuSubVersion);
 }
 
 
@@ -1398,6 +1399,14 @@ UINT8 sf_mcu_analog_pir_sen_convert(UINT8 pirs)
 
 UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
 {
+    #if HUNTING_CAMERA_4G == ENABLE
+    SF_MESSAGE_BUF_S stMessageBuf = {0};
+    stMessageBuf.arg2 = val;
+    stMessageBuf.arg2 = attrId;
+    stMessageBuf.arg1 = SF_MCU_CMD_SET_MCU;
+    stMessageBuf.cmdId = CMD_MCU;
+    sf_com_message_send_to_app(&stMessageBuf);
+    #endif
 #if 0
 	UINT8 mcuReg[REG_SIZE] = {0};
 	UINT8 mcuData[REG_SIZE] = {0};