From 6c7e61a54ef9b96f79704f0b965664e89f57dd52 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 29 May 2024 17:41:52 +0800
Subject: [PATCH] 增加休眠,开始上板测试

---
 KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
index cbfa0c8..e9054ab 100644
--- a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
+++ b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
@@ -79,7 +79,7 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
             <UserProg1Name>fromelf --bin -o ".\bin_file\@L.bin" "#L"</UserProg1Name>
             <UserProg2Name></UserProg2Name>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x19000</StartAddress>
-                <Size>0x67000</Size>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x80000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -339,7 +339,7 @@
               <MiscControls></MiscControls>
               <Define>__VTOR_PRESENT</Define>
               <Undefine></Undefine>
-              <IncludePath>..\Core;..\Drivers;..\Core\Include;..\Hardware;.\RTE\Device;..\Hardware\CLOCK;..\Hardware\DELAY;..\Hardware\GPIO;..\Hardware\UART;..\Hardware\TIM;..\Function\KEY;..\Hardware\EXTI;..\Hardware\RTC;..\Hardware\ADC;..\Hardware\I2C;..\Function\LCD;..\Function\EXTERN_RTC;..\Hardware\SPI;..\Function\GPRS;..\Function\HARDWARE_WATCHDOG;..\Function\IR_NEC;..\Function\MEASURE_INTERACTION;..\Function\POWER_MANAGE;..\Function\STORAGE;..\Function\UPPER_COMPUTER;..\Function\VALVE;..\Soft;..\MultiButton;..\USMART;..\Hardware\DMA;..\Hardware\ON_CHIP_FLASH;..\Hardware\SVD;..\Function\OFF_CHIP_FLASH;..\Hardware\CRC;..\Function\BOOTLOADER_IAP;..\Hardware\COMP;..\CmBackTrace;..\Function\E2P;..\Function\FLOW_METER_DATA_COLLECT;..\Function\WirelessRemoteComm;..\Function\POWER_MANAGE;..\Function\BILLING;..\Function\modbus;..\Function\modbus\functions;..\Function\modbus\include;..\Function\modbus\port;..\Function\modbus\rtu</IncludePath>
+              <IncludePath>..\Core;..\Drivers;..\Core\Include;..\Hardware;.\RTE\Device;..\Hardware\CLOCK;..\Hardware\DELAY;..\Hardware\GPIO;..\Hardware\UART;..\Hardware\TIM;..\Function\KEY;..\Hardware\EXTI;..\Hardware\RTC;..\Hardware\ADC;..\Hardware\I2C;..\Function\LCD;..\Function\EXTERN_RTC;..\Hardware\SPI;..\Function\GPRS;..\Function\HARDWARE_WATCHDOG;..\Function\IR_NEC;..\Function\MEASURE_INTERACTION;..\Function\POWER_MANAGE;..\Function\STORAGE;..\Function\UPPER_COMPUTER;..\Function\VALVE;..\Soft;..\MultiButton;..\USMART;..\Hardware\DMA;..\Hardware\ON_CHIP_FLASH;..\Hardware\SVD;..\Function\OFF_CHIP_FLASH;..\Hardware\CRC;..\Function\BOOTLOADER_IAP;..\Hardware\COMP;..\CmBackTrace;..\Function\E2P;..\Function\FLOW_METER_DATA_COLLECT;..\Function\WirelessRemoteComm;..\Function\POWER_MANAGE;..\Function\BILLING;..\Function\modbus;..\Function\modbus\functions;..\Function\modbus\include;..\Function\modbus\port;..\Function\modbus\rtu;..\Function\OTHER_FUN;..\Function\SYS_SLEEP</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -370,7 +370,7 @@
             <TextAddressRange>0x00000000</TextAddressRange>
             <DataAddressRange>0x20000000</DataAddressRange>
             <pXoBase></pXoBase>
-            <ScatterFile>.\UFG220_FM33A0_MainSystem_User.sct</ScatterFile>
+            <ScatterFile>.\sct\fm33a06xev_test.sct</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc></Misc>
@@ -538,6 +538,16 @@
               <FileType>1</FileType>
               <FilePath>..\Function\BILLING\billing.c</FilePath>
             </File>
+            <File>
+              <FileName>other_fun.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Function\OTHER_FUN\other_fun.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_sleep.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Function\SYS_SLEEP\sys_sleep.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -603,6 +613,11 @@
               <FileType>1</FileType>
               <FilePath>..\Function\WirelessRemoteComm\wireless_remote_comm.c</FilePath>
             </File>
+            <File>
+              <FileName>wrc_sizhu_v4.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Function\WirelessRemoteComm\wrc_sizhu_v4.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

--
Gitblit v1.9.3