From 842bb64195f958b050867c50db66fc0aa413dafb Mon Sep 17 00:00:00 2001
From: QuakeGod <quakegod@sina.com>
Date: 星期六, 27 七月 2024 10:42:56 +0800
Subject: [PATCH] KBus upgrade
---
KBus/MDK-ARM/KBus_C8T6_分布IO模块_8路16路.uvprojx | 132 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 65 deletions(-)
diff --git a/MDK-ARM/F030C8T6_KBus.uvprojx "b/KBus/MDK-ARM/KBus_C8T6_\345\210\206\345\270\203IO\346\250\241\345\235\227_8\350\267\25716\350\267\257.uvprojx"
similarity index 81%
rename from MDK-ARM/F030C8T6_KBus.uvprojx
rename to "KBus/MDK-ARM/KBus_C8T6_\345\210\206\345\270\203IO\346\250\241\345\235\227_8\350\267\25716\350\267\257.uvprojx"
index cda4b64..b5186ac 100644
--- a/MDK-ARM/F030C8T6_KBus.uvprojx
+++ "b/KBus/MDK-ARM/KBus_C8T6_\345\210\206\345\270\203IO\346\250\241\345\235\227_8\350\267\25716\350\267\257.uvprojx"
@@ -47,7 +47,7 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
- <OutputDirectory>.\F030C8T6_KBus\</OutputDirectory>
+ <OutputDirectory>.\KBus_C8T6\</OutputDirectory>
<OutputName>F030C8T6_KBus</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
@@ -272,8 +272,8 @@
</OCR_RVCT3>
<OCR_RVCT4>
<Type>1</Type>
- <StartAddress>0x8000000</StartAddress>
- <Size>0x10000</Size>
+ <StartAddress>0x8001000</StartAddress>
+ <Size>0xf000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
<Type>1</Type>
@@ -297,8 +297,8 @@
</OCR_RVCT8>
<OCR_RVCT9>
<Type>0</Type>
- <StartAddress>0x20000000</StartAddress>
- <Size>0x2000</Size>
+ <StartAddress>0x200000c0</StartAddress>
+ <Size>0x1f40</Size>
</OCR_RVCT9>
<OCR_RVCT10>
<Type>0</Type>
@@ -335,7 +335,7 @@
<MiscControls></MiscControls>
<Define>USE_FULL_LL_DRIVER,USE_HAL_DRIVER</Define>
<Undefine></Undefine>
- <IncludePath>../KBus/Inc;../KBus/Src;../Drivers/STM32F0xx_HAL_Driver/Inc;../Drivers/CMSIS/Device/ST/STM32F0xx/Include;../Drivers/CMSIS/Include;../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy;..\ComLib\Inc</IncludePath>
+ <IncludePath>../Inc;../Src;../../Drivers/STM32F0xx_HAL_Driver/Inc;../../Drivers/CMSIS/Device/ST/STM32F0xx/Include;../../Drivers/CMSIS/Include;../../Drivers/STM32F0xx_HAL_Driver/Inc/Legacy;..\..\ComLib\Inc</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -392,67 +392,67 @@
<File>
<FileName>BSP.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\BSP.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\BSP.h</FilePath>
</File>
<File>
<FileName>debug.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\debug.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\debug.h</FilePath>
</File>
<File>
<FileName>functions.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\functions.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\functions.h</FilePath>
</File>
<File>
<FileName>GlobalDef.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\GlobalDef.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\GlobalDef.h</FilePath>
</File>
<File>
<FileName>KBus.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\KBus.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\KBus.h</FilePath>
</File>
<File>
<FileName>KLink.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\KLink.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\KLink.h</FilePath>
</File>
<File>
<FileName>KMachine.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\KMachine.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\KMachine.h</FilePath>
</File>
<File>
<FileName>ModbusRTU.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\ModbusRTU.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\ModbusRTU.h</FilePath>
</File>
<File>
<FileName>MyQueue.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\MyQueue.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\MyQueue.h</FilePath>
</File>
<File>
<FileName>PLCfunctions.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\PLCfunctions.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\PLCfunctions.h</FilePath>
</File>
<File>
<FileName>shell.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\shell.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\shell.h</FilePath>
</File>
<File>
<FileName>stm32_assert.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\stm32_assert.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\stm32_assert.h</FilePath>
</File>
<File>
<FileName>stm32f0xx_it.h</FileName>
<FileType>5</FileType>
- <FilePath>..\ComLib\Inc\stm32f0xx_it.h</FilePath>
+ <FilePath>..\..\ComLib\Inc\stm32f0xx_it.h</FilePath>
</File>
</Files>
</Group>
@@ -462,67 +462,67 @@
<File>
<FileName>debug.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\debug.c</FilePath>
+ <FilePath>..\..\ComLib\Src\debug.c</FilePath>
</File>
<File>
<FileName>functions.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\functions.c</FilePath>
+ <FilePath>..\..\ComLib\Src\functions.c</FilePath>
</File>
<File>
<FileName>GlobalDef.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\GlobalDef.c</FilePath>
+ <FilePath>..\..\ComLib\Src\GlobalDef.c</FilePath>
</File>
<File>
<FileName>KBus.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\KBus.c</FilePath>
+ <FilePath>..\..\ComLib\Src\KBus.c</FilePath>
</File>
<File>
<FileName>KLink.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\KLink.c</FilePath>
+ <FilePath>..\..\ComLib\Src\KLink.c</FilePath>
</File>
<File>
<FileName>ModbusRTU.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\ModbusRTU.c</FilePath>
+ <FilePath>..\..\ComLib\Src\ModbusRTU.c</FilePath>
</File>
<File>
<FileName>MyQueue.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\MyQueue.c</FilePath>
+ <FilePath>..\..\ComLib\Src\MyQueue.c</FilePath>
</File>
<File>
<FileName>PLCfunctions.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\PLCfunctions.c</FilePath>
+ <FilePath>..\..\ComLib\Src\PLCfunctions.c</FilePath>
</File>
<File>
<FileName>shell.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\shell.c</FilePath>
+ <FilePath>..\..\ComLib\Src\shell.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_msp.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\stm32f0xx_hal_msp.c</FilePath>
+ <FilePath>..\..\ComLib\Src\stm32f0xx_hal_msp.c</FilePath>
</File>
<File>
<FileName>KMachine.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\KMachine.c</FilePath>
+ <FilePath>..\..\ComLib\Src\KMachine.c</FilePath>
</File>
<File>
<FileName>BSP.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\BSP.c</FilePath>
+ <FilePath>..\..\ComLib\Src\BSP.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_it.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\stm32f0xx_it.c</FilePath>
+ <FilePath>..\..\ComLib\Src\stm32f0xx_it.c</FilePath>
</File>
</Files>
</Group>
@@ -532,17 +532,17 @@
<File>
<FileName>main.h</FileName>
<FileType>5</FileType>
- <FilePath>..\KBus\Inc\main.h</FilePath>
+ <FilePath>..\Inc\main.h</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_conf.h</FileName>
<FileType>5</FileType>
- <FilePath>..\KBus\Inc\stm32f0xx_hal_conf.h</FilePath>
+ <FilePath>..\Inc\stm32f0xx_hal_conf.h</FilePath>
</File>
<File>
<FileName>BoardType.h</FileName>
<FileType>5</FileType>
- <FilePath>..\KBus\Inc\BoardType.h</FilePath>
+ <FilePath>..\Inc\BoardType.h</FilePath>
</File>
</Files>
</Group>
@@ -552,12 +552,12 @@
<File>
<FileName>main.c</FileName>
<FileType>1</FileType>
- <FilePath>..\KBus\Src\main.c</FilePath>
+ <FilePath>..\Src\main.c</FilePath>
</File>
<File>
<FileName>BoardType.c</FileName>
<FileType>1</FileType>
- <FilePath>..\KBus\Src\BoardType.c</FilePath>
+ <FilePath>..\Src\BoardType.c</FilePath>
</File>
</Files>
</Group>
@@ -567,7 +567,7 @@
<File>
<FileName>system_stm32f0xx.c</FileName>
<FileType>1</FileType>
- <FilePath>..\ComLib\Src\system_stm32f0xx.c</FilePath>
+ <FilePath>..\..\ComLib\Src\system_stm32f0xx.c</FilePath>
</File>
</Files>
</Group>
@@ -577,122 +577,124 @@
<File>
<FileName>stm32f0xx_ll_gpio.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_exti.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_adc.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_adc.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_adc.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_dma.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_dma.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_dma.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_spi.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_spi.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_spi.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_tim.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_tim_ex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim_ex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_tim_ex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_usart.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_usart.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_usart.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_rcc.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_rcc.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_rcc_ex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc_ex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc_ex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_i2c.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_i2c_ex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c_ex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_i2c_ex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_gpio.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_dma.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_dma.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_dma.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_cortex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_cortex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_cortex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_pwr.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_pwr_ex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr_ex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pwr_ex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_flash.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_hal_flash_ex.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_utils.c</FileName>
<FileType>1</FileType>
- <FilePath>../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c</FilePath>
+ <FilePath>../../Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c</FilePath>
</File>
<File>
<FileName>stm32f0xx_ll_tim.c</FileName>
<FileType>1</FileType>
- <FilePath>..\Drivers\STM32F0xx_HAL_Driver\Src\stm32f0xx_ll_tim.c</FilePath>
+ <FilePath>..\..\Drivers\STM32F0xx_HAL_Driver\Src\stm32f0xx_ll_tim.c</FilePath>
+ </File>
+ <File>
+ <FileName>stm32f0xx_ll_flash.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>..\..\Drivers\STM32F0xx_HAL_Driver\Src\stm32f0xx_ll_flash.c</FilePath>
</File>
</Files>
- </Group>
- <Group>
- <GroupName>::CMSIS</GroupName>
</Group>
</Groups>
</Target>
@@ -704,7 +706,7 @@
<component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0" condition="ARMv6_7_8-M Device">
<package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
<targetInfos>
- <targetInfo name="F030C8T6_KBus"/>
+ <targetInfo name="KBus_C8T6"/>
</targetInfos>
</component>
</components>
--
Gitblit v1.9.1