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

Pmem cleanup (#1230)

Browse Source 
* WIP pmem cleanup

* Finish pmem refactor

* Fix dump order

* Set defaults for splash and backlight

* Fix break

---------

Co-authored-by: kallanreed <kallanreed@noreply.github.com>
This commit is contained in:
Kyle Reed 2023-07-02 09:35:34 -07:00 committed by GitHub
parent 4e128e8930
commit 44dd8fd083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 192 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,9 @@ using namespace lpc43xx;
#include "portapack.hpp" #include "portapack.hpp"
using namespace portapack; using namespace portapack;
#include "file.hpp"
namespace fs = std::filesystem;
#include "string_format.hpp" #include "string_format.hpp"
#include "ui_styles.hpp" #include "ui_styles.hpp"
#include "cpld_update.hpp" #include "cpld_update.hpp"
@ -489,35 +492,30 @@ SetPersistentMemoryView::SetPersistentMemoryView(NavigationView& nav) {
check_use_sdcard_for_pmem.set_value(pmem::should_use_sdcard_for_pmem()); check_use_sdcard_for_pmem.set_value(pmem::should_use_sdcard_for_pmem());
check_use_sdcard_for_pmem.on_select = [this](Checkbox&, bool v) { check_use_sdcard_for_pmem.on_select = [this](Checkbox&, bool v) {
File pmem_flag_file_handle; File pmem_flag_file_handle;
std::string pmem_flag_file = PMEM_FILEFLAG;
if (v) { if (v) {
auto result = pmem_flag_file_handle.open(pmem_flag_file); if (fs::file_exists(PMEM_FILEFLAG)) {
if (result.is_valid()) {
auto result = pmem_flag_file_handle.create(pmem_flag_file); // third: create if it is not there
if (!result.is_valid()) {
text_pmem_status.set("pmem flag file created");
} else {
text_pmem_status.set("!err. creating pmem flagfile!");
}
} else {
text_pmem_status.set("pmem flag already present"); text_pmem_status.set("pmem flag already present");
} else {
auto error = pmem_flag_file_handle.create(PMEM_FILEFLAG);
if (error)
text_pmem_status.set("!err. creating pmem flagfile!");
else
text_pmem_status.set("pmem flag file created");
} }
} else { } else {
auto result = delete_file(pmem_flag_file); auto result = delete_file(PMEM_FILEFLAG);
if (result.code() != FR_OK) { if (result.code() != FR_OK)
text_pmem_status.set("!err. deleting pmem flagfile!"); text_pmem_status.set("!err. deleting pmem flagfile!");
} else { else
text_pmem_status.set("pmem flag file deleted"); text_pmem_status.set("pmem flag file deleted");
} }
}
}; };
button_save_mem_to_file.on_select = [&nav, this](Button&) { button_save_mem_to_file.on_select = [&nav, this](Button&) {
if (!pmem::save_persistent_settings_to_file()) { if (!pmem::save_persistent_settings_to_file())
text_pmem_status.set("!problem saving settings!"); text_pmem_status.set("!problem saving settings!");
} else { else
text_pmem_status.set("settings saved"); text_pmem_status.set("settings saved");
}
}; };
button_load_mem_from_file.on_select = [&nav, this](Button&) { button_load_mem_from_file.on_select = [&nav, this](Button&) {

470
firmware/common/portapack_persistent_memory.cpp
View File

@ -23,27 +23,21 @@
#include "portapack_persistent_memory.hpp" #include "portapack_persistent_memory.hpp"
#include "audio.hpp" #include "audio.hpp"
#include "portapack.hpp"
#include "hal.h"
#include "utility.hpp"
#include "memory_map.hpp"
#include "crc.hpp" #include "crc.hpp"
#include <algorithm>
#include <utility>
#include <string>
#include <fstream>
#include "file.hpp" #include "file.hpp"
#include "hal.h"
#include "irq_controls.hpp" #include "irq_controls.hpp"
#include "memory_map.hpp"
#include "portapack.hpp"
#include "string_format.hpp" #include "string_format.hpp"
#include "ui_styles.hpp" #include "ui_styles.hpp"
#include "ui_painter.hpp" #include "ui_painter.hpp"
#include "utility.hpp"
#include <algorithm>
#include <string>
#include <fstream>
#include <utility>
#include <ch.h> #include <ch.h>
@ -71,9 +65,11 @@ using modem_baudrate_range_t = range_t<int32_t>;
constexpr modem_baudrate_range_t modem_baudrate_range{50, 9600}; constexpr modem_baudrate_range_t modem_baudrate_range{50, 9600};
constexpr int32_t modem_baudrate_reset_value{1200}; constexpr int32_t modem_baudrate_reset_value{1200};
/*using modem_bw_range_t = range_t<int32_t>; /*
constexpr modem_bw_range_t modem_bw_range { 1000, 50000 }; using modem_bw_range_t = range_t<int32_t>;
constexpr int32_t modem_bw_reset_value { 15000 };*/ constexpr modem_bw_range_t modem_bw_range { 1000, 50000 };
constexpr int32_t modem_bw_reset_value { 15000 };
*/
using modem_repeat_range_t = range_t<int32_t>; using modem_repeat_range_t = range_t<int32_t>;
constexpr modem_repeat_range_t modem_repeat_range{1, 99}; constexpr modem_repeat_range_t modem_repeat_range{1, 99};
@ -81,176 +77,38 @@ constexpr int32_t modem_repeat_reset_value{5};
using clkout_freq_range_t = range_t<uint32_t>; using clkout_freq_range_t = range_t<uint32_t>;
constexpr clkout_freq_range_t clkout_freq_range{10, 60000}; constexpr clkout_freq_range_t clkout_freq_range{10, 60000};
constexpr uint32_t clkout_freq_reset_value{10000}; constexpr uint16_t clkout_freq_reset_value{10000};
enum data_structure_version_enum : uint32_t { enum data_structure_version_enum : uint32_t {
VERSION_CURRENT = 0x10000003, VERSION_CURRENT = 0x10000004,
}; };
static const uint32_t TOUCH_CALIBRATION_MAGIC = 0x074af82f; static const uint32_t TOUCH_CALIBRATION_MAGIC = 0x074af82f;
/* UI config.
* NB: Will be default init - override in defaults(). */
struct ui_config_t { struct ui_config_t {
private: uint16_t clkout_freq;
enum bits_t {
BacklightTimeoutLSB = 0,
BacklightTimeoutEnable = 3,
ClkoutFreqLSB = 4,
ShowGUIReturnIcon = 20,
LoadAppSettings = 21,
SaveAppSettings = 22,
ShowBiggerQRCode = 23,
DisableTouchscreen = 24,
HideClock = 25,
ClockWithDate = 26,
ClkOutEnabled = 27,
UNUSED = 28,
StealthMode = 29,
ConfigLogin = 30,
ConfigSplash = 31,
};
enum bits_mask_t : uint32_t { // NB: bitsfields have to be the same type or the compiler will
BacklightTimeoutMask = ((1 << 3) - 1) << bits_t::BacklightTimeoutLSB, // split into a new byte hence uint8_t for these booleans.
ClkoutFreqMask = ((1 << 16) - 1) << bits_t::ClkoutFreqLSB, uint8_t backlight_timeout : 3;
}; uint8_t enable_backlight_timeout : 1;
uint8_t show_gui_return_icon : 1;
uint8_t load_app_settings : 1;
uint8_t save_app_settings : 1;
uint8_t show_large_qr_code : 1;
uint32_t values; bool disable_touchscreen : 1;
bool hide_clock : 1;
constexpr bool bit_read(const bits_t n) const { bool clock_show_date : 1;
return ((values >> n) & 1) != 0; bool clkout_enabled : 1;
} bool UNUSED_1 : 1;
bool stealth_mode : 1;
constexpr void bit_write(const bits_t n, const bool v) { bool config_login : 1;
if (bit_read(n) != v) { bool config_splash : 1;
values ^= 1 << n;
}
}
public:
backlight_config_t config_backlight_timer() {
const auto timeout_enum = (backlight_timeout_t)((values & bits_mask_t::BacklightTimeoutMask) >> bits_t::BacklightTimeoutLSB);
const bool timeout_enabled = bit_read(bits_t::BacklightTimeoutEnable);
return backlight_config_t(timeout_enum, timeout_enabled);
}
void set_config_backlight_timer(const backlight_config_t& new_value) {
values = (values & ~bits_mask_t::BacklightTimeoutMask) | ((new_value.timeout_enum() << bits_t::BacklightTimeoutLSB) & bits_mask_t::BacklightTimeoutMask);
bit_write(bits_t::BacklightTimeoutEnable, new_value.timeout_enabled());
}
constexpr uint32_t clkout_freq() {
uint32_t freq = (values & bits_mask_t::ClkoutFreqMask) >> bits_t::ClkoutFreqLSB;
if (freq < clkout_freq_range.minimum || freq > clkout_freq_range.maximum) {
values = (values & ~bits_mask_t::ClkoutFreqMask) | (clkout_freq_reset_value << bits_t::ClkoutFreqLSB);
return clkout_freq_reset_value;
} else {
return freq;
}
}
constexpr void set_clkout_freq(uint32_t freq) {
values = (values & ~bits_mask_t::ClkoutFreqMask) | (clkout_freq_range.clip(freq) << bits_t::ClkoutFreqLSB);
}
// ui_config is an uint32_t var storing information bitwise
// bits 0-2 store the backlight timer
// bits 4-19 (16 bits) store the clkout frequency
// bits 21-31 store the different single bit configs depicted below
// bit 20 store the display state of the gui return icon, hidden (0) or shown (1)
constexpr bool show_gui_return_icon() const { // add return icon in touchscreen menue
return bit_read(bits_t::ShowGUIReturnIcon);
}
constexpr void set_gui_return_icon(bool v) {
bit_write(bits_t::ShowGUIReturnIcon, v);
}
constexpr bool load_app_settings() const { // load (last saved) app settings on startup of app
return bit_read(bits_t::LoadAppSettings);
}
constexpr void set_load_app_settings(bool v) {
bit_write(bits_t::LoadAppSettings, v);
}
constexpr bool save_app_settings() const { // save app settings when closing app
return bit_read(bits_t::SaveAppSettings);
}
constexpr void set_save_app_settings(bool v) {
bit_write(bits_t::SaveAppSettings, v);
}
constexpr bool show_bigger_qr_code() const { // show bigger QR code
return bit_read(bits_t::ShowBiggerQRCode);
}
constexpr void set_show_bigger_qr_code(bool v) {
bit_write(bits_t::ShowBiggerQRCode, v);
}
constexpr bool disable_touchscreen() const { // Option to disable touch screen
return bit_read(bits_t::DisableTouchscreen);
}
constexpr void set_disable_touchscreen(bool v) {
bit_write(bits_t::DisableTouchscreen, v);
}
constexpr bool hide_clock() const { // clock hidden from main menu
return bit_read(bits_t::HideClock);
}
constexpr void set_clock_hidden(bool v) {
bit_write(bits_t::HideClock, v);
}
constexpr bool clock_with_date() const { // show clock with date, if not hidden
return bit_read(bits_t::ClockWithDate);
}
constexpr void set_clock_with_date(bool v) {
bit_write(bits_t::ClockWithDate, v);
}
constexpr bool clkout_enabled() const {
return bit_read(bits_t::ClkOutEnabled);
}
constexpr void set_clkout_enabled(bool v) {
bit_write(bits_t::ClkOutEnabled, v);
}
constexpr bool stealth_mode() const {
return bit_read(bits_t::StealthMode);
}
constexpr void set_stealth_mode(bool v) {
bit_write(bits_t::StealthMode, v);
}
constexpr bool config_login() const {
return bit_read(bits_t::ConfigLogin);
}
constexpr void set_config_login(bool v) {
bit_write(bits_t::ConfigLogin, v);
}
constexpr bool config_splash() const {
return bit_read(bits_t::ConfigSplash);
}
constexpr void set_config_splash(bool v) {
bit_write(bits_t::ConfigSplash, v);
}
constexpr ui_config_t()
: values(
(1 << ConfigSplash) | (clkout_freq_reset_value << ClkoutFreqLSB) | (7 << BacklightTimeoutLSB)) {
}
}; };
static_assert(sizeof(ui_config_t) == sizeof(uint32_t));
/* Additional UI config. /* Additional UI config.
* NB: Will be default init - override in defaults(). */ * NB: Will be default init - override in defaults(). */
@ -266,67 +124,48 @@ struct ui_config2_t {
bool hide_sd_card : 1; bool hide_sd_card : 1;
bool hide_mute : 1; bool hide_mute : 1;
bool UNUSED : 7; bool UNUSED_1 : 1;
bool UNUSED_2 : 1;
bool UNUSED_3 : 1;
bool UNUSED_4 : 1;
bool UNUSED_5 : 1;
bool UNUSED_6 : 1;
bool UNUSED_7 : 1;
uint8_t placeholder_1; uint8_t PLACEHOLDER_2;
uint8_t placeholder_2; uint8_t PLACEHOLDER_3;
}; };
static_assert(sizeof(ui_config2_t) == sizeof(uint32_t)); static_assert(sizeof(ui_config2_t) == sizeof(uint32_t));
/* Additional config.
* NB: Will be default init - override in defaults(). */
struct misc_config_t { struct misc_config_t {
private: bool mute_audio : 1;
enum bits_t { bool disable_speaker : 1;
ConfigAudioMute = 0, bool UNUSED_2 : 1;
ConfigSpeakerDisable = 1, bool UNUSED_3 : 1;
}; bool UNUSED_4 : 1;
bool UNUSED_5 : 1;
bool UNUSED_6 : 1;
bool UNUSED_7 : 1;
// misc_config_t bits: uint8_t PLACEHOLDER_1;
// ConfigAudioMute = set to mute all audio output (speakers & headphones) uint8_t PLACEHOLDER_2;
// ConfigSpeakerDisable = set to disable only the speaker and leave headphones enabled (only supported on AK4951 codec) uint8_t PLACEHOLDER_3;
uint32_t values;
constexpr bool bit_read(const bits_t n) const {
return ((values >> n) & 1) != 0;
}
constexpr void bit_write(const bits_t n, const bool v) {
if (bit_read(n) != v) {
values ^= 1 << n;
}
}
public:
constexpr bool config_audio_mute() const {
return bit_read(bits_t::ConfigAudioMute);
}
constexpr void set_config_audio_mute(bool v) {
bit_write(bits_t::ConfigAudioMute, v);
}
constexpr bool config_speaker_disable() const {
return bit_read(bits_t::ConfigSpeakerDisable);
}
constexpr void set_config_speaker_disable(bool v) {
bit_write(bits_t::ConfigSpeakerDisable, v);
}
constexpr misc_config_t()
: values(0) {
}
}; };
static_assert(sizeof(misc_config_t) == sizeof(uint32_t));
/* IMPORTANT: Report your changes here in the dump_persistent_memory function a few lines later !! */ /* IMPORTANT: Update dump_persistent_memory (below) when changing data_t. */
/* Struct must pack the same way on M4 and M0 cores.
* NB: When adding new members, keep 32bit-aligned.*/
/* struct must pack the same way on M4 and M0 cores. */
struct data_t { struct data_t {
data_structure_version_enum structure_version; data_structure_version_enum structure_version;
int64_t target_frequency; int64_t target_frequency;
int32_t correction_ppb; int32_t correction_ppb;
uint32_t touch_calibration_magic; uint32_t touch_calibration_magic;
touch::Calibration touch_calibration; touch::Calibration touch_calibration; // 7 * 32 bits.
// Modem // Modem
uint32_t modem_def_index; uint32_t modem_def_index;
@ -337,7 +176,7 @@ struct data_t {
int32_t modem_baudrate; int32_t modem_baudrate;
int32_t modem_repeat; int32_t modem_repeat;
// Play dead unlock // Play dead unlock (Used?)
uint32_t playdead_magic; uint32_t playdead_magic;
uint32_t playing_dead; uint32_t playing_dead;
uint32_t playdead_sequence; uint32_t playdead_sequence;
@ -356,26 +195,30 @@ struct data_t {
// Recon App // Recon App
uint64_t recon_config; uint64_t recon_config;
bool placeholder_0;
// enable or disable converter // enable or disable converter
bool converter; bool converter;
// set up converter (false) or down converter (true) converter // set up converter (false) or down converter (true) converter
bool updown_converter; bool updown_converter;
bool updown_frequency_rx_correction;
bool updown_frequency_tx_correction;
bool UNUSED_4 : 1;
bool UNUSED_5 : 1;
bool UNUSED_6 : 1;
bool UNUSED_7 : 1;
// up/down converter offset // up/down converter offset
int64_t converter_frequency_offset; int64_t converter_frequency_offset;
// frequency correction // frequency correction
uint32_t frequency_rx_correction; uint32_t frequency_rx_correction;
bool updown_frequency_rx_correction;
uint32_t frequency_tx_correction; uint32_t frequency_tx_correction;
bool updown_frequency_tx_correction;
// Rotary encoder dial sensitivity (encoder.cpp/hpp) // Rotary encoder dial sensitivity (encoder.cpp/hpp)
uint8_t encoder_dial_sensitivity; uint16_t encoder_dial_sensitivity : 4;
uint16_t UNUSED_8 : 12;
// Headphone volume in centibels. (Only really needs 10 bits) // Headphone volume in centibels.
int32_t headphone_volume_cb; int16_t headphone_volume_cb;
// Misc flags // Misc flags
misc_config_t misc_config; misc_config_t misc_config;
@ -411,15 +254,23 @@ struct data_t {
hardware_config(0), hardware_config(0),
recon_config(0), recon_config(0),
placeholder_0(0),
converter(0), converter(false),
updown_converter(0), updown_converter(false),
updown_frequency_rx_correction(false),
updown_frequency_tx_correction(false),
UNUSED_4(false),
UNUSED_5(false),
UNUSED_6(false),
UNUSED_7(false),
converter_frequency_offset(0), converter_frequency_offset(0),
frequency_rx_correction(0), frequency_rx_correction(0),
updown_frequency_rx_correction(0),
frequency_tx_correction(0), frequency_tx_correction(0),
updown_frequency_tx_correction(0),
encoder_dial_sensitivity(0), encoder_dial_sensitivity(0),
UNUSED_8(0),
headphone_volume_cb(-600), headphone_volume_cb(-600),
misc_config(), misc_config(),
ui_config2() { ui_config2() {
@ -510,7 +361,10 @@ namespace cache {
void defaults() { void defaults() {
cached_backup_ram = backup_ram_t(); cached_backup_ram = backup_ram_t();
// defaults values for recon app set_config_backlight_timer(backlight_config_t{});
set_config_splash(true);
// Default values for recon app.
set_recon_autosave_freqs(false); set_recon_autosave_freqs(false);
set_recon_autostart_recon(true); set_recon_autostart_recon(true);
set_recon_continuous(true); set_recon_continuous(true);
@ -626,14 +480,16 @@ void set_modem_baudrate(const int32_t new_value) {
data->modem_baudrate = modem_baudrate_range.clip(new_value); data->modem_baudrate = modem_baudrate_range.clip(new_value);
} }
/*int32_t modem_bw() { /*
int32_t modem_bw() {
modem_bw_range.reset_if_outside(data->modem_bw, modem_bw_reset_value); modem_bw_range.reset_if_outside(data->modem_bw, modem_bw_reset_value);
return data->modem_bw; return data->modem_bw;
} }
void set_modem_bw(const int32_t new_value) { void set_modem_bw(const int32_t new_value) {
data->modem_bw = modem_bw_range.clip(new_value); data->modem_bw = modem_bw_range.clip(new_value);
}*/ }
*/
uint8_t modem_repeat() { uint8_t modem_repeat() {
modem_repeat_range.reset_if_outside(data->modem_repeat, modem_repeat_reset_value); modem_repeat_range.reset_if_outside(data->modem_repeat, modem_repeat_reset_value);
@ -652,56 +508,56 @@ void set_serial_format(const serial_format_t new_value) {
data->serial_format = new_value; data->serial_format = new_value;
} }
bool show_gui_return_icon() { // add return icon in touchscreen menue bool show_gui_return_icon() { // add return icon in touchscreen menu
return data->ui_config.show_gui_return_icon(); return data->ui_config.show_gui_return_icon != 0;
} }
bool load_app_settings() { // load (last saved) app settings on startup of app bool load_app_settings() { // load (last saved) app settings on startup of app
return data->ui_config.load_app_settings(); return data->ui_config.load_app_settings != 0;
} }
bool save_app_settings() { // save app settings when closing app bool save_app_settings() { // save app settings when closing app
return data->ui_config.save_app_settings(); return data->ui_config.save_app_settings != 0;
} }
bool show_bigger_qr_code() { // show bigger QR code bool show_bigger_qr_code() { // show bigger QR code
return data->ui_config.show_bigger_qr_code(); return data->ui_config.show_large_qr_code != 0;
} }
bool disable_touchscreen() { // Option to disable touch screen bool disable_touchscreen() { // Option to disable touch screen
return data->ui_config.disable_touchscreen(); return data->ui_config.disable_touchscreen;
} }
bool hide_clock() { // clock hidden from main menu bool hide_clock() { // Hide clock from main menu
return data->ui_config.hide_clock(); return data->ui_config.hide_clock;
} }
bool clock_with_date() { // show clock with date, if not hidden bool clock_with_date() { // Show clock with date, if not hidden
return data->ui_config.clock_with_date(); return data->ui_config.clock_show_date;
} }
bool clkout_enabled() { bool clkout_enabled() {
return data->ui_config.clkout_enabled(); return data->ui_config.clkout_enabled;
} }
bool config_audio_mute() { bool config_audio_mute() {
return data->misc_config.config_audio_mute(); return data->misc_config.mute_audio;
} }
bool config_speaker_disable() { bool config_speaker_disable() {
return data->misc_config.config_speaker_disable(); return data->misc_config.disable_speaker;
} }
bool stealth_mode() { bool stealth_mode() {
return data->ui_config.stealth_mode(); return data->ui_config.stealth_mode;
} }
bool config_login() { bool config_login() {
return data->ui_config.config_login(); return data->ui_config.config_login;
} }
bool config_splash() { bool config_splash() {
return data->ui_config.config_splash(); return data->ui_config.config_splash;
} }
uint8_t config_cpld() { uint8_t config_cpld() {
@ -709,59 +565,60 @@ uint8_t config_cpld() {
} }
backlight_config_t config_backlight_timer() { backlight_config_t config_backlight_timer() {
return data->ui_config.config_backlight_timer(); return {static_cast<backlight_timeout_t>(data->ui_config.backlight_timeout),
data->ui_config.enable_backlight_timeout == 1};
} }
void set_gui_return_icon(bool v) { void set_gui_return_icon(bool v) {
data->ui_config.set_gui_return_icon(v); data->ui_config.show_gui_return_icon = v ? 1 : 0;
} }
void set_load_app_settings(bool v) { void set_load_app_settings(bool v) {
data->ui_config.set_load_app_settings(v); data->ui_config.load_app_settings = v ? 1 : 0;
} }
void set_save_app_settings(bool v) { void set_save_app_settings(bool v) {
data->ui_config.set_save_app_settings(v); data->ui_config.save_app_settings = v ? 1 : 0;
} }
void set_show_bigger_qr_code(bool v) { void set_show_bigger_qr_code(bool v) {
data->ui_config.set_show_bigger_qr_code(v); data->ui_config.show_large_qr_code = v ? 1 : 0;
} }
void set_disable_touchscreen(bool v) { void set_disable_touchscreen(bool v) {
data->ui_config.set_disable_touchscreen(v); data->ui_config.disable_touchscreen = v;
} }
void set_clock_hidden(bool v) { void set_clock_hidden(bool v) {
data->ui_config.set_clock_hidden(v); data->ui_config.hide_clock = v;
} }
void set_clock_with_date(bool v) { void set_clock_with_date(bool v) {
data->ui_config.set_clock_with_date(v); data->ui_config.clock_show_date = v;
} }
void set_clkout_enabled(bool v) { void set_clkout_enabled(bool v) {
data->ui_config.set_clkout_enabled(v); data->ui_config.clkout_enabled = v;
} }
void set_config_audio_mute(bool v) { void set_config_audio_mute(bool v) {
data->misc_config.set_config_audio_mute(v); data->misc_config.mute_audio = v;
} }
void set_config_speaker_disable(bool v) { void set_config_speaker_disable(bool v) {
data->misc_config.set_config_speaker_disable(v); data->misc_config.disable_speaker = v;
} }
void set_stealth_mode(bool v) { void set_stealth_mode(bool v) {
data->ui_config.set_stealth_mode(v); data->ui_config.stealth_mode = v;
} }
void set_config_login(bool v) { void set_config_login(bool v) {
data->ui_config.set_config_login(v); data->ui_config.config_login = v;
} }
void set_config_splash(bool v) { void set_config_splash(bool v) {
data->ui_config.set_config_splash(v); data->ui_config.config_splash = v;
} }
void set_config_cpld(uint8_t i) { void set_config_cpld(uint8_t i) {
@ -769,7 +626,8 @@ void set_config_cpld(uint8_t i) {
} }
void set_config_backlight_timer(const backlight_config_t& new_value) { void set_config_backlight_timer(const backlight_config_t& new_value) {
data->ui_config.set_config_backlight_timer(new_value); data->ui_config.backlight_timeout = static_cast<uint8_t>(new_value.timeout_enum());
data->ui_config.enable_backlight_timeout = static_cast<uint8_t>(new_value.timeout_enabled());
} }
uint32_t pocsag_last_address() { uint32_t pocsag_last_address() {
@ -788,12 +646,17 @@ void set_pocsag_ignore_address(uint32_t address) {
data->pocsag_ignore_address = address; data->pocsag_ignore_address = address;
} }
uint32_t clkout_freq() { uint16_t clkout_freq() {
return data->ui_config.clkout_freq(); auto freq = data->ui_config.clkout_freq;
if (freq < clkout_freq_range.minimum || freq > clkout_freq_range.maximum)
set_clkout_freq(clkout_freq_reset_value);
return data->ui_config.clkout_freq;
} }
void set_clkout_freq(uint32_t freq) { void set_clkout_freq(uint16_t freq) {
data->ui_config.set_clkout_freq(freq); data->ui_config.clkout_freq = freq;
} }
/* Recon app */ /* Recon app */
@ -982,26 +845,23 @@ bool should_use_sdcard_for_pmem() {
} }
int save_persistent_settings_to_file() { int save_persistent_settings_to_file() {
std::string filename = PMEM_SETTING_FILE;
delete_file(filename);
File outfile; File outfile;
auto result = outfile.create(filename); auto error = outfile.create(PMEM_SETTING_FILE);
if (result.is_valid()) { if (error)
return false; return false;
}
outfile.write(reinterpret_cast<char*>(&cached_backup_ram), sizeof(backup_ram_t)); outfile.write(reinterpret_cast<char*>(&cached_backup_ram), sizeof(backup_ram_t));
return true; return true;
} }
int load_persistent_settings_from_file() { int load_persistent_settings_from_file() {
std::string filename = PMEM_SETTING_FILE;
File infile; File infile;
auto result = infile.open(filename); auto error = infile.open(PMEM_SETTING_FILE);
if (!result.is_valid()) { if (error)
return false;
infile.read(reinterpret_cast<char*>(&cached_backup_ram), sizeof(backup_ram_t)); infile.read(reinterpret_cast<char*>(&cached_backup_ram), sizeof(backup_ram_t));
return true; return true;
}
return false;
} }
// Pmem size helper // Pmem size helper
@ -1057,33 +917,37 @@ bool debug_dump() {
pmem_dump_file.write_line("tone_mix: " + to_string_dec_uint(data->tone_mix)); pmem_dump_file.write_line("tone_mix: " + to_string_dec_uint(data->tone_mix));
pmem_dump_file.write_line("hardware_config: " + to_string_dec_uint(data->hardware_config)); pmem_dump_file.write_line("hardware_config: " + to_string_dec_uint(data->hardware_config));
pmem_dump_file.write_line("recon_config: 0x" + to_string_hex(data->recon_config, 16)); pmem_dump_file.write_line("recon_config: 0x" + to_string_hex(data->recon_config, 16));
pmem_dump_file.write_line("placeholder_0: " + to_string_dec_int(data->placeholder_0));
pmem_dump_file.write_line("converter: " + to_string_dec_int(data->converter)); pmem_dump_file.write_line("converter: " + to_string_dec_int(data->converter));
pmem_dump_file.write_line("updown_converter: " + to_string_dec_int(data->updown_converter)); pmem_dump_file.write_line("updown_converter: " + to_string_dec_int(data->updown_converter));
pmem_dump_file.write_line("updown_frequency_rx_correction: " + to_string_dec_int(data->updown_frequency_rx_correction));
pmem_dump_file.write_line("updown_frequency_tx_correction: " + to_string_dec_int(data->updown_frequency_tx_correction));
// pmem_dump_file.write_line("UNUSED_4: " + to_string_dec_int(data->UNUSED_4));
// pmem_dump_file.write_line("UNUSED_5: " + to_string_dec_int(data->UNUSED_5));
// pmem_dump_file.write_line("UNUSED_6: " + to_string_dec_int(data->UNUSED_6));
// pmem_dump_file.write_line("UNUSED_7: " + to_string_dec_int(data->UNUSED_7));
pmem_dump_file.write_line("converter_frequency_offset: " + to_string_dec_int(data->converter_frequency_offset)); pmem_dump_file.write_line("converter_frequency_offset: " + to_string_dec_int(data->converter_frequency_offset));
pmem_dump_file.write_line("frequency_rx_correction: " + to_string_dec_uint(data->frequency_rx_correction)); pmem_dump_file.write_line("frequency_rx_correction: " + to_string_dec_uint(data->frequency_rx_correction));
pmem_dump_file.write_line("updown_frequency_rx_correction: " + to_string_dec_int(data->updown_frequency_rx_correction));
pmem_dump_file.write_line("frequency_tx_correction: " + to_string_dec_uint(data->frequency_tx_correction)); pmem_dump_file.write_line("frequency_tx_correction: " + to_string_dec_uint(data->frequency_tx_correction));
pmem_dump_file.write_line("updown_frequency_tx_correction: " + to_string_dec_int(data->updown_frequency_tx_correction));
pmem_dump_file.write_line("encoder_dial_sensitivity: " + to_string_dec_uint(data->encoder_dial_sensitivity)); pmem_dump_file.write_line("encoder_dial_sensitivity: " + to_string_dec_uint(data->encoder_dial_sensitivity));
// pmem_dump_file.write_line("UNUSED_8: " + to_string_dec_uint(data->UNUSED_8));
pmem_dump_file.write_line("headphone_volume_cb: " + to_string_dec_int(data->headphone_volume_cb)); pmem_dump_file.write_line("headphone_volume_cb: " + to_string_dec_int(data->headphone_volume_cb));
// ui_config bits // ui_config bits
const auto backlight_timer = portapack::persistent_memory::config_backlight_timer(); const auto backlight_timer = portapack::persistent_memory::config_backlight_timer();
pmem_dump_file.write_line("ui_config clkout_freq: " + to_string_dec_uint(clkout_freq()));
pmem_dump_file.write_line("ui_config backlight_timer.timeout_enabled: " + to_string_dec_uint(backlight_timer.timeout_enabled())); pmem_dump_file.write_line("ui_config backlight_timer.timeout_enabled: " + to_string_dec_uint(backlight_timer.timeout_enabled()));
pmem_dump_file.write_line("ui_config backlight_timer.timeout_seconds: " + to_string_dec_uint(backlight_timer.timeout_seconds())); pmem_dump_file.write_line("ui_config backlight_timer.timeout_seconds: " + to_string_dec_uint(backlight_timer.timeout_seconds()));
pmem_dump_file.write_line("ui_config clkout_freq: " + to_string_dec_uint(clkout_freq())); pmem_dump_file.write_line("ui_config show_gui_return_icon: " + to_string_dec_uint(data->ui_config.show_gui_return_icon));
pmem_dump_file.write_line("ui_config show_gui_return_icon: " + to_string_dec_uint(data->ui_config.show_gui_return_icon())); pmem_dump_file.write_line("ui_config load_app_settings: " + to_string_dec_uint(data->ui_config.load_app_settings));
pmem_dump_file.write_line("ui_config load_app_settings: " + to_string_dec_uint(data->ui_config.load_app_settings())); pmem_dump_file.write_line("ui_config save_app_settings: " + to_string_dec_uint(data->ui_config.save_app_settings));
pmem_dump_file.write_line("ui_config save_app_settings: " + to_string_dec_uint(data->ui_config.save_app_settings())); pmem_dump_file.write_line("ui_config show_bigger_qr_code: " + to_string_dec_uint(data->ui_config.show_large_qr_code));
pmem_dump_file.write_line("ui_config show_bigger_qr_code: " + to_string_dec_uint(data->ui_config.show_bigger_qr_code())); pmem_dump_file.write_line("ui_config disable_touchscreen: " + to_string_dec_uint(data->ui_config.disable_touchscreen));
pmem_dump_file.write_line("ui_config disable_touchscreen: " + to_string_dec_uint(data->ui_config.disable_touchscreen())); pmem_dump_file.write_line("ui_config hide_clock: " + to_string_dec_uint(data->ui_config.hide_clock));
pmem_dump_file.write_line("ui_config hide_clock: " + to_string_dec_uint(data->ui_config.hide_clock())); pmem_dump_file.write_line("ui_config clock_with_date: " + to_string_dec_uint(data->ui_config.clock_show_date));
pmem_dump_file.write_line("ui_config clock_with_date: " + to_string_dec_uint(data->ui_config.clock_with_date())); pmem_dump_file.write_line("ui_config clkout_enabled: " + to_string_dec_uint(data->ui_config.clkout_enabled));
pmem_dump_file.write_line("ui_config clkout_enabled: " + to_string_dec_uint(data->ui_config.clkout_enabled())); pmem_dump_file.write_line("ui_config stealth_mode: " + to_string_dec_uint(data->ui_config.stealth_mode));
pmem_dump_file.write_line("ui_config stealth_mode: " + to_string_dec_uint(data->ui_config.stealth_mode())); pmem_dump_file.write_line("ui_config config_login: " + to_string_dec_uint(data->ui_config.config_login));
pmem_dump_file.write_line("ui_config config_login: " + to_string_dec_uint(data->ui_config.config_login())); pmem_dump_file.write_line("ui_config config_splash: " + to_string_dec_uint(data->ui_config.config_splash));
pmem_dump_file.write_line("ui_config config_splash: " + to_string_dec_uint(data->ui_config.config_splash()));
// ui_config2 bits // ui_config2 bits
pmem_dump_file.write_line("ui_config2 hide_speaker: " + to_string_dec_uint(data->ui_config2.hide_speaker)); pmem_dump_file.write_line("ui_config2 hide_speaker: " + to_string_dec_uint(data->ui_config2.hide_speaker));

9
firmware/common/portapack_persistent_memory.hpp
View File

@ -34,9 +34,10 @@
#include "volume.hpp" #include "volume.hpp"
// persistant memory from/to sdcard flag file // persistant memory from/to sdcard flag file
#define PMEM_FILEFLAG "/SETTINGS/PMEM_FILEFLAG" #define PMEM_FILEFLAG u"/SETTINGS/PMEM_FILEFLAG"
// persistant memory from/to sdcard flag file // persistant memory from/to sdcard flag file
#define PMEM_SETTING_FILE "/SETTINGS/pmem_settings" #define PMEM_SETTING_FILE u"/SETTINGS/pmem_settings"
using namespace modems; using namespace modems;
using namespace serializer; using namespace serializer;
@ -225,8 +226,8 @@ void set_pocsag_ignore_address(uint32_t address);
bool clkout_enabled(); bool clkout_enabled();
void set_clkout_enabled(bool v); void set_clkout_enabled(bool v);
uint32_t clkout_freq(); uint16_t clkout_freq();
void set_clkout_freq(uint32_t freq); void set_clkout_freq(uint16_t freq);
/* Recon app */ /* Recon app */
bool recon_autosave_freqs(); bool recon_autosave_freqs();