diff --git a/APE0/ApeTask/src/Fucp_Ape0_Init.s.c b/APE0/ApeTask/src/Fucp_Ape0_Init.s.c index d7d6855..e4f73b1 100644 --- a/APE0/ApeTask/src/Fucp_Ape0_Init.s.c +++ b/APE0/ApeTask/src/Fucp_Ape0_Init.s.c @@ -35,7 +35,7 @@ void ape0_event_task(uint32_t addr, uint32_t size) osp_task_info_ex mgr_task1 = {PHY_TASK_SLOT_IND, "Slot_ind", PHY_TASK_PRI_SLOT_IND, 2048, OSP_TIMER_TYPE, 0x000, 0x3FF, 0, NULLPTR, (OSP_TASKENTRY_FUNC)Slot_ind_Task}; osp_task_info_ex mgr_task2 = - {PHY_TASK_TRANSIMITTER, "Transmitter", PHY_TASK_PRI_TRANSMITTER, 4096, OSP_TIMER_TYPE, 0x000, 0x3FF, 50, (OSP_TASKINIT_FUNC)Transmitter_Init, (OSP_TASKENTRY_FUNC)Transmitter_Task}; + {PHY_TASK_TRANSIMITTER, "Transmitter", PHY_TASK_PRI_TRANSMITTER, 4096, OSP_TIMER_TYPE, 0x000, 0x3FF, 200, (OSP_TASKINIT_FUNC)Transmitter_Init, (OSP_TASKENTRY_FUNC)Transmitter_Task}; osp_task_info_ex mgr_task3 = {PHY_TASK_TEST, "Test_Task", PHY_TASK_PRI_TEST, 4096, OSP_TIMER_TYPE, 0x000, 0x3FF, 50, NULL, (OSP_TASKENTRY_FUNC)Test_Task}; diff --git a/APELib/Receiver_bit/src/receiver_Bit_Proc.s.c b/APELib/Receiver_bit/src/receiver_Bit_Proc.s.c index 622a716..a7ac9f8 100644 --- a/APELib/Receiver_bit/src/receiver_Bit_Proc.s.c +++ b/APELib/Receiver_bit/src/receiver_Bit_Proc.s.c @@ -162,7 +162,6 @@ void Receiver_Bit_Proc( counter = 0; else counter = counter + 1; - LOG_ERROR_S("CNT%d\n",counter); STORE_EX_W(res_counter_ptr, counter); diff --git a/APELib/Receiver_sync/src/receiver_Sync_Proc.s.c b/APELib/Receiver_sync/src/receiver_Sync_Proc.s.c index bde4342..d0cf2cb 100644 --- a/APELib/Receiver_sync/src/receiver_Sync_Proc.s.c +++ b/APELib/Receiver_sync/src/receiver_Sync_Proc.s.c @@ -625,8 +625,8 @@ void Receiver_Fine_Sync_Proc(uint32_t sfn, uint32_t slot, uint32_t proc_type) data_send2symb_task[task_idx].transform_para_imag[3] = transform_get_thita4_imag(); g_proc_id++; - LOG_ERROR_S("data1 %d 0x%08x %d 0x%08x %d\n", proc_head, data_send2symb_task[task_idx].data_section0_ptr, frame_head_offset, - (data_send2symb_task[task_idx].data_section0_ptr + (data_send2symb_task[task_idx].data_section0_length<<2)), data_send2symb_task[task_idx].data_section1_length); + //LOG_ERROR_S("data1 %d 0x%08x %d 0x%08x %d\n", proc_head, data_send2symb_task[task_idx].data_section0_ptr, frame_head_offset, + // (data_send2symb_task[task_idx].data_section0_ptr + (data_send2symb_task[task_idx].data_section0_length<<2)), data_send2symb_task[task_idx].data_section1_length); //为了适配SYMB接口,如果数据是两段,搬移成一块 if(2 == data_send2symb_task[task_idx].num_data_section) diff --git a/APELib/Receiver_sync/src/receiver_Sync_Task.s.c b/APELib/Receiver_sync/src/receiver_Sync_Task.s.c index a5d18e1..ba5b8dd 100644 --- a/APELib/Receiver_sync/src/receiver_Sync_Task.s.c +++ b/APELib/Receiver_sync/src/receiver_Sync_Task.s.c @@ -26,7 +26,19 @@ void Receiver_Sync_Task() uint16_t end_us; RUN_CNT(TRACE_RECEIVER_SYNC_ADDR, 0); - + // volatile uint32_t temp = LOAD_EX_W(JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR); + // volatile uint32_t temp1; + // while(1) + // { + // temp1 = LOAD_EX_W(JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR); + // if(temp != temp1) + // { + // uint32_t a = get_tx_nr_slot_cycle(); + // uint32_t b = get_tx_nr_slot(); + // LOG_ERROR_S("%d %d\n", b, a); + // temp = temp1; + // } + // } //6. 计算流程 Receiver_Sync_Proc(); diff --git a/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c b/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c index ca28e75..a89d08a 100644 --- a/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c +++ b/APELib/Receiver_sync_first/src/receiver_Sync_First_Proc.s.c @@ -208,7 +208,12 @@ void Receiver_First_Sync_Proc(receiver_sync2first_sync_t* msg_ptr, uint32_t msg_ (uint64_t)JESD_NRFDD_RX_SLOT_SRC0_DATA_ADDR,//第一次固定搬移到dm0 (61440)<<2, DMA_TAG_G2G, - 1); + 1); + volatile uint32_t wait_time = Time_offset(0); + while(wait_time < 500000) + { + wait_time = Time_offset(0); + } ape_csu_dma_1D_G2L_ch2ch3_transfer((uint64_t)(src_addr1), (uint64_t)JESD_NRFDD_RX_SLOT_SRC1_DATA_ADDR,//第一次固定搬移到dm0 (2048)<<2, diff --git a/Lib/OspLib/libape_spu.a b/Lib/OspLib/libape_spu.a index a1724a5..b3359c0 100644 Binary files a/Lib/OspLib/libape_spu.a and b/Lib/OspLib/libape_spu.a differ diff --git a/Platform/build/libape_spu.a b/Platform/build/libape_spu.a index a1724a5..b3359c0 100644 Binary files a/Platform/build/libape_spu.a and b/Platform/build/libape_spu.a differ