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_tx_app.hpp
+1 -1
View File
@@ -293,7 +293,7 @@ class BLETxView : public View {
{{UI_POS_X(0), 9 * 16}, "Packet Data:", Theme::getInstance()->fg_light->foreground}};
TextViewer dataEditView{
{0, 9 * 18, 240, 240}};
{0, 9 * 18, screen_width, screen_height - 80}};
Button button_clear_marked{
{UI_POS_X(1), UI_POS_Y_BOTTOM(5), UI_POS_WIDTH(13), UI_POS_HEIGHT(1.5)},