From 08b3909c40a192778719c6262bbee4745682948d Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 31 May 2024 19:15:47 +0800
Subject: [PATCH] 测试和修改了一些功能bug
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx | 169 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 138 insertions(+), 31 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
index ce230f6..1dee2ac 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</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>
@@ -387,11 +387,6 @@
<FileName>AES128.c</FileName>
<FileType>1</FileType>
<FilePath>..\Soft\AES128.c</FilePath>
- </File>
- <File>
- <FileName>mbcrc.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\Soft\mbcrc.c</FilePath>
</File>
<File>
<FileName>sizhu_ctrl_word.c</FileName>
@@ -412,6 +407,16 @@
<FileName>main.c</FileName>
<FileType>1</FileType>
<FilePath>..\Core\main.c</FilePath>
+ </File>
+ <File>
+ <FileName>linked_list.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Soft\linked_list.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbcrc1.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Soft\mbcrc1.c</FilePath>
</File>
</Files>
</Group>
@@ -518,6 +523,31 @@
<FileType>1</FileType>
<FilePath>..\Function\E2P\EEPROM.c</FilePath>
</File>
+ <File>
+ <FileName>valve_control.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\VALVE\valve_control.c</FilePath>
+ </File>
+ <File>
+ <FileName>power_manage.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\POWER_MANAGE\power_manage.c</FilePath>
+ </File>
+ <File>
+ <FileName>billing.c</FileName>
+ <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>
@@ -576,7 +606,19 @@
</Files>
</Group>
<Group>
- <GroupName>Gprs</GroupName>
+ <GroupName>WirelessRemoteComm</GroupName>
+ <Files>
+ <File>
+ <FileName>wireless_remote_comm.c</FileName>
+ <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>
<GroupName>Lcd</GroupName>
@@ -595,26 +637,6 @@
<FileName>lcd_io_api.c</FileName>
<FileType>1</FileType>
<FilePath>..\Function\LCD\lcd_io_api.c</FilePath>
- </File>
- </Files>
- </Group>
- <Group>
- <GroupName>CmBackTrace</GroupName>
- <Files>
- <File>
- <FileName>cm_backtrace.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\CmBackTrace\cm_backtrace.c</FilePath>
- </File>
- <File>
- <FileName>cmb_fault.S</FileName>
- <FileType>2</FileType>
- <FilePath>..\CmBackTrace\cmb_fault.S</FilePath>
- </File>
- <File>
- <FileName>fault_test.c</FileName>
- <FileType>1</FileType>
- <FilePath>..\CmBackTrace\fault_test.c</FilePath>
</File>
</Files>
</Group>
@@ -794,6 +816,91 @@
<FileType>1</FileType>
<FilePath>..\Function\FLOW_METER_DATA_COLLECT\rs485_data_analysis_pro.c</FilePath>
</File>
+ <File>
+ <FileName>pulse_and_alarm_line.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\FLOW_METER_DATA_COLLECT\pulse_and_alarm_line.c</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>modbus</GroupName>
+ <Files>
+ <File>
+ <FileName>mb.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mb.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfunccoils.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfunccoils.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfuncdiag.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfuncdiag.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfuncdisc.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfuncdisc.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfuncholding.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfuncholding.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfuncinput.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfuncinput.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbfuncother.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbfuncother.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbutils.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\functions\mbutils.c</FilePath>
+ </File>
+ <File>
+ <FileName>portevent.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\port\portevent.c</FilePath>
+ </File>
+ <File>
+ <FileName>portserial.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\port\portserial.c</FilePath>
+ </File>
+ <File>
+ <FileName>porttimer.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\port\porttimer.c</FilePath>
+ </File>
+ <File>
+ <FileName>regdefine.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\port\regdefine.c</FilePath>
+ </File>
+ <File>
+ <FileName>regport.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\port\regport.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbcrc.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\rtu\mbcrc.c</FilePath>
+ </File>
+ <File>
+ <FileName>mbrtu.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\modbus\rtu\mbrtu.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
--
Gitblit v1.9.3