TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-08 20:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support showing invalid entries in Freqman and allow minor edits (#1269)

Browse Source 
* Support showing invalid entries in Freqman and allow minor edits
* Use light_grey instead of grey
* Fix comment
* Fix null in description bug
* Fix spacing in delete entry dialog
* trim in delete modal
This commit is contained in:
Kyle Reed
2023-07-12 23:28:27 -07:00
committed by GitHub
parent 4ed06b9eff
commit d72d935607
6 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/application/freqman_db.cpp
View File

@@ -200,9 +200,12 @@ std::string pretty_string(const freqman_entry& entry, size_t max_length) {
to_string_dec_uint(entry.frequency_b / 1'000'000) + "M: " + entry.description;
break;
case freqman_type::HamRadio:
str = "" + to_string_dec_uint(entry.frequency_a / 1'000'000) + "M," +
str = "R:" + to_string_dec_uint(entry.frequency_a / 1'000'000) + "M,T:" +
to_string_dec_uint(entry.frequency_b / 1'000'000) + "M: " + entry.description;
break;
case freqman_type::Raw:
str = entry.description;
break;
default:
str = "UNK:" + entry.description;
break;
@@ -244,8 +247,10 @@ std::string to_freqman_string(const freqman_entry& entry) {
if (is_valid(entry.tone))
append_field("c", tonekey::tone_key_value_string(entry.tone));
break;
case freqman_type::Raw:
return entry.description;
default:
return {}; // TODO: Comment type with description?
return {};
};
if (is_valid(entry.modulation) && entry.modulation < freqman_modulations.size()) {
@@ -429,6 +434,11 @@ freqman_entry FreqmanDB::operator[](FileWrapper::Line line) const {
freqman_entry entry;
if (parse_freqman_entry(*line_text, entry))
return entry;
else {
entry.type = freqman_type::Raw;
entry.description = trim(*line_text);
return entry;
}
}
return {};
@@ -444,7 +454,7 @@ void FreqmanDB::insert_entry(const freqman_entry& entry, FileWrapper::Line line)
void FreqmanDB::replace_entry(FileWrapper::Line line, const freqman_entry& entry) {
auto range = wrapper_->line_range(line);
if (!range)
return; // TODO: Message?
return;
// Don't overwrite the '\n'.
range->end--;