Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-09-20 08:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

added m0 stats to dfu screen

Browse Source
This commit is contained in:
Bernd Herzog 2023-04-23 19:52:38 +02:00
parent 812f0f8211
commit 850a79c9bb
3 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
firmware/application/apps/ui_dfu_menu.cpp
View File

@ -26,20 +26,50 @@ namespace ui {
DfuMenu::DfuMenu(NavigationView& nav) : nav_ (nav) { DfuMenu::DfuMenu(NavigationView& nav) : nav_ (nav) {
add_children({ add_children({
&text_info, &text_head,
&progress, &labels,
&dummy, &text_info_line_1,
&text_info_line_2,
&text_info_line_3,
&text_info_line_4,
&text_info_line_5,
&text_info_line_6,
&text_info_line_7
}); });
} }
void DfuMenu::focus() {
dummy.focus();
}
void DfuMenu::paint(Painter& painter) { void DfuMenu::paint(Painter& painter) {
//update child values
// if (chThdSelf() == chSysGetIdleThread()) { chThdGetTicks(chThdSelf()) }
auto now = chTimeNow();
auto idle_ticks = chThdGetTicks(chSysGetIdleThread());
static systime_t last_time;
static systime_t last_last_time;
auto time_elapsed = now - last_time;
auto idle_elapsed = idle_ticks - last_last_time;
last_time = now;
last_last_time = idle_ticks;
text_info_line_1.set(to_string_dec_uint(chCoreStatus(), 6));
text_info_line_2.set(to_string_dec_uint((uint32_t)get_free_stack_space(), 6));
text_info_line_3.set(to_string_dec_uint((time_elapsed - idle_elapsed) / 10, 6));
text_info_line_4.set("M4 heap");
text_info_line_5.set("M4 stack");
text_info_line_6.set("M4 cpu");
text_info_line_7.set(to_string_dec_uint(chTimeNow()/1000, 6));
auto screen_size = portapack::display.screen_rect().size();
painter.fill_rectangle( painter.fill_rectangle(
{{50,50} , {50 , 50}}, {
ui::Color::blue() {6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT},
{screen_size.width() - 12 * CHARACTER_WIDTH, screen_size.height() - 6 * LINE_HEIGHT}
},
ui::Color::black()
); );
} }

38
firmware/application/apps/ui_dfu_menu.hpp
View File

@ -26,6 +26,11 @@
#include "ui_widget.hpp" #include "ui_widget.hpp"
#include "event_m0.hpp" #include "event_m0.hpp"
#include "debug.hpp"
#include "string_format.hpp"
#define LINE_HEIGHT 16
#define CHARACTER_WIDTH 8
namespace ui { namespace ui {
class NavigationView; class NavigationView;
@ -35,27 +40,34 @@ public:
DfuMenu(NavigationView& nav); DfuMenu(NavigationView& nav);
~DfuMenu() = default; ~DfuMenu() = default;
void focus() override;
void paint(Painter& painter) override; void paint(Painter& painter) override;
std::string title() const override { return "DFU Menu"; };
private: private:
NavigationView& nav_; NavigationView& nav_;
Text text_info { Text text_head {{ 6 * CHARACTER_WIDTH, 3 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, "DFU Menu"};
{ 10 * 8, 16 * 8, 10 * 8, 16 },
"Working..." Labels labels {
{ { 6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT }, "M0 heap:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH, 6 * LINE_HEIGHT }, "M0 stack:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH, 7 * LINE_HEIGHT }, "M0 cpu %:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH, 8 * LINE_HEIGHT }, "M4 heap:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH, 9 * LINE_HEIGHT }, "M4 stack:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH,10 * LINE_HEIGHT }, "M4 cpu %:", Color::light_grey() },
{ { 6 * CHARACTER_WIDTH,11 * LINE_HEIGHT }, "uptime:", Color::light_grey() }
}; };
ProgressBar progress { Text text_info_line_1 {{ 16 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
{ 2 * 8, 19 * 8, 26 * 8, 24 } Text text_info_line_2 {{ 16 * CHARACTER_WIDTH, 6 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
}; Text text_info_line_3 {{ 16 * CHARACTER_WIDTH, 7 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
Text text_info_line_4 {{ 16 * CHARACTER_WIDTH, 8 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
Text text_info_line_5 {{ 16 * CHARACTER_WIDTH, 9 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
Text text_info_line_6 {{ 16 * CHARACTER_WIDTH,10 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
Text text_info_line_7 {{ 16 * CHARACTER_WIDTH,11 * LINE_HEIGHT, 10 * CHARACTER_WIDTH, 1 * LINE_HEIGHT }, ""};
Button dummy { // ProgressBar progress {
{ 240, 0, 0, 0 }, // { 6 * CHARACTER_WIDTH, 5 * LINE_HEIGHT, 16 * CHARACTER_WIDTH, 24 }
"" // };
};
}; };
} /* namespace ui */ } /* namespace ui */

6
firmware/application/ui_navigation.cpp
View File

@ -761,7 +761,13 @@ void SystemView::toggle_overlay() {
} }
void SystemView::paint_overlay() { void SystemView::paint_overlay() {
static bool last_paint_state = false;
if (overlay_active){ if (overlay_active){
// paint background only every other second
if ((((chTimeNow()>>10) & 0x01) == 0x01) == last_paint_state)
return;
last_paint_state = !last_paint_state;
this->overlay.set_dirty(); this->overlay.set_dirty();
} }
} }