更新大功率模块的引脚控制

keil_v5/project.uvoptx

@@ -919,7 +919,7 @@
         <bEvRecOn>1</bEvRecOn>
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
-        <nTsel>3</nTsel>
+        <nTsel>4</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -930,9 +930,14 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>BIN\CMSIS_AGDI.dll</pMon>
+        <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>JL2CM3</Key>
+          <Name>-U602713228 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS0800C800 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>

keil_v5/project.uvprojx

@@ -1319,7 +1319,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_6244S_4LINE_APP_ST-V12</OutputName>
+          <OutputName>VGKitBoard_6244S_4LINE_ST-V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -1955,7 +1955,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_6244S_4LINE_APP_ST-V12</OutputName>
+          <OutputName>VGKitBoard_6244S_4LINE_APP_ST-V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

project/main.c

@@ -15,7 +15,7 @@
 #include "myUart3.h"
 #include "myRadio.h"
 
-#define SOFT_VERSION 0x12
+#define SOFT_VERSION 0x13
 #define SET_RF_FREQ_HZ(base, ch, step) (uint64_t) base + (uint64_t)ch *step * 10 * 1000
 //---------------key
 KeyParamExt_ts *getKeyReturn;
@@ -638,7 +638,7 @@ int main(void)
     myDisplay_ui_deviceInfor_setModule("VGKitBoard_6244S");
     //上电长想一声
     beep_longBeep();
-
+    myRadio_receiver();
     setEvent(EVENT_TIME_CYCLE_10ms, true, 10);
     setEvent(EVENT_TIME_CYCLE_500ms, true, 500);
     while (1)

radio/myRadio.c

@@ -344,15 +344,16 @@ void myRadio_setCtrl(controlMode_te mode, uint32_t value)
     {
         return;
     }
-    myRadio_init(0, 0);
-    RF_SetCH(rfFrequence);
     switch (mode)
     {
     case RADIO_EXT_CONTROL_TX_UNMODULATED:
     {
-
-        RF_EXT_PA_TO_TX();
+        rf_workProcess = RWP_TX_TEST;
+        myRadio_init(0, 0);
+        RF_SetCH(rfFrequence);
         myRadio_setTxPower(rfTxPower);
+        myRadio_delay(1000);
+        RF_EXT_PA_TO_TX();
         RF_StrobeCmd(CMD_TFR); // TX fifo pointer reset
         tx1Reg.value = RF_ReadReg(TX1_REG);
         tx1Reg.bits_w.tmde = 0;
@@ -363,9 +364,13 @@ void myRadio_setCtrl(controlMode_te mode, uint32_t value)
     break;
     case RADIO_EXT_CONTROL_TX_MODULATED:
     {
+        rf_workProcess = RWP_TX_TEST;
+        myRadio_init(0, 0);
+        RF_SetCH(rfFrequence);
+        myRadio_setTxPower(rfTxPower);
+        myRadio_delay(1000);
         RF_EXT_PA_TO_TX();
         RF_StrobeCmd(CMD_TFR); // TX fifo pointer reset
-        myRadio_setTxPower(rfTxPower);
         tx1Reg.value = RF_ReadReg(TX1_REG);
         tx1Reg.bits_w.tmde = 1;
         tx1Reg.bits_w.tme = 1;
@@ -375,6 +380,10 @@ void myRadio_setCtrl(controlMode_te mode, uint32_t value)
     break;
     case RADIO_EXT_CONTROL_RX_SENSITIVITY:
     {
+        rf_workProcess = RWP_TX_TEST;
+        myRadio_init(0, 0);
+        RF_SetCH(rfFrequence);
+        myRadio_setTxPower(rfTxPower);
         RF_EXT_PA_TO_RX();
         myRadio_receiver();
         // pageA_gio_tu pageA_gio;

radio/myRadio.h

@@ -104,6 +104,7 @@ typedef enum
     RWP_SLEEP,
     RWP_TX,
     RWP_RX,
+    RWP_TX_TEST,
 }rfWorkProcess_te;
 typedef enum
 {

radio/myRadio_gpio.c

@@ -267,7 +267,7 @@ void myRadio_gpio_init(RADIO_GPIO_CALLBACK cb)
     SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low;
     SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge;
     SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
-    SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_8;
+    SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_16;
 
     SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
     SPI_InitStructure.SPI_CRCPolynomial = 7;

radio/myRadio_gpio.h

@@ -71,7 +71,8 @@ void RF_EXT_PA_CTR_L(void);
 void SET_A5133_GPIO1_IN(void);
 void SET_A5133_GPIO1_OUT(void);
 
-#define RF_EXT_PA_TO_TX() RF_EXT_PA_CTR_H();RF_EXT_PA_TE_H();RF_EXT_PA_RE_L()
+// 大功率模块需要控制以下引脚，普通功率的不需要调用，可以自行删除
+#define RF_EXT_PA_TO_TX() RF_EXT_PA_CTR_L();RF_EXT_PA_TE_H();RF_EXT_PA_RE_L()
 #define RF_EXT_PA_TO_RX() RF_EXT_PA_CTR_H();RF_EXT_PA_TE_L();RF_EXT_PA_RE_H()
 #define RF_EXT_PA_TO_IDLE() RF_EXT_PA_CTR_L();RF_EXT_PA_TE_L();RF_EXT_PA_RE_L()