From e0f29d5815a7dd4d45733ce1d661f1df263913d4 Mon Sep 17 00:00:00 2001
From: chenlh <2008get@163.com>
Date: 星期四, 09 十月 2025 15:23:10 +0800
Subject: [PATCH] 第一轮测试OK版提交
---
src/main.cpp | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 88a9a8e..0c943ef 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,6 +67,9 @@
}
if(tob == NULL) return ;
+ if (iid == 53)
+ int ii = 0;
+
if(var.TopoLoading){
MuteOutput();
}
@@ -76,15 +79,9 @@
tob->toProc();
UpdateOutput(iid, DMACount[iid]&0x1);
-<<<<<<< HEAD
// LP_transmit();
ModulesAsynSetInterval(proc_secs);
fir_acc_startup();
-=======
- //LP_transmit();
-// ModulesAsynSetInterval(proc_secs);
-// fir_acc_startup();
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
clock_stop = clock();
proc_secs = ((ufloat) (clock_stop - clock_start))/ CLOCKS_PER_SEC;
}
@@ -93,11 +90,7 @@
UpdateOutput(iid, DMACount[iid]&0x1);
}
-<<<<<<< HEAD
++DMACount[iid];
-=======
- DMACount[iid]++;
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
int main(int argc, char *argv[])
@@ -140,16 +133,11 @@
GPIO_SetOutPut(GPIOA, GPIO_Pin12, GPIO_HIGH);
GPIO_SetOutPut(GPIOB, GPIO_Pin5, GPIO_HIGH);
-<<<<<<< HEAD
//第一次启动上报特别是仿真的时候需要arm'重新发握手.
spiMsg->DspStatusPush(DSP_EMULATE_DEBUG, 0, 0);
spiMsg->ReportDspStatus(&msg);
printf("free sram %d, L2 %d\n", sram_free_space(SRAM_DDR, mem_any), sram_free_space(SRAM_L2, mem_any));
-=======
-// u32 ddrspace = sram_free_space(SRAM_DDR, mem_any);
-// printf("ddrspace:%d\n", ddrspace);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
while(1) {
asyn_proc_secs = ModulesAsynProcess();
@@ -188,11 +176,7 @@
if(++loop_cnt > 5e+6){
if (var.clock_ok && clock_check_count == DMACount[var.master_intr]) {
var.dsp_status = dsp_no_clock;
-<<<<<<< HEAD
spiMsg->DspStatusPush(DSP_RUNNING_STATUS, &var.dsp_status ,1);
-=======
- spiMsg->DspStatusPush(DSP_CLOCK_STATUS, &var.dsp_status ,1);
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
spiMsg->ReportDspStatus(&msg);
printf("clk0 ok\n");
}
@@ -206,12 +190,8 @@
spiMsg->DspStatusPush(DSP_CLOCK_STATUS, &var.dsp_status, 1);
request_topo_count = DMACount[var.master_intr] ;
var.clock_ok = utrue;
-<<<<<<< HEAD
spiMsg->ReportDspStatus(&msg);
printf("clk2 ok\n");
-=======
-// printf("clk2 ok\n");
->>>>>>> 0d5b7df96a2ee186b7b085dca9cf9a33f791c430
}
--
Gitblit v1.9.3