sb10q
/
fastsa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consistent naming

This commit is contained in:
Sebastien Bourdeauducq 2023-09-13 16:03:40 +08:00
parent 90ea4c599f
commit c9c43f9f14
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
main.cpp
View File

@ -26,7 +26,7 @@ using namespace std::literals::chrono_literals;
void fft_mag(std::complex<float>* in, float* out, size_t len); void fft_mag(std::complex<float>* in, float* out, size_t len);
static const size_t block_len = 16384; static const size_t frame_len = 16384;
static const int wf_width = 1000; static const int wf_width = 1000;
static const int wf_height = 1200; static const int wf_height = 1200;
@ -58,7 +58,7 @@ static void tec_thread()
static std::atomic<bool> poh_accept_input; static std::atomic<bool> poh_accept_input;
static std::binary_semaphore poh_input_ready{0}; static std::binary_semaphore poh_input_ready{0};
static std::complex<float> poh_input_block[block_len]; static std::complex<float> poh_input_frame[frame_len];
static std::mutex wf_poh_mutex; static std::mutex wf_poh_mutex;
static unsigned int wf_poh[wf_width*wf_height]; static unsigned int wf_poh[wf_width*wf_height];
@ -69,18 +69,18 @@ static std::atomic<float> tec_p;
static void poh_thread() static void poh_thread()
{ {
std::vector<float> block_mag(block_len); std::vector<float> frame_mag(frame_len);
poh_accept_input = true; // accept first block poh_accept_input = true; // accept first frame
while(!shutdown_threads) { while(!shutdown_threads) {
poh_input_ready.acquire(); poh_input_ready.acquire();
fft_mag(poh_input_block, block_mag.data(), block_len); fft_mag(poh_input_frame, frame_mag.data(), frame_len);
poh_accept_input = true; // poh_input_block not used again until next iteration poh_accept_input = true; // poh_input_frame not used again until next iteration
// stabilize laser // stabilize laser
float freq_peak_local; float freq_peak_local;
freq_peak_local = 40.0f*float(distance(block_mag.begin(), max_element(block_mag.begin(), block_mag.end())))/float(block_len); freq_peak_local = 40.0f*float(distance(frame_mag.begin(), max_element(frame_mag.begin(), frame_mag.end())))/float(frame_len);
freq_peak = freq_peak_local; freq_peak = freq_peak_local;
float freq_error = freq_peak_local - freq_setpoint; float freq_error = freq_peak_local - freq_setpoint;
tec_current = std::max(tec_bias+tec_p*freq_error, 0.0f); tec_current = std::max(tec_bias+tec_p*freq_error, 0.0f);
@ -90,8 +90,8 @@ static void poh_thread()
std::lock_guard<std::mutex> guard(wf_poh_mutex); std::lock_guard<std::mutex> guard(wf_poh_mutex);
std::memmove(&wf_poh[wf_width], &wf_poh[0], sizeof(int)*wf_width*(wf_height - 1)); std::memmove(&wf_poh[wf_width], &wf_poh[0], sizeof(int)*wf_width*(wf_height - 1));
for(int i=0;i<wf_width;i++) { for(int i=0;i<wf_width;i++) {
int j = i*block_len/wf_width; int j = i*frame_len/wf_width;
wf_poh[i] = 0xff000000 | 0x010101*std::min(int(block_mag[j]/900.0f), 255); wf_poh[i] = 0xff000000 | 0x010101*std::min(int(frame_mag[j]/900.0f), 255);
} }
wf_poh[int(freq_setpoint*wf_width)/40] = 0xff0000ff; wf_poh[int(freq_setpoint*wf_width)/40] = 0xff0000ff;
} }
@ -100,25 +100,25 @@ static void poh_thread()
static std::atomic<bool> ls_accept_input; static std::atomic<bool> ls_accept_input;
static std::binary_semaphore ls_input_ready{0}; static std::binary_semaphore ls_input_ready{0};
static std::complex<float> ls_input_block[block_len]; static std::complex<float> ls_input_frame[frame_len];
static std::mutex wf_ls_mutex; static std::mutex wf_ls_mutex;
static unsigned int wf_ls[wf_width*wf_height]; static unsigned int wf_ls[wf_width*wf_height];
static void ls_thread() static void ls_thread()
{ {
std::vector<float> block_mag(block_len); std::vector<float> frame_mag(frame_len);
ls_accept_input = true; ls_accept_input = true;
while(!shutdown_threads) { while(!shutdown_threads) {
ls_input_ready.acquire(); ls_input_ready.acquire();
fft_mag(ls_input_block, block_mag.data(), block_len); fft_mag(ls_input_frame, frame_mag.data(), frame_len);
ls_accept_input = true; ls_accept_input = true;
{ {
std::lock_guard<std::mutex> guard(wf_ls_mutex); std::lock_guard<std::mutex> guard(wf_ls_mutex);
std::memmove(&wf_ls[wf_width], &wf_ls[0], sizeof(int)*wf_width*(wf_height - 1)); std::memmove(&wf_ls[wf_width], &wf_ls[0], sizeof(int)*wf_width*(wf_height - 1));
for(int i=0;i<wf_width;i++) { for(int i=0;i<wf_width;i++) {
int j = i*block_len/wf_width; int j = i*frame_len/wf_width;
wf_ls[i] = 0xff000000 | 0x010101*std::min(int(block_mag[j]/900.0f), 255); wf_ls[i] = 0xff000000 | 0x010101*std::min(int(frame_mag[j]/900.0f), 255);
} }
} }
} }
@ -136,9 +136,9 @@ static void* brf_dispatch(struct bladerf* dev, struct bladerf_stream* stream,
{ {
if(poh_accept_input && ls_accept_input) { if(poh_accept_input && ls_accept_input) {
std::complex<int16_t>* samples = (std::complex<int16_t>*)samples_v; std::complex<int16_t>* samples = (std::complex<int16_t>*)samples_v;
for(size_t i=0;i<block_len;i++) { for(size_t i=0;i<frame_len;i++) {
poh_input_block[i] = samples[2*i]; poh_input_frame[i] = samples[2*i];
ls_input_block[i] = samples[2*i+1]; ls_input_frame[i] = samples[2*i+1];
} }
poh_accept_input = false; poh_accept_input = false;
poh_input_ready.release(); poh_input_ready.release();
@ -198,7 +198,7 @@ static void brf_thread()
} }
} }
if((status = bladerf_init_stream(&brf_stream, brf_dev, brf_dispatch, &brf_buffers, if((status = bladerf_init_stream(&brf_stream, brf_dev, brf_dispatch, &brf_buffers,
16, BLADERF_FORMAT_SC16_Q11, 2*block_len, 8, NULL)) != 0) { 16, BLADERF_FORMAT_SC16_Q11, 2*frame_len, 8, NULL)) != 0) {
std::cerr << "failed to init bladeRF stream: " << bladerf_strerror(status) << std::endl; std::cerr << "failed to init bladeRF stream: " << bladerf_strerror(status) << std::endl;
return; return;
} }