Browse Source

V14,优化spi操作

dropLin 2 days ago
parent
commit
22c1ff7098
4 changed files with 10 additions and 11 deletions
  1. 1 1
      keil_v5/project.uvoptx
  2. 5 6
      keil_v5/project.uvprojx
  3. 1 1
      project/main.c
  4. 3 3
      radio/myRadio_gpio.c

+ 1 - 1
keil_v5/project.uvoptx

@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>

+ 5 - 6
keil_v5/project.uvprojx

@@ -185,6 +185,7 @@
             <RvdsVP>1</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -820,6 +821,7 @@
             <RvdsVP>1</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -1319,7 +1321,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_6244S_4LINE_ST-V13</OutputName>
+          <OutputName>VGKitBoard_6244S_4LINE_ST-V14</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -1456,6 +1458,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -2092,6 +2095,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -2560,11 +2564,6 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
-        <LayDesc></LayDesc>
-        <LayUrl></LayUrl>
-        <LayKeys></LayKeys>
-        <LayCat></LayCat>
-        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>

+ 1 - 1
project/main.c

@@ -15,7 +15,7 @@
 #include "myUart3.h"
 #include "myRadio.h"
 
-#define SOFT_VERSION 0x13
+#define SOFT_VERSION 0x14
 #define SET_RF_FREQ_HZ(base, ch, step) (uint64_t) base + (uint64_t)ch *step * 10 * 1000
 //---------------key
 KeyParamExt_ts *getKeyReturn;

+ 3 - 3
radio/myRadio_gpio.c

@@ -332,12 +332,12 @@ void myRadio_gpio_init(RADIO_GPIO_CALLBACK cb)
 uint8_t myRadioSpi_rwByte(uint8_t byteToWrite)
 {
 #if defined(SPI_HARD)
-    uint8_t i, temp;
+    uint32_t i, temp;
     temp = 0;  
 	while (SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_TXE) == RESET) //检查指定的SPI标志位设置与否:发送缓存空标志位
     {
         i++;
-        if(i > 200)return 0;
+        if(i > 20000)return 0;
     }			  
 	SPI_I2S_SendData(SPI1, byteToWrite); //通过外设SPIx发送一个数据
 	i=0;
@@ -345,7 +345,7 @@ uint8_t myRadioSpi_rwByte(uint8_t byteToWrite)
 	while (SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET)//检查指定的SPI标志位设置与否:接受缓存非空标志位
     {
         i++;
-        if(i > 200)return 0;
+        if(i > 20000)return 0;
     }
     /*!< Return the byte read from the SPI bus */
     temp = SPI_I2S_ReceiveData(SPI1);