portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-08-23 16:09:05 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	firmware/application/Makefile
	firmware/application/core_control.cpp
	firmware/application/touch.cpp
	firmware/application/ui_debug.cpp
	firmware/application/ui_debug.hpp
	firmware/application/ui_navigation.cpp
	firmware/baseband/baseband_thread.cpp
This commit is contained in:
furrtek
2016-04-21 20:36:19 +02:00
parent ba94ce55ef e4b86d149c
commit 1b0da68d65
252 changed files with 10752 additions and 7183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui_debug.hpp
+9 -6
View File
@@ -36,8 +36,6 @@
#include <utility>
namespace ui {
char hexify(char in);
class DebugMemoryView : public View {
public:
@@ -51,12 +49,12 @@ private:
"Memory",
};
Text text_label_m0_free {
{ 0, 128, 104, 16 },
"M0 Free Bytes",
Text text_label_m0_core_free {
{ 0, 128, 144, 16 },
"M0 Core Free Bytes",
};
Text text_label_m0_free_value {
Text text_label_m0_core_free_value {
{ 200, 128, 40, 16 },
};
@@ -279,6 +277,11 @@ private:
};
};
class DebugPeripheralsMenuView : public MenuView {
public:
DebugPeripheralsMenuView(NavigationView& nav);
};
class DebugMenuView : public MenuView {
public:
DebugMenuView(NavigationView& nav);