TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-06 09:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Debug->Peripherals to view all registers of SI5351 chip (#1663)

Browse Source
This commit is contained in:
Mark Thompson 2023-12-22 01:45:05 -06:00 committed by GitHub
parent 53bbf74f4d
commit 337e3f4449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/application/apps/ui_debug.cpp
View File

@ -176,12 +176,15 @@ void RegistersWidget::paint(Painter& painter) {
void RegistersWidget::draw_legend(const Coord left, Painter& painter) { void RegistersWidget::draw_legend(const Coord left, Painter& painter) {
const auto pos = screen_pos(); const auto pos = screen_pos();
const std::string spaces(config.legend_length(), ' ');
for (uint32_t i = 0; i < config.registers_per_page; i += config.registers_per_row()) {
uint32_t r = page_number * config.registers_per_page + i;
for (uint32_t i = 0; i < config.registers_count; i += config.registers_per_row()) {
const Point offset{ const Point offset{
left, static_cast<int>((i / config.registers_per_row()) * row_height)}; left, static_cast<int>((i / config.registers_per_row()) * row_height)};
const auto text = to_string_hex(i, config.legend_length()); const auto text = (r >= config.registers_count) ? spaces : to_string_hex(r, config.legend_length());
painter.draw_string( painter.draw_string(
pos + offset, pos + offset,
style().invert(), style().invert(),
@ -193,15 +196,16 @@ void RegistersWidget::draw_values(
const Coord left, const Coord left,
Painter& painter) { Painter& painter) {
const auto pos = screen_pos(); const auto pos = screen_pos();
const std::string spaces(config.value_length(), ' ');
for (uint32_t i = 0; i < config.registers_per_page; i++) {
uint32_t r = page_number * config.registers_per_page + i;
for (uint32_t i = 0; i < config.registers_count; i++) {
const Point offset = { const Point offset = {
static_cast<int>(left + config.legend_width() + 8 + (i % config.registers_per_row()) * (config.value_width() + 8)), static_cast<int>(left + config.legend_width() + 8 + (i % config.registers_per_row()) * (config.value_width() + 8)),
static_cast<int>((i / config.registers_per_row()) * row_height)}; static_cast<int>((i / config.registers_per_row()) * row_height)};
const auto value = reg_read(i); const auto text = (r >= config.registers_count) ? spaces : to_string_hex(reg_read(r), config.value_length());
const auto text = to_string_hex(value, config.value_length());
painter.draw_string( painter.draw_string(
pos + offset, pos + offset,
style(), style(),
@ -213,7 +217,7 @@ uint32_t RegistersWidget::reg_read(const uint32_t register_number) {
if (register_number < config.registers_count) { if (register_number < config.registers_count) {
switch (config.chip_type) { switch (config.chip_type) {
case CT_PMEM: case CT_PMEM:
return portapack::persistent_memory::pmem_data_word((page_number * config.registers_count + register_number) / 4) >> (register_number % 4 * 8); return portapack::persistent_memory::pmem_data_word(register_number / 4) >> (register_number % 4 * 8);
case CT_RFFC5072: case CT_RFFC5072:
return radio::debug::first_if::register_read(register_number); return radio::debug::first_if::register_read(register_number);
case CT_MAX283X: case CT_MAX283X:
@ -272,6 +276,7 @@ RegistersView::RegistersView(
button_done.on_select = [&nav](Button&) { nav.pop(); }; button_done.on_select = [&nav](Button&) { nav.pop(); };
registers_widget.set_parent_rect({0, 48, 240, 192}); registers_widget.set_parent_rect({0, 48, 240, 192});
registers_widget.set_page(0);
text_title.set_parent_rect({(240 - static_cast<int>(title.size()) * 8) / 2, 16, text_title.set_parent_rect({(240 - static_cast<int>(title.size()) * 8) / 2, 16,
static_cast<int>(title.size()) * 8, 16}); static_cast<int>(title.size()) * 8, 16});
@ -296,6 +301,13 @@ void RegistersView::focus() {
button_done.focus(); button_done.focus();
} }
bool RegistersView::on_encoder(const EncoderEvent delta) {
registers_widget.set_page(std::max(0ul, std::min(registers_widget.page_count() - 1, registers_widget.page() + delta)));
registers_widget.update();
return true;
}
/* ControlsSwitchesWidget ************************************************/ /* ControlsSwitchesWidget ************************************************/
void ControlsSwitchesWidget::on_show() { void ControlsSwitchesWidget::on_show() {
@ -429,10 +441,10 @@ DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) {
const char* max283x = hackrf_r9 ? "MAX2839" : "MAX2837"; const char* max283x = hackrf_r9 ? "MAX2839" : "MAX2837";
const char* si5351x = hackrf_r9 ? "Si5351A" : "Si5351C"; const char* si5351x = hackrf_r9 ? "Si5351A" : "Si5351C";
add_items({ add_items({
{"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 16}); }}, {"RFFC5072", ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>("RFFC5072", RegistersWidgetConfig{CT_RFFC5072, 31, 31, 16}); }},
{max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, max283x]() { nav.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 10}); }}, {max283x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, max283x]() { nav.push<RegistersView>(max283x, RegistersWidgetConfig{CT_MAX283X, 32, 32, 10}); }},
{si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, si5351x]() { nav.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 96, 8}); }}, {si5351x, ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav, si5351x]() { nav.push<RegistersView>(si5351x, RegistersWidgetConfig{CT_SI5351, 188, 96, 8}); }},
{audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_bits()}); }}, {audio::debug::codec_name(), ui::Color::dark_cyan(), &bitmap_icon_peripherals_details, [&nav]() { nav.push<RegistersView>(audio::debug::codec_name(), RegistersWidgetConfig{CT_AUDIO, audio::debug::reg_count(), audio::debug::reg_count(), audio::debug::reg_bits()}); }},
}); });
set_max_rows(2); // allow wider buttons set_max_rows(2); // allow wider buttons
} }
@ -504,8 +516,8 @@ void DebugMemoryDumpView::focus() {
/* DebugPmemView *********************************************************/ /* DebugPmemView *********************************************************/
DebugPmemView::DebugPmemView(NavigationView& nav) DebugPmemView::DebugPmemView(NavigationView& nav)
: registers_widget(RegistersWidgetConfig{CT_PMEM, page_size, 8}) { : registers_widget(RegistersWidgetConfig{CT_PMEM, PMEM_SIZE_BYTES, page_size, 8}) {
add_children({&text_page, &registers_widget, &text_checksum, &text_checksum2, &button_ok}); add_children({&registers_widget, &text_checksum, &text_checksum2, &button_ok});
registers_widget.set_parent_rect({0, 32, 240, 192}); registers_widget.set_parent_rect({0, 32, 240, 192});
@ -532,7 +544,6 @@ void DebugPmemView::focus() {
} }
void DebugPmemView::update() { void DebugPmemView::update() {
text_page.set(to_string_hex(registers_widget.page() * page_size, 2) + "+");
registers_widget.update(); registers_widget.update();
} }

8
firmware/application/apps/ui_debug.hpp
View File

@ -142,6 +142,7 @@ typedef enum {
struct RegistersWidgetConfig { struct RegistersWidgetConfig {
chip_type_t chip_type; chip_type_t chip_type;
uint32_t registers_count; uint32_t registers_count;
uint32_t registers_per_page;
uint32_t register_bits; uint32_t register_bits;
constexpr size_t legend_length() const { constexpr size_t legend_length() const {
@ -194,6 +195,7 @@ class RegistersWidget : public Widget {
void set_page(int32_t value) { page_number = value; } void set_page(int32_t value) { page_number = value; }
uint32_t page(void) { return page_number; } uint32_t page(void) { return page_number; }
uint32_t page_count(void) { return (config.registers_count + config.registers_per_page - 1) / config.registers_per_page; }
private: private:
const RegistersWidgetConfig config; const RegistersWidgetConfig config;
@ -208,8 +210,8 @@ class RegistersWidget : public Widget {
class RegistersView : public View { class RegistersView : public View {
public: public:
RegistersView(NavigationView& nav, const std::string& title, RegistersWidgetConfig&& config); RegistersView(NavigationView& nav, const std::string& title, RegistersWidgetConfig&& config);
void focus() override;
void focus(); bool on_encoder(const EncoderEvent delta) override;
private: private:
Text text_title{}; Text text_title{};
@ -364,8 +366,6 @@ class DebugPmemView : public View {
static constexpr uint8_t page_size{96}; // Must be multiply of 4 otherwise bit shifting for register view wont work properly static constexpr uint8_t page_size{96}; // Must be multiply of 4 otherwise bit shifting for register view wont work properly
static constexpr uint8_t page_count{(portapack::memory::map::backup_ram.size() + page_size - 1) / page_size}; static constexpr uint8_t page_count{(portapack::memory::map::backup_ram.size() + page_size - 1) / page_size};
Text text_page{{16, 16, 208, 16}};
RegistersWidget registers_widget; RegistersWidget registers_widget;
Text text_checksum{{16, 232, 208, 16}}; Text text_checksum{{16, 232, 208, 16}};

8
firmware/common/portapack_persistent_memory.cpp
View File

@ -284,11 +284,11 @@ struct data_t {
struct backup_ram_t { struct backup_ram_t {
private: private:
volatile uint32_t regfile[63]; volatile uint32_t regfile[PMEM_SIZE_WORDS - 1];
volatile uint32_t check_value; volatile uint32_t check_value;
static void copy(const backup_ram_t& src, backup_ram_t& dst) { static void copy(const backup_ram_t& src, backup_ram_t& dst) {
for (size_t i = 0; i < 63; i++) { for (size_t i = 0; i < PMEM_SIZE_WORDS - 1; i++) {
dst.regfile[i] = src.regfile[i]; dst.regfile[i] = src.regfile[i];
} }
dst.check_value = src.check_value; dst.check_value = src.check_value;
@ -297,7 +297,7 @@ struct backup_ram_t {
static void copy_from_data_t(const data_t& src, backup_ram_t& dst) { static void copy_from_data_t(const data_t& src, backup_ram_t& dst) {
const uint32_t* const src_words = (uint32_t*)&src; const uint32_t* const src_words = (uint32_t*)&src;
const size_t word_count = (sizeof(data_t) + 3) / 4; const size_t word_count = (sizeof(data_t) + 3) / 4;
for (size_t i = 0; i < 63; i++) { for (size_t i = 0; i < PMEM_SIZE_WORDS - 1; i++) {
if (i < word_count) { if (i < word_count) {
dst.regfile[i] = src_words[i]; dst.regfile[i] = src_words[i];
} else { } else {
@ -308,7 +308,7 @@ struct backup_ram_t {
uint32_t compute_check_value() { uint32_t compute_check_value() {
CRC<32> crc{0x04c11db7, 0xffffffff, 0xffffffff}; CRC<32> crc{0x04c11db7, 0xffffffff, 0xffffffff};
for (size_t i = 0; i < 63; i++) { for (size_t i = 0; i < PMEM_SIZE_WORDS - 1; i++) {
const auto word = regfile[i]; const auto word = regfile[i];
crc.process_byte((word >> 0) & 0xff); crc.process_byte((word >> 0) & 0xff);
crc.process_byte((word >> 8) & 0xff); crc.process_byte((word >> 8) & 0xff);

3
firmware/common/portapack_persistent_memory.hpp
View File

@ -39,6 +39,9 @@
// persistant memory from/to sdcard flag file // persistant memory from/to sdcard flag file
#define PMEM_SETTING_FILE u"/SETTINGS/pmem_settings" #define PMEM_SETTING_FILE u"/SETTINGS/pmem_settings"
#define PMEM_SIZE_BYTES 256 // total amount of pmem space in bytes, including checksum
#define PMEM_SIZE_WORDS (PMEM_SIZE_BYTES / 4)
using namespace modems; using namespace modems;
using namespace serializer; using namespace serializer;