diff --git a/receiver/HLSSimulatedDevice.cpp b/receiver/HLSSimulatedDevice.cpp index bc21967a..92c13e58 100644 --- a/receiver/HLSSimulatedDevice.cpp +++ b/receiver/HLSSimulatedDevice.cpp @@ -232,13 +232,14 @@ void HLSSimulatedDevice::HLSMainThread() { STREAM_512 converted_9; STREAM_512 converted_10; STREAM_512 converted_11; + STREAM_512 converted_12; hls::stream addr0; hls::stream addr1; hls::stream addr2; hls::stream addr3; - hls::stream compl0, compl1, compl2, compl3, compl4, compl5, compl6; + hls::stream compl0, compl1, compl2, compl3, compl4, compl5, compl6, compl7; hls::stream> hbm_handles; hls::stream> adu_histo_result; @@ -362,19 +363,22 @@ void HLSSimulatedDevice::HLSMainThread() { hls_cores.emplace_back([&] { axis_128_to_512(integration_result_0, integration_result_1);}); + // 8. Frame summation + hls_cores.emplace_back([&] { frame_summation(converted_8, converted_9, compl6, compl7);}); + // 9. Extend multipixels - hls_cores.emplace_back([&] { add_multipixel(converted_8, converted_9);}); + hls_cores.emplace_back([&] { add_multipixel(converted_9, converted_10);}); // 10. Apply bitshuffle - hls_cores.emplace_back([&] { bitshuffle(converted_9, converted_10);}); + hls_cores.emplace_back([&] { bitshuffle(converted_10, converted_11);}); // Timer procedure - count how many times write_data is not accepting input (to help track down latency issues) - hls_cores.emplace_back([&] { timer_host(converted_10, converted_11, counter_host); }); + hls_cores.emplace_back([&] { timer_host(converted_11, converted_12, counter_host); }); // 11. Prepare data to write to host memory hls_cores.emplace_back([&] { - host_writer(converted_11, adu_histo_result, integration_result_1, spot_finder_result_1, - compl6, datamover_out.GetDataStream(), + host_writer(converted_12, adu_histo_result, integration_result_1, spot_finder_result_1, + compl7, datamover_out.GetDataStream(), datamover_out.GetCtrlStream(), work_request_stream, completion_stream, packets_processed, host_writer_idle, err_reg); });