TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-14 22:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed memory usage (#2380)

Browse Source 
* fixed memory usage in ui_about_simple
* fixed memory usage in freqman_db
* fixed memory usage in tone_key
This commit is contained in:
Bernd Herzog
2024-11-22 09:54:34 +01:00
committed by GitHub
parent fc08d4ead9
commit b108d975c0
7 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/apps/ui_about_simple.cpp
View File

@@ -1,5 +1,7 @@
#include "ui_about_simple.hpp"
#include <string_view>
#define ROLL_SPEED_FRAME_PER_LINE 60
// cuz frame rate of pp screen is probably 60, scroll per sec
@@ -7,7 +9,7 @@ namespace ui {
// TODO: Generate this automatically from github
// Information: a line starting with a '#' will be yellow coloured
const std::string authors_list[] = {
constexpr std::string_view authors_list[] = {
"# * List of contributors * ",
" ",
"#Mayhem:",
@@ -70,18 +72,18 @@ AboutView::AboutView(NavigationView& nav) {
button_ok.focus();
};
for (const std::string& authors_line : authors_list) {
for (auto& authors_line : authors_list) {
// if it's starting with #, it's a title and we have to substract the '#' and paint yellow
if (authors_line.size() > 0) {
if (authors_line[0] == '#') {
menu_view.add_item(
{authors_line.substr(1, authors_line.size() - 1),
{(std::string)authors_line.substr(1, authors_line.size() - 1),
ui::Theme::getInstance()->fg_yellow->foreground,
nullptr,
nullptr});
} else {
menu_view.add_item(
{authors_line,
{(std::string)authors_line,
Theme::getInstance()->bg_darkest->foreground,
nullptr,
nullptr});

32
firmware/application/apps/ui_freqman.cpp
View File

@@ -40,27 +40,39 @@ namespace fs = std::filesystem;
// TODO: Clean up after moving to better lookup tables.
using options_t = OptionsField::options_t;
extern options_t freqman_modulations;
extern options_t freqman_bandwidths[4];
extern options_t freqman_steps;
extern options_t freqman_steps_short;
using option_db_t = std::pair<std::string_view, int32_t>;
using options_db_t = std::vector<option_db_t>;
extern options_db_t freqman_modulations;
extern options_db_t freqman_bandwidths[4];
extern options_db_t freqman_steps;
extern options_db_t freqman_steps_short;
options_t dboptions_to_options(const options_db_t& dboptions) {
options_t options;
for (const auto& dboption : dboptions) {
options.emplace_back(dboption.first, dboption.second);
}
return options;
}
/* Set options. */
void freqman_set_modulation_option(OptionsField& option) {
option.set_options(freqman_modulations);
option.set_options(dboptions_to_options(freqman_modulations));
}
void freqman_set_bandwidth_option(freqman_index_t modulation, OptionsField& option) {
if (is_valid(modulation))
option.set_options(freqman_bandwidths[modulation]);
option.set_options(dboptions_to_options(freqman_bandwidths[modulation]));
}
void freqman_set_step_option(OptionsField& option) {
option.set_options(freqman_steps);
option.set_options(dboptions_to_options(freqman_steps));
}
void freqman_set_step_option_short(OptionsField& option) {
option.set_options(freqman_steps_short);
option.set_options(dboptions_to_options(freqman_steps_short));
}
namespace ui {
@@ -438,7 +450,7 @@ void FrequencyEditView::populate_bandwidth_options() {
auto& bandwidths = freqman_bandwidths[entry_.modulation];
for (auto i = 0u; i < bandwidths.size(); ++i) {
auto& item = bandwidths[i];
options.push_back({item.first, (OptionsField::value_t)i});
options.push_back({(std::string)item.first, (OptionsField::value_t)i});
}
}
@@ -451,7 +463,7 @@ void FrequencyEditView::populate_step_options() {
for (auto i = 0u; i < freqman_steps.size(); ++i) {
auto& item = freqman_steps[i];
options.push_back({item.first, (OptionsField::value_t)i});
options.push_back({(std::string)item.first, (OptionsField::value_t)i});
}
field_step.set_options(std::move(options));