From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
index a8f7bba..4dbe906 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</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</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -412,6 +412,11 @@
<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>
</Files>
</Group>
@@ -518,6 +523,21 @@
<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>
</Files>
</Group>
<Group>
@@ -568,10 +588,22 @@
<FileType>1</FileType>
<FilePath>..\Function\UPPER_COMPUTER\upper_com.c</FilePath>
</File>
+ <File>
+ <FileName>upper_com_data_pro.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\UPPER_COMPUTER\upper_com_data_pro.c</FilePath>
+ </File>
</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>
+ </Files>
</Group>
<Group>
<GroupName>Lcd</GroupName>
@@ -777,6 +809,26 @@
</Files>
</Group>
<Group>
+ <GroupName>FlowMeterDataCollect</GroupName>
+ <Files>
+ <File>
+ <FileName>rs485_read_data.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\FLOW_METER_DATA_COLLECT\rs485_read_data.c</FilePath>
+ </File>
+ <File>
+ <FileName>rs485_data_analysis_pro.c</FileName>
+ <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>::Device</GroupName>
</Group>
</Groups>
--
Gitblit v1.9.3