Merge pull request #521 from notpike/audio_datetime_freq

Added Datetime + Freq Filename to Audio App
This commit is contained in:
Erwin Ried 2022-03-29 08:10:09 +02:00 committed by GitHub
commit e1446598a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 3 deletions

View File

@ -129,6 +129,9 @@ AnalogAudioView::AnalogAudioView(
&waterfall &waterfall
}); });
//Filename Datetime and Frequency
record_view.set_filename_date_frequency(true);
field_frequency.set_value(receiver_model.tuning_frequency()); field_frequency.set_value(receiver_model.tuning_frequency());
field_frequency.set_step(receiver_model.frequency_step()); field_frequency.set_step(receiver_model.frequency_step());
field_frequency.on_change = [this](rf::Frequency f) { field_frequency.on_change = [this](rf::Frequency f) {

View File

@ -28,11 +28,11 @@
#include "ui_receiver.hpp" #include "ui_receiver.hpp"
#include "ui_spectrum.hpp" #include "ui_spectrum.hpp"
#include "ui_record_view.hpp" #include "ui_record_view.hpp"
#include "ui_font_fixed_8x16.hpp" #include "ui_font_fixed_8x16.hpp"
#include "tone_key.hpp" #include "tone_key.hpp"
namespace ui { namespace ui {
constexpr Style style_options_group { constexpr Style style_options_group {
@ -216,7 +216,10 @@ private:
RecordView record_view { RecordView record_view {
{ 0 * 8, 2 * 16, 30 * 8, 1 * 16 }, { 0 * 8, 2 * 16, 30 * 8, 1 * 16 },
u"AUD_????", RecordView::FileType::WAV, 4096, 4 u"AUD",
RecordView::FileType::WAV,
4096,
4
}; };
spectrum::WaterfallWidget waterfall { true }; spectrum::WaterfallWidget waterfall { true };

View File

@ -129,6 +129,11 @@ std::string to_string_decimal(float decimal, int8_t precision) {
return result; return result;
} }
std::string to_string_freq(const uint64_t f) {
auto final_str = to_string_dec_int(f / 1000000,4) + to_string_dec_int(f % 1000000, 6, '0');
return final_str;
}
std::string to_string_short_freq(const uint64_t f) { std::string to_string_short_freq(const uint64_t f) {
auto final_str = to_string_dec_int(f / 1000000,4) + "." + to_string_dec_int((f / 100) % 10000, 4, '0'); auto final_str = to_string_dec_int(f / 1000000,4) + "." + to_string_dec_int((f / 100) % 10000, 4, '0');
return final_str; return final_str;

View File

@ -48,6 +48,7 @@ std::string to_string_decimal(float decimal, int8_t precision);
std::string to_string_hex(const uint64_t n, const int32_t l = 0); std::string to_string_hex(const uint64_t n, const int32_t l = 0);
std::string to_string_hex_array(uint8_t * const array, const int32_t l = 0); std::string to_string_hex_array(uint8_t * const array, const int32_t l = 0);
std::string to_string_freq(const uint64_t f);
std::string to_string_short_freq(const uint64_t f); std::string to_string_short_freq(const uint64_t f);
std::string to_string_time_ms(const uint32_t ms); std::string to_string_time_ms(const uint32_t ms);

View File

@ -127,6 +127,11 @@ void RecordView::set_sampling_rate(const size_t new_sampling_rate) {
} }
} }
// Setter for datetime and frequency filename
void RecordView::set_filename_date_frequency(bool set) {
filename_date_frequency = set;
}
bool RecordView::is_active() const { bool RecordView::is_active() const {
return (bool)capture_thread; return (bool)capture_thread;
} }
@ -149,7 +154,24 @@ void RecordView::start() {
return; return;
} }
auto base_path = next_filename_stem_matching_pattern(filename_stem_pattern);
std::filesystem::path base_path;
if(filename_date_frequency) {
rtcGetTime(&RTCD1, &datetime);
//ISO 8601
std::string date_time = to_string_dec_uint(datetime.year(), 4, '0') +
to_string_dec_uint(datetime.month(), 2, '0') +
to_string_dec_uint(datetime.day(), 2, '0') + "T" +
to_string_dec_uint(datetime.hour()) +
to_string_dec_uint(datetime.minute()) +
to_string_dec_uint(datetime.second());
base_path = filename_stem_pattern.string() + "_" + date_time + "_" + to_string_freq(receiver_model.tuning_frequency()) + "Hz";
} else {
base_path = next_filename_stem_matching_pattern(filename_stem_pattern);
}
if( base_path.empty() ) { if( base_path.empty() ) {
return; return;
} }

View File

@ -63,6 +63,8 @@ public:
bool is_active() const; bool is_active() const;
void set_filename_date_frequency(bool set);
private: private:
void toggle(); void toggle();
//void toggle_pitch_rssi(); //void toggle_pitch_rssi();
@ -75,6 +77,11 @@ private:
void handle_error(const File::Error error); void handle_error(const File::Error error);
//bool pitch_rssi_enabled = false; //bool pitch_rssi_enabled = false;
// Time Stamp
bool filename_date_frequency = false;
rtc::RTC datetime { };
const std::filesystem::path filename_stem_pattern; const std::filesystem::path filename_stem_pattern;
const FileType file_type; const FileType file_type;
const size_t write_size; const size_t write_size;