Parcourir la source

默认DIO3作为TCXO的控制脚

dropLin il y a 1 mois
Parent
commit
bfb7f6a4b1
4 fichiers modifiés avec 12 ajouts et 12 suppressions
  1. 3 3
      keil_v5/project.uvoptx
  2. 4 4
      keil_v5/project.uvprojx
  3. 1 1
      project/main.c
  4. 4 4
      radio/pan3029_port.c

+ 3 - 3
keil_v5/project.uvoptx

@@ -395,7 +395,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U59768895 -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>
+          <Name>-U602713228 -O78 -S8 -ZTIFSpeedSel50000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST2 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -405,7 +405,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
-          <Name>-X"Any" -UAny -O2766 -S10 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO31 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS0800000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-X"Any" -UAny -O2766 -S9 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO31 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -515,7 +515,7 @@
         <EnableFlashSeq>1</EnableFlashSeq>
         <EnableLog>0</EnableLog>
         <Protocol>2</Protocol>
-        <DbgClock>2000000</DbgClock>
+        <DbgClock>5000000</DbgClock>
       </DebugDescription>
     </TargetOption>
   </Target>

+ 4 - 4
keil_v5/project.uvprojx

@@ -48,7 +48,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_4130NS1_AT_V10</OutputName>
+          <OutputName>VGKitBoard_4130NS1_AT_V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -694,7 +694,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_4130NS1_ST_V10</OutputName>
+          <OutputName>VGKitBoard_4130NS1_ST_V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -1339,7 +1339,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_4130NS1_AT_APP_V10</OutputName>
+          <OutputName>VGKitBoard_4130NS1_AT_APP_V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>
@@ -1985,7 +1985,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_4130NS1_ST_APP_V12</OutputName>
+          <OutputName>VGKitBoard_4130NS1_ST_APP_V13</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

+ 1 - 1
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) base+ch*step*10*1000
 //---------------key
 KeyParamExt_ts *getKeyReturn;

+ 4 - 4
radio/pan3029_port.c

@@ -109,8 +109,8 @@ void rf_antenna_init(void)
  */
 void rf_tcxo_init(void)
 {
-//	PAN3029_set_gpio_output(MODULE_GPIO_TCXO);
-//	PAN3029_set_gpio_state(MODULE_GPIO_TCXO, 1);
+	PAN3029_set_gpio_output(MODULE_GPIO_TCXO);
+	PAN3029_set_gpio_state(MODULE_GPIO_TCXO, 1);
 }
 
 /**
@@ -120,8 +120,8 @@ void rf_tcxo_init(void)
  */
 void rf_tcxo_close(void)
 {
-//	PAN3029_set_gpio_output(MODULE_GPIO_TCXO);
-//	PAN3029_set_gpio_state(MODULE_GPIO_TCXO, 0);
+	PAN3029_set_gpio_output(MODULE_GPIO_TCXO);
+	PAN3029_set_gpio_state(MODULE_GPIO_TCXO, 0);
 }
 /**
  * @brief change PAN3029 IO to rx