修改F3的iic和spi名称

eboxmaker · Aug 19, 2021 · 3ad1f93 · 3ad1f93
1 parent 53a133b
commit 3ad1f93
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 672 deletions.
diff --git a/Project/stm32f10x-md/mdk/stm32f10x.uvoptx b/Project/stm32f10x-md/mdk/stm32f10x.uvoptx
@@ -602,7 +602,7 @@
 
   <Group>
     <GroupName>ebox_core</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -838,7 +838,7 @@
 
   <Group>
     <GroupName>interface</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1022,7 +1022,7 @@
 
   <Group>
     <GroupName>ebox_mcu</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

diff --git a/Project/stm32f10x-md/mdk/stm32f10x.uvprojx b/Project/stm32f10x-md/mdk/stm32f10x.uvprojx
@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F103C8</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.1.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x5000) IROM(0x08000000,0x10000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>

diff --git a/Project/stm32f3xx/mdk/STM32F3.uvoptx b/Project/stm32f3xx/mdk/STM32F3.uvoptx
@@ -241,7 +241,7 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_i2c.cpp</Filename>
+          <Filename>C:\Users\Administrator\Documents\GitHub\eBox_Framework\ebox\hardware\STM32F3xx\Peripherals\ebox_i2c.cpp</Filename>
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
@@ -1023,8 +1023,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_i2c.cpp</PathWithFileName>
-      <FilenameWithoutPath>ebox_i2c.cpp</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\ebox_it.cpp</PathWithFileName>
+      <FilenameWithoutPath>ebox_it.cpp</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1035,8 +1035,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_spi.cpp</PathWithFileName>
-      <FilenameWithoutPath>ebox_spi.cpp</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_mcu_i2c.cpp</PathWithFileName>
+      <FilenameWithoutPath>ebox_mcu_i2c.cpp</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1047,8 +1047,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\ebox_it.cpp</PathWithFileName>
-      <FilenameWithoutPath>ebox_it.cpp</FilenameWithoutPath>
+      <PathWithFileName>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_mcu_spi.cpp</PathWithFileName>
+      <FilenameWithoutPath>ebox_mcu_spi.cpp</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>

diff --git a/Project/stm32f3xx/mdk/STM32F3.uvprojx b/Project/stm32f3xx/mdk/STM32F3.uvprojx
@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F334R8Tx</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F3xx_DFP.2.1.0</PackID>
+          <PackID>Keil.STM32F3xx_DFP.2.2.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00004000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -659,19 +659,19 @@
               <FilePath>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_uart.cpp</FilePath>
             </File>
             <File>
-              <FileName>ebox_i2c.cpp</FileName>
+              <FileName>ebox_it.cpp</FileName>
               <FileType>8</FileType>
-              <FilePath>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_i2c.cpp</FilePath>
+              <FilePath>..\..\..\ebox\hardware\STM32F3xx\ebox_it.cpp</FilePath>
             </File>
             <File>
-              <FileName>ebox_spi.cpp</FileName>
+              <FileName>ebox_mcu_i2c.cpp</FileName>
               <FileType>8</FileType>
-              <FilePath>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_spi.cpp</FilePath>
+              <FilePath>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_mcu_i2c.cpp</FilePath>
             </File>
             <File>
-              <FileName>ebox_it.cpp</FileName>
+              <FileName>ebox_mcu_spi.cpp</FileName>
               <FileType>8</FileType>
-              <FilePath>..\..\..\ebox\hardware\STM32F3xx\ebox_it.cpp</FilePath>
+              <FilePath>..\..\..\ebox\hardware\STM32F3xx\Peripherals\ebox_mcu_spi.cpp</FilePath>
             </File>
             <File>
               <FileName>object.cpp</FileName>

diff --git a/ebox/ebox.udb b/ebox/ebox.udb
diff --git a/...rdware/STM32F3xx/Peripherals/ebox_i2c.cpp → ...re/STM32F3xx/Peripherals/ebox_mcu_i2c.cpp b/...rdware/STM32F3xx/Peripherals/ebox_i2c.cpp → ...re/STM32F3xx/Peripherals/ebox_mcu_i2c.cpp
@@ -1,5 +1,4 @@
-#include "ebox_i2c.h"
-#include "ebox.h"
+#include "ebox_mcu_i2c.h"
 
 #if EBOX_DEBUG
 // 是否打印调试信息, 1打印,0不打印

diff --git a/...hardware/STM32F3xx/Peripherals/ebox_i2c.h → ...ware/STM32F3xx/Peripherals/ebox_mcu_i2c.h b/...hardware/STM32F3xx/Peripherals/ebox_i2c.h → ...ware/STM32F3xx/Peripherals/ebox_mcu_i2c.h
@@ -1,7 +1,5 @@
 #ifndef __EBOXTWOWIRE_H
 #define __EBOXTWOWIRE_H
-#include "ebox_core.h"
-#include "stream.h"
 #include "i2c.h"
 #include "mcu.h"
 

diff --git a/...rdware/STM32F3xx/Peripherals/ebox_spi.cpp → ...re/STM32F3xx/Peripherals/ebox_mcu_spi.cpp b/...rdware/STM32F3xx/Peripherals/ebox_spi.cpp → ...re/STM32F3xx/Peripherals/ebox_mcu_spi.cpp
@@ -13,7 +13,7 @@ No part of this software may be used for any commercial activities by any form o
 Disclaimer
 This specification is preliminary and is subject to change at any time without notice. shentq assumes no responsibility for any errors contained herein.
 */
-#include "ebox_spi.h"
+#include "ebox_mcu_spi.h"
 
 #if EBOX_DEBUG
 // 是否打印调试信息, 1打印,0不打印

diff --git a/...hardware/STM32F3xx/Peripherals/ebox_spi.h → ...ware/STM32F3xx/Peripherals/ebox_mcu_spi.h b/...hardware/STM32F3xx/Peripherals/ebox_spi.h → ...ware/STM32F3xx/Peripherals/ebox_mcu_spi.h
diff --git a/ebox/hardware/STM32F3xx/ebox.h b/ebox/hardware/STM32F3xx/ebox.h
@@ -32,8 +32,8 @@
 //#include "ebox_exti.h"
 //#include "ebox_timer.h"
 //#include "ebox_pwm.h"
-#include "ebox_i2c.h"
-#include "ebox_spi.h"
+#include "ebox_mcu_i2c.h"
+#include "ebox_mcu_spi.h"
 #include "ebox_uart.h"
 //#include "ebox_uart_stream.h"
 //#include "ebox_in_capture.h"