Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-11-29 07:56:43 -05:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/application/apps/ble_tx_app.hpp
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)},