From 6b0d1f644233b2984d2a87553de598879cf05caf Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 28 May 2024 17:24:59 +0800
Subject: [PATCH] 继续完善
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
index 2580b0c..e5819b9 100644
--- a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
+++ b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
@@ -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</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</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -389,11 +389,6 @@
<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>
<FileType>1</FileType>
<FilePath>..\Soft\sizhu_ctrl_word.c</FilePath>
@@ -417,6 +412,11 @@
<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>
@@ -533,6 +533,16 @@
<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>
</Files>
</Group>
<Group>
@@ -597,6 +607,11 @@
<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>
@@ -816,6 +831,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