1.SOURCE_DATA_DDR_ADDR地址修改为0x84C00000，

2.Transmitter打桩参数i_imag[0]修正、 3.Transmitter导频cfg文件修改，使信号和导频功率相同 4.test_macro.h新增各种宏，包括Trans DBG测试数据和自生成测试数据的功能，Recv跳过RK3588处理的开关
2025-05-27 09:49:59 -07:00 · 2025-05-27 09:49:59 -07:00 · 0559efebe3
commit 0559efebe3
parent 27075700f4
10 changed files with 33890 additions and 1033 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -46,6 +46,7 @@
        "task_define.h": "c",
        "test_macro.h": "c",
        "receiver_sync_macro.h": "c",
-        "osp_ape.h": "c"
+        "osp_ape.h": "c",
+        "transmitter_struct.h": "c"
    }
 }
--- a/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c
+++ b/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c
@ -367,7 +367,11 @@ void Receiver_First_Sync_Proc(receiver_sync2first_sync_t* msg_ptr, uint32_t msg_
    //执行完成，更新状态机
    if(SYNC_OK == ret)
    {
+#ifndef CLOSE_AI_PROCECING
         STORE_EX_W(&g_receiver_sync_status_SM_ptr->sync_status , SYNC_AI_PROCECING);
+#else
+         STORE_EX_W(&g_receiver_sync_status_SM_ptr->sync_status , SYNC_TRACKING);
+#endif
         __ucps2_synch(0);
    }
    else
--- a/APELib/Transmitter/inc/transmitter_func.h
+++ b/APELib/Transmitter/inc/transmitter_func.h
@ -36,6 +36,12 @@ extern uint32_t *transmitter_config_dm1_ptr;
 extern uint32_t *transmitter_config_dm2_ptr;
 extern uint32_t *transmitter_config_dm3_ptr;

+#ifdef TRANS_DBG_DATA_TEST
+    extern uint32_t g_trans_m_src_pos;
+    extern uint32_t g_trans_dat_ptr;
+    extern uint32_t g_trans_dat_length;
+#endif
+
 void Transmitter_Init();
 void Transmitter_Task();
 void Transmitter_Proc(
--- a/APELib/Transmitter/src/transmitter_Init.s.c
+++ b/APELib/Transmitter/src/transmitter_Init.s.c
@ -63,7 +63,7 @@ void Transmitter_Init()
    ret = osp_get_cfgfile("Transmitter_cfg_dm1.dat",
                          (uint32_t *)&(g_transmitter_table_param.transmitter_config1_ddr_ptr),
                          (int32_t *)&(g_transmitter_table_param.transmitter_config1_length));
-    if(-1 == ret)
+    if(0 != ret)
    {
        LOG_ERROR_S("Transmitter_cfg_dm1.dat not found!\n");
    }  
@ -73,7 +73,30 @@ void Transmitter_Init()
    //ret = osp_get_cfgfile("Transmitter_cfg_dm3.dat",
    //                      (uint32_t *)&(g_transmitter_table_param.transmitter_config3_ddr_ptr),
    //                      (int32_t *)&(g_transmitter_table_param.transmitter_config3_length));
-    LOG_ERROR_S("Transmitter_INIT finish\n");
+
+#ifdef TRANS_DBG_DATA_TEST    
+    ret = osp_get_cfgfile("Trans.dat",
+                          (uint32_t *)&(g_trans_dat_ptr),
+                          (int32_t *)&(g_trans_dat_length));
+    if(0 != ret)
+    {
+        LOG_ERROR_S("Trans.dat not found!\n");
+    }  
+    if(0 != g_trans_dat_length)
+    {
+            ape_csu_dma_1D_G2L_ch2ch3_transfer((uint64_t)(g_trans_dat_ptr),
+                (uint64_t)SOURCE_DATA_DDR_ADDR,//第一次固定搬移到dm0
+                g_trans_dat_length,
+                DMA_TAG_G2G,
+                1);
+    }
+#endif
+
+#ifdef TRANS_SRC_AUTO_GEN
+    g_trans_m_src_pos = 0;
+#endif

    transform_para_init(0, 0, 0);
+
+    LOG_ERROR_S("Transmitter_INIT finish\n");
 }
--- a/APELib/Transmitter/src/transmitter_Proc.s.c
+++ b/APELib/Transmitter/src/transmitter_Proc.s.c
@ -13,6 +13,29 @@
 #include "transform_para_func.h"
 //#include "log_interface.h"

+
+ /*!   
+ * @brief:  Transmitter链路处理
+ * @author:  HUOHUO
+ * @Date:  2025年5月28日
+ */
+#ifdef TRANS_SRC_AUTO_GEN
+    uint32_t get_src_addr()
+    {
+        if(0 != g_trans_dat_length)
+        {
+            uint32_t cur_pos = g_trans_m_src_pos;
+            g_trans_m_src_pos = (g_trans_m_src_pos + SOURCE_DATA_BYTE_LENGTH) % g_trans_dat_length;
+            return cur_pos;
+        }
+        else
+        {
+            return 0; 
+        }
+    }
+#endif
+
+
 /*!   
 * @brief:  Transmitter链路处理
 * @author:  HUOHUO
@ -69,7 +92,17 @@ void Transmitter_Proc(
 */

    //**********************************for board begin**********************************
-   source_bit_ddr_ptr = (SOURCE_DATA_DDR_ADDR + 16016 * cur_slot);  // 0-19 帧数循环
+#ifdef TRANS_SRC_AUTO_GEN_DBG
+    //数据来源M序列初始值
+    source_bit_ddr_ptr = (uint32_t)SOURCE_DATA_DDR_ADDR;  // 0-19 帧数循环
+#elif (defined(TRANS_SRC_AUTO_GEN))
+    //数据来源M序列递推
+    source_bit_ddr_ptr = (uint32_t)SOURCE_DATA_DDR_ADDR + get_src_addr();
+#else
+    //数据来源ARM放数
+    source_bit_ddr_ptr = (SOURCE_DATA_DDR_ADDR + SOURCE_DATA_BYTE_LENGTH * cur_slot);  // 0-19 帧数循环
+#endif
+   
   // source_bit_ddr_ptr = (SOURCE_DATA_DDR_ADDR);  //固定读第一帧数据
    //等待 DMA 通道可用
    ape_csu_task_lookup(DMA_TAG_G2L, 1);
@ -322,7 +355,7 @@ void Transmitter_Proc(
    // double i_real[8] = {0.906870042299337,	-0.936742157061748,	-0.289020652644219,	0.352083608864027,	-0.827816165894850,	-0.426123729901221};
    // double i_imag[8] = {0.421410401366648,	0.350020186822565,	0.957322862123907,	0.935968553087807,	0.560999461214670,	0.904664891998729};
    double i_real[8] = {-0.3827, 0.8660, -0.7071, 0.5};
-    double i_imag[8] = {-0.9239, 0.5,    -0.7071, 0.8660};
+    double i_imag[8] = {0.9239, 0.5,    -0.7071, 0.8660};
    // double i_real[8] = {0};
    // double i_imag[8] = {0};

--- a/APELib/Transmitter/src/transmitter_Var.s.c
+++ b/APELib/Transmitter/src/transmitter_Var.s.c
@ -8,10 +8,17 @@
 * 2024年4月20日        HUOHUO       create file
 *****************************************************************/
 #include "transmitter_struct.h"
+#include "test_macro.h"

 //Transmitter微码配置空间offset结构体
 transmitter_table_param_t  g_transmitter_table_param;
 uint32_t *transmitter_config_dm0_ptr = NULLPTR;
 uint32_t *transmitter_config_dm1_ptr = NULLPTR;
 uint32_t *transmitter_config_dm2_ptr = NULLPTR;
-uint32_t *transmitter_config_dm3_ptr = NULLPTR;
+uint32_t *transmitter_config_dm3_ptr = NULLPTR;
+
+#ifdef TRANS_DBG_DATA_TEST
+    uint32_t g_trans_m_src_pos;
+    uint32_t g_trans_dat_ptr;
+    uint32_t g_trans_dat_length;
+#endif
--- a/Common/inc/mem_def.h
+++ b/Common/inc/mem_def.h
@ -125,7 +125,7 @@

 //---------------ARM Transmitter比特存放地址，大小SOURCE_DATA_BYTE_LENGTH*SOURCE_DATA_BUFFER_NUM = 313KB
 #define SOURCE_DATA_FLAG_DDR_ADDR               (0x84000000)    // SPU READ FLAG
-#define SOURCE_DATA_DDR_ADDR                    (0x84001000)
+#define SOURCE_DATA_DDR_ADDR                    (0x84C00000)
 #define SOURCE_DATA_BUFFER_NUM                  (20)
 #define SOURCE_DATA_BYTE_LENGTH                 (16016)
 #define SOURCE_DATA_DDR_ADDR_END                (SOURCE_DATA_DDR_ADDR + SOURCE_DATA_BUFFER_NUM*SOURCE_DATA_BYTE_LENGTH + 0x100)
--- a/Common/inc/test_macro.h
+++ b/Common/inc/test_macro.h
@ -2,8 +2,23 @@
 #define _TEST_MACRO_H_

 /*Recv从receiver_Sync_Init.s.c打桩数据时打开此宏*/
-//#define RECV_DBG_DATA_TEST
+#define RECV_DBG_DATA_TEST
+
+/*RX数据输入直接从TX Buffer读入，数据环回开关*/
+//#define TX_RX_LOOP
+
+/*Transmit加载Trans.dat作为输入数据*/
+//#define TRANS_DBG_DATA_TEST
+
+/*二选一或者都不打开,都不打开数据源是ARM，否则需要配合TRANS_DBG_DATA_TEST打开使用*/
+/*Transmit m序列自行递推，*/
+//#define TRANS_SRC_AUTO_GEN
+/*Transmit m序列固定为起始值*/
+//#define TRANS_SRC_AUTO_GEN_DBG
+
+
+/*状态机跳过RK3588计算*/
+#define CLOSE_AI_PROCECING

-#define TX_RX_LOOP

 #endif /*_TEST_MACRO_H_*/
--- a/Config/Trans.dat
+++ b/Config/Trans.dat
--- a/Config/Transmitter_cfg_dm1.dat
+++ b/Config/Transmitter_cfg_dm1.dat