From cf4325d7849b6e336d98aef71d6e0f11af244ecb Mon Sep 17 00:00:00 2001
From: payton <shenhzdl@gmail.com>
Date: Thu, 17 Aug 2023 15:10:08 +0800
Subject: [PATCH] =?UTF-8?q?1.sf=5Fapp=E8=A7=A3=E6=9E=90=E5=8D=87=E7=B4=9A?=
 =?UTF-8?q?=E6=A8=99=E8=AD=98=E4=BB=A5=E5=8F=8A=E5=84=AA=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../source/sf_app/code/source/app/sf_app.c         |  6 +++---
 .../source/sf_app/code/source/app/sf_common.c      |  6 +++---
 .../source/sf_app/code/source/app/sf_system.c      | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 code/application/source/sf_app/code/source/app/sf_common.c

diff --git a/code/application/source/sf_app/code/source/app/sf_app.c b/code/application/source/sf_app/code/source/app/sf_app.c
index 3b5b3b1f6..1c3061591 100755
--- a/code/application/source/sf_app/code/source/app/sf_app.c
+++ b/code/application/source/sf_app/code/source/app/sf_app.c
@@ -125,10 +125,10 @@ int main(int argc, char *argv[])
 
     isUsb = sf_usb_IsInsert();
     isCard = sf_in_card_exist();
-    isUpdate = sf_in_update();
+    //isUpdate = sf_in_update();
     
-    sf_set_fw_update(isUpdate);
-
+    //sf_set_fw_update(isUpdate);
+    isUpdate = sf_get_fw_update();
     printf("[%s:%d] isUsb = %d isCard = %d isUpdate:%d\n", __FUNCTION__, __LINE__, isUsb,isCard,isUpdate);
 
     if(!isUsb)
diff --git a/code/application/source/sf_app/code/source/app/sf_common.c b/code/application/source/sf_app/code/source/app/sf_common.c
old mode 100644
new mode 100755
index bd33c3807..b00cb4207
--- a/code/application/source/sf_app/code/source/app/sf_common.c
+++ b/code/application/source/sf_app/code/source/app/sf_common.c
@@ -95,7 +95,7 @@ UINT8 sf_get_fw_update(void)
 
 void sf_set_fw_update(UINT8 flag)
 {
-    SF_MESSAGE_BUF_S stMessageBuf = {0};
+    /*SF_MESSAGE_BUF_S stMessageBuf = {0};
 
     if(FwUpdate != flag)
     {
@@ -103,7 +103,7 @@ void sf_set_fw_update(UINT8 flag)
         stMessageBuf.arg1 = SF_PARA_CMD_FWUP;
         stMessageBuf.cmdId = CMD_PARA;
         sf_com_message_send_to_cardv(&stMessageBuf);
-    }
+    }*/
 	FwUpdate = flag;
 }
 void sf_set_key_fw_update(UINT8 flag)
@@ -777,7 +777,7 @@ static SINT32 sf_app_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
 			break;
 		case SF_PARA_CMD_FWUP:
             FwUpdate = pMessageBuf->arg2;
-            sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, FwUpdate);
+            //sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, FwUpdate);
 			break;
 		case SF_PARA_CMD_MOUP:
             ModuleUpdating = pMessageBuf->arg2;
diff --git a/code/application/source/sf_app/code/source/app/sf_system.c b/code/application/source/sf_app/code/source/app/sf_system.c
index 250522de9..aebb49ea8 100755
--- a/code/application/source/sf_app/code/source/app/sf_system.c
+++ b/code/application/source/sf_app/code/source/app/sf_system.c
@@ -1330,8 +1330,11 @@ UINT8 sf_check_power_on_mode(void)
     UINT32 u32ize = 0;
     char *pStrSrc = NULL;
     char *pStrOtsOk = "Mode=";
+    char *pStrUpFw = "UpFw=";
+
     char *temp = NULL;
 	UINT8 startup = 0;
+	UINT8 UpFw = 0;
 
     system("cat /proc/cmdline > /tmp/Mode.txt");
     fp = fopen("/tmp/Mode.txt","r");
@@ -1349,9 +1352,18 @@ UINT8 sf_check_power_on_mode(void)
 		if ( temp != NULL) {
             temp += strlen("Mode=");
             sscanf(temp, "%hhd", &startup);
-            printf("%s: PowerOnModeStr=%d\r\n", __func__,startup);
+            //printf("%s: PowerOnModeStr=%d\r\n", __func__,startup);
 			//printf("%s: temp=%s\r\n", __func__,temp);
 		}
+        temp = strstr(pStrSrc, pStrUpFw);
+		if ( temp != NULL) {
+            temp += strlen("UpFw=");
+            sscanf(temp, "%hhd", &UpFw);
+            //printf("%s: UpFw=%d\r\n", __func__,UpFw);
+            sf_set_fw_update(UpFw);
+		}
+        printf("%s: PowerOnModeStr=%d UpFw=%d\r\n", __func__,startup,UpFw);
+
 		free(pStrSrc);
 	}