From d352b1982dc9b4fb2135c64cd909bb9cecc62139 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 14 Jun 2024 15:58:03 +0800
Subject: [PATCH] 添加.gitignore
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx | 136 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 108 insertions(+), 28 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvprojx
index 4dbe906..e2bdab6 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;..\Function\BILLING</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>
@@ -361,7 +361,7 @@
</VariousControls>
</Aads>
<LDads>
- <umfTarg>0</umfTarg>
+ <umfTarg>1</umfTarg>
<Ropi>0</Ropi>
<Rwpi>0</Rwpi>
<noStLib>0</noStLib>
@@ -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>
@@ -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>
@@ -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>
@@ -593,6 +603,11 @@
<FileType>1</FileType>
<FilePath>..\Function\UPPER_COMPUTER\upper_com_data_pro.c</FilePath>
</File>
+ <File>
+ <FileName>upper_com_iap_pro.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\Function\UPPER_COMPUTER\upper_com_iap_pro.c</FilePath>
+ </File>
</Files>
</Group>
<Group>
@@ -602,6 +617,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>
@@ -622,26 +642,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>
@@ -829,6 +829,86 @@
</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>
<GroupName>::Device</GroupName>
</Group>
</Groups>
--
Gitblit v1.9.3