From c5a5723200748ca37958223871e626b205764dce Mon Sep 17 00:00:00 2001
From: modehua <mo1027728827@qq.com>
Date: Sat, 21 Oct 2023 03:19:18 -0700
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BA=E4=BB=B6=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zynq_7010_code/main.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/zynq_7010_code/main.cpp b/zynq_7010_code/main.cpp
index b55725a..2fd6d05 100644
--- a/zynq_7010_code/main.cpp
+++ b/zynq_7010_code/main.cpp
@@ -507,7 +507,7 @@ int main(int argc, char *argv[])
 		// break;
 		case USBCommand::PRE_UPGRADE:
 		{
-			LOG("start PRE_UPGRADE \n");
+			printf("start PRE_UPGRADE \n");
 			updatePkg.open("/home/root/update.zip", ios::out | ios::binary);
 			m_scanner->SetLEDStatus(LedStatus::Updating);
 			total_length = usbcb.Length;
@@ -536,12 +536,13 @@ int main(int argc, char *argv[])
 		case USBCommand::UPDATE_FINISHED:
 		{
 
-			LOG("PRE_UPGRADE finished \n");
+			printf("PRE_UPGRADE finished \n");
 			if (total_length < (1024 * 1024 * 5))
 				this_thread::sleep_for(std::chrono::seconds(10));
 			m_scanner->SetLEDStatus(LedStatus::UpdateDone);
 			updatePkg.close();
-			system("sh /mnt/flash-disk/upgrade_firmware.sh");
+			//system("sh /mnt/flash-disk/upgrade_firmware.sh &");
+			printf("PRE_UPGRADE finished exit!!!!!!!!!!!!! \n");
 
 		}
 		break;
@@ -600,18 +601,16 @@ int main(int argc, char *argv[])
 		break;
 		case USBCommand::GET_UPDATE_RESULT:
 		{
-			fstream updateResult("/mnt/flash-disk/updata_status.txt");
-			if (!updateResult.is_open())
-				usbcb.Data = 0;
-			else
-			{
-				updateResult >> usbcb.Data;
-				updateResult.close();
-			}
+			int ret = get_devs_status("/mnt/flash-disk/update_status.txt");
+			printf("GET_UPDATE_RESULT !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\r\n");
+			printf("ret:%d\r\n",ret);
 
-			printf("usbcb.Data:%d\r\n",usbcb.Data);
+			usbcb.Data = ret;
+			if (ret == -1)
+			{
+				usbcb.Data = 100;
+			}
 			m_scanner->write_bulk(&usbcb, sizeof(usbcb));
-			this_thread::sleep_for(std::chrono::milliseconds(1000));
 
 			if (usbcb.Data == 0)
 				system("reboot");