TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-01-07 16:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Progress bar fix

Browse Source
This commit is contained in:
Erwin Ried 2020-05-23 22:53:20 +02:00
parent c80ea840d7
commit cfd1fe2b18
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/apps/gps_sim_app.cpp
View File

@ -82,7 +82,7 @@ void GpsSimAppView::on_file_changed(std::filesystem::path new_file_path) {
auto file_size = data_file.size(); auto file_size = data_file.size();
auto duration = (file_size * 1000) / (1 * 2 * sample_rate); auto duration = (file_size * 1000) / (1 * 2 * sample_rate);
progressbar.set_max(file_size); progressbar.set_max(file_size / 1024);
text_filename.set(file_path.filename().string().substr(0, 12)); text_filename.set(file_path.filename().string().substr(0, 12));
text_duration.set(to_string_time_ms(duration)); text_duration.set(to_string_time_ms(duration));

28
firmware/baseband/proc_gps_sim.cpp
View File

@ -58,34 +58,18 @@ void ReplayProcessor::execute(const buffer_c8_t& buffer) {
} }
// Fill and "stretch" // Fill and "stretch"
for (size_t i = 0; i < buffer.count; i++) { for (size_t i = 0; i < buffer.count; i++) {
/*if (i & 3) { auto re_out = iq_buffer.p[i].real() ;
buffer.p[i] = buffer.p[i - 1]; auto im_out = iq_buffer.p[i].imag() ;
} else {
auto re_out = iq_buffer.p[i >> 3].real() ;
auto im_out = iq_buffer.p[i >> 3].imag() ;
buffer.p[i] = { (int8_t)re_out, (int8_t)im_out };
}*/
/*
if (i % 8 != 0) {
buffer.p[i] = buffer.p[i - 1];
} else {
auto re_out = iq_buffer.p[i/8].real() ;
auto im_out = iq_buffer.p[i/8].imag() ;
buffer.p[i] = { (int8_t)re_out, (int8_t)im_out };
}*/
auto re_out = iq_buffer.p[i].real() ;
auto im_out = iq_buffer.p[i].imag() ;
buffer.p[i] = { (int8_t)re_out, (int8_t)im_out }; buffer.p[i] = { (int8_t)re_out, (int8_t)im_out };
} }
spectrum_samples += buffer.count; spectrum_samples += buffer.count;
if( spectrum_samples >= spectrum_interval_samples ) { if( spectrum_samples >= spectrum_interval_samples ) {
spectrum_samples -= spectrum_interval_samples; spectrum_samples -= spectrum_interval_samples;
//channel_spectrum.feed(iq_buffer, channel_filter_pass_f, channel_filter_stop_f);
txprogress_message.progress = bytes_read / 1024; // Inform UI about progress
txprogress_message.progress = bytes_read; // Inform UI about progress
txprogress_message.done = false; txprogress_message.done = false;
shared_memory.application_queue.push(txprogress_message); shared_memory.application_queue.push(txprogress_message);
} }