V13，增加信噪比显示

app/myDisplayUnit.c

@@ -158,13 +158,13 @@ void myDisplay_ui_rf_tx_packet_consumeTime(uint32_t time)
         
     }
 }
-void myDisplay_ui_rf_tx_packet_ackRssi(int16_t rssi)
+void myDisplay_ui_rf_tx_packet_ackRssi(int16_t rssi, int8_t snr)
 {
     if (uiPageIdAddress == UI_PAGE_ID_TX_PACKET)
     {
         if (rssi > -150 && (rssi < 10))
         {
-            myLCD_str8x16(IM_NOMALE, HORIZONTAL_RIGHT, 3, "%04ddBm", rssi%10000);
+            myLCD_str8x16(IM_NOMALE, HORIZONTAL_RIGHT, 3, "%4ddBm %2d", rssi%10000, snr);
         }
     }
 }
@@ -515,14 +515,14 @@ void myDisplay_ui_rf_rxPacket_rxCurrent(float current)
                   5, 2, "%-6.2fmA", current);
   }
 }
-void myDisplay_ui_rf_rxPacket_rssi(int16_t rssi)
+void myDisplay_ui_rf_rxPacket_rssi(int16_t rssi, int8_t snr)
 {
     if (uiPageIdAddress == UI_PAGE_ID_RX_PACKET)
     {
         if (rssi > -150 && (rssi < 10))
         {
             myLCD_str8x16(IM_NOMALE, 
-                        HORIZONTAL_RIGHT, 2, "%04ddBm", rssi%10000);
+                        HORIZONTAL_RIGHT, 2, "%4ddBm %3d", rssi%10000, snr);
         }
     }
 }

app/myDisplayUnit.h

@@ -86,7 +86,7 @@ void myDisplay_ui_rf_tx_packet_buffer(uint8_t *buffer);
 void myDisplay_ui_rf_tx_packet_counts(uint32_t count);
 void myDisplay_ui_rf_tx_packet_rate(float rate);
 void myDisplay_ui_rf_tx_packet_consumeTime(uint32_t time);
-void myDisplay_ui_rf_tx_packet_ackRssi(int16_t rssi);
+void myDisplay_ui_rf_tx_packet_ackRssi(int16_t rssi, int8_t snr);
 void myDisplay_ui_rf_continuos_rxErrorRate(float rate);
 void myDisplay_ui_rf_continuos_rxContinuousFreq(uint32_t freq);
 void myDisplay_ui_rf_continuos_rxPacket(uint8_t *buf, uint16_t len);
@@ -102,7 +102,7 @@ void myDisplay_ui_rf_rxContinue_scroll_buffer(uint8_t *buf, uint16_t len);
 void myDisplay_ui_rf_continuos_rxLen(float rate, uint16_t len);
 void myDisplay_ui_rf_rxPacket_count(uint32_t count);
 void myDisplay_ui_rf_rxPacket_rate(float rate);
-void myDisplay_ui_rf_rxPacket_rssi(int16_t rssi);
+void myDisplay_ui_rf_rxPacket_rssi(int16_t rssi, int8_t snr);
 void myDisplay_ui_rf_rxPacket_rxCurrent(float current);
 void myDisplay_ui_firstUi_setDeviceName(char *name);
 void myDisplay_ui_firstUi_setFreq(uint32_t freq);

keil_v5/project.uvoptx

@@ -388,7 +388,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -573,7 +573,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DebugOpt>

keil_v5/project.uvprojx

@@ -1350,7 +1350,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\Objects\</OutputDirectory>
-          <OutputName>VGKitBoard_237xS_ST_APP_V12</OutputName>
+          <OutputName>VGKitBoard_237xS_ST_APP_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) base+ch*step*10*1000
 //---------------key
 KeyParamExt_ts *getKeyReturn;
@@ -852,7 +852,7 @@ int main(void)
                 case 1:// pcaket tx and wait ack
                 {
                     event_post(EVENT_RF_PACKET_TX);
-                    myDisplay_ui_rf_tx_packet_ackRssi(rfRecvPacket.rssi);
+                    myDisplay_ui_rf_tx_packet_ackRssi(rfRecvPacket.rssi, rfRecvPacket.snr);
                 }break;
                 case 2://packet tx unitl max count
                 {
@@ -881,7 +881,7 @@ int main(void)
                 default:
                     break;
                 }
-                myDisplay_ui_rf_rxPacket_rssi(rfRecvPacket.rssi);
+                myDisplay_ui_rf_rxPacket_rssi(rfRecvPacket.rssi, rfRecvPacket.snr);
                 myDisplay_ui_rf_rxPacket_count(rfRxCount);
                 if (atoi(rfRecvPacket.payload) == 1)
                 {

radio/myRadio.c

@@ -531,6 +531,7 @@ void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
     memcpy(rfRxPacket.payload, payload, size);
     rfRxPacket.len = size;
     rfRxPacket.rssi = rssi;
+    rfRxPacket.snr = snr;
     if (rxCb)
     {
         rxCb(RX_STA_SECCESS, rfRxPacket);

radio/myRadio.h

@@ -120,6 +120,7 @@ typedef struct
 {
     uint8_t rmvAddr[8];              //
     int16_t rssi;                     //
+    int8_t snr;                     //
     uint32_t absTime;                //
     uint32_t rxTimeout;              //
     uint8_t len;                     //