Forráskód Böngészése

增加同步字设置,默认为0x45

dropLin 5 hónapja
szülő
commit
7aa6b4a1ef
4 módosított fájl, 16 hozzáadás és 2 törlés
  1. 2 0
      README.md
  2. 1 1
      keil_v5/project.uvprojx
  3. 2 1
      project/main.c
  4. 11 0
      radio/myRadio.c

+ 2 - 0
README.md

@@ -351,6 +351,8 @@ void myRadio_process(void)
     - 优化发射功率设置
 - V11
     - 更改基础频点为433000000
+- V12
+    - 增加同步字设置,默认为0x45
 
 ## 免责说明
 1、本工程驱动软件只提供做演示项目使用,未经过大批量项目验证,客户需谨慎使用,如果使用在正式项目中引发的所有问题,本司概不负责。使用过程若发现任何问题,可及时与本司相关人员联系。

+ 1 - 1
keil_v5/project.uvprojx

@@ -1985,7 +1985,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_4130NS1_ST_APP_V11</OutputName>
+          <OutputName>VGKitBoard_4130NS1_ST_APP_V12</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>1</CreateHexFile>

+ 2 - 1
project/main.c

@@ -15,7 +15,7 @@
 #include "myUart3.h"
 #include "myRadio.h"
 
-#define SOFT_VERSION 0x11
+#define SOFT_VERSION 0x12
 #define SET_RF_FREQ_HZ(base, ch,step) base+ch*step*10*1000
 //---------------key
 KeyParamExt_ts *getKeyReturn;
@@ -604,6 +604,7 @@ int main(void)
     myRadio_setFrequency(SET_RF_FREQ_HZ(rfBaseFreqList[deviceInfor.chipType], deviceInfor.rfChannel, deviceInfor.channelStep));
     myRadio_setTxPower(rfTxPowerList[deviceInfor.txPower]);
     myRadio_setRfParams(deviceInfor.rf_sf, deviceInfor.rf_bw, deviceInfor.rf_cr);
+    myRadio_setSyncWord(0x45);
     myRadio_receiver();
     // LCD显示屏初始化界面显示
     myDisplay_init(uiEnterCallback);

+ 11 - 0
radio/myRadio.c

@@ -10,6 +10,7 @@
 static int8_t rfTxPower;
 static uint32_t rfFrequence;
 static uint32_t rfBaudrate;
+static uint8_t rfSyncword;
 static uint8_t rf_sf;
 static uint8_t rf_bw;
 static uint8_t rf_cr;
@@ -403,6 +404,15 @@ void myRadio_setBaudrate(uint32_t br)
     rf_set_para(RF_PARA_TYPE_SF, loraBaudrateFrame[br].SpreadingFactor);
     rf_set_ldr(LDR_OFF);
 }
+void myRadio_setSyncWord(uint8_t syncword)
+{
+    if (rf_handle == 0)
+    {
+        return;
+    }
+    rfSyncword = syncword;
+    rf_set_syncword(syncword);
+}
 void myRadio_setRfParams(uint8_t sf, uint8_t bw, uint8_t cr)
 {
     if (rf_handle == 0)
@@ -509,6 +519,7 @@ void myRadio_setCtrl(controlMode_te mode, uint32_t value)
     }
     rf_workProcess = RF_PRC_TEST_TX;
     myRadio_init(0, 0);
+    myRadio_setSyncWord(0x45);
     switch (mode)
     {
     case RADIO_EXT_CONTROL_TX_UNMODULATED: