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

resolve conflicts merge

Browse Source
This commit is contained in:
gullradriel
2025-11-07 21:36:41 +01:00
committed by GitHub
parent fd7637187a
commit 344aa0c741
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/apps/ble_rx_app.hpp
+7
View File
@@ -175,6 +175,13 @@ class BleRecentEntryDetailView : public View {
{7 * 8, UI_POS_Y(2), 23 * 8, UI_POS_HEIGHT(1)},
"-"};
Labels label_vendor{
{{0 * 8, 2 * 16}, "Vendor:", Theme::getInstance()->fg_light->foreground}};
Text text_vendor{
{7 * 8, 2 * 16, 23 * 8, 16},
"-"};
Labels labels{
{{UI_POS_X(0), UI_POS_Y(3)}, "Len", Theme::getInstance()->fg_light->foreground},
{{5 * 8, UI_POS_Y(3)}, "Type", Theme::getInstance()->fg_light->foreground},