From ad05c248813f33f14254b71b82ab2cbe0bdca578 Mon Sep 17 00:00:00 2001 From: pelgraine <140762863+pelgraine@users.noreply.github.com> Date: Tue, 30 Jun 2026 20:24:08 +1000 Subject: [PATCH] Minor footer fixes. Adjust key_cancel behaviour bug in main.cpp caused by swap from Q to sh+del --- examples/companion_radio/main.cpp | 4 ++-- examples/companion_radio/ui-new/AlarmScreen.h | 4 ++-- examples/companion_radio/ui-new/ChannelPickerScreen.h | 2 +- examples/companion_radio/ui-new/ChannelScreen.h | 4 ++-- examples/companion_radio/ui-new/ContactsScreen.h | 2 +- examples/companion_radio/ui-new/DiscoveryScreen.h | 2 +- variants/lilygo_tdeck_max/TDeckProMaxBoard.h | 2 +- variants/lilygo_tdeck_max/variant.h | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/companion_radio/main.cpp b/examples/companion_radio/main.cpp index 4e2bc97e..028f6164 100644 --- a/examples/companion_radio/main.cpp +++ b/examples/companion_radio/main.cpp @@ -4483,9 +4483,9 @@ void handleKeyboardInput() { return; } - if (key == '\b') { + if (key == '\b' || key == KEY_CANCEL) { // Backspace - check if shift was recently pressed for cancel combo - if (keyboard.wasShiftRecentlyPressed(500)) { + if (key == KEY_CANCEL) { // Shift+Backspace = Cancel (works anytime) Serial.println("Compose: Shift+Backspace, cancelling..."); bool wasDM = composeDM; diff --git a/examples/companion_radio/ui-new/AlarmScreen.h b/examples/companion_radio/ui-new/AlarmScreen.h index ee7bf30b..afc1dcd9 100644 --- a/examples/companion_radio/ui-new/AlarmScreen.h +++ b/examples/companion_radio/ui-new/AlarmScreen.h @@ -520,7 +520,7 @@ private: display.print(line2); } - drawFooter(display, "O:On/Off Enter:Edit", "Sh+Del:Back"); + drawFooter(display, "O:On/Off Enter:Edit", "Sh+Del:X"); } // ---- Render: Edit alarm ---- @@ -715,7 +715,7 @@ private: char countBuf[12]; snprintf(countBuf, sizeof(countBuf), "%d files", (int)_soundFiles.size()); - drawFooter(display, countBuf, "Enter:Pick Sh+Del:Back"); + drawFooter(display, countBuf, "Enter:Pick Sh+Del:X"); } // ---- Render: Ringing ---- diff --git a/examples/companion_radio/ui-new/ChannelPickerScreen.h b/examples/companion_radio/ui-new/ChannelPickerScreen.h index e638f456..d615e9bf 100644 --- a/examples/companion_radio/ui-new/ChannelPickerScreen.h +++ b/examples/companion_radio/ui-new/ChannelPickerScreen.h @@ -413,7 +413,7 @@ public: if (_confirmDelete) { display.print("Enter:Yes Sh+Del:Cancel"); } else { - display.print("W/S:Nav Sh+Del:Back"); + display.print("W/S:Nav Sh+Del:X"); const char* rt = "Ent:Open"; display.setCursor(display.width() - display.getTextWidth(rt) - 2, footerY); display.print(rt); diff --git a/examples/companion_radio/ui-new/ChannelScreen.h b/examples/companion_radio/ui-new/ChannelScreen.h index 69d2e973..6f890600 100644 --- a/examples/companion_radio/ui-new/ChannelScreen.h +++ b/examples/companion_radio/ui-new/ChannelScreen.h @@ -791,7 +791,7 @@ public: display.print(rtInbox); #else display.setCursor(0, footerY); - display.print("Sh+Del:Bck A/D:Ch"); + display.print("Sh+Del:Bck"); const char* rtInbox = "Ent:Open"; display.setCursor(display.width() - display.getTextWidth(rtInbox) - 2, footerY); display.print(rtInbox); @@ -1549,7 +1549,7 @@ public: display.setCursor(display.width() - display.getTextWidth(rightText) - 2, footerY); display.print(rightText); } else { - display.print("Sh+Del:Bck A/D:Ch R:Rply"); + display.print("Sh+Del:Bck R:Rply"); const char* rightText = "Ent:New"; display.setCursor(display.width() - display.getTextWidth(rightText) - 2, footerY); display.print(rightText); diff --git a/examples/companion_radio/ui-new/ContactsScreen.h b/examples/companion_radio/ui-new/ContactsScreen.h index bf4021c1..ab1da8ba 100644 --- a/examples/companion_radio/ui-new/ContactsScreen.h +++ b/examples/companion_radio/ui-new/ContactsScreen.h @@ -484,7 +484,7 @@ public: display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY); display.print(right); } else { - display.print("Sh+Del:Bk A/D:Filter"); + display.print("A/D:Filter"); const char* right = "P:Path Ent:Sel"; display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY); display.print(right); diff --git a/examples/companion_radio/ui-new/DiscoveryScreen.h b/examples/companion_radio/ui-new/DiscoveryScreen.h index 238719e7..a7f06e7a 100644 --- a/examples/companion_radio/ui-new/DiscoveryScreen.h +++ b/examples/companion_radio/ui-new/DiscoveryScreen.h @@ -203,7 +203,7 @@ public: display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY); display.print(right); #else - display.print("Sh+Del:Bk F:Rescan"); + display.print("Sh+Del:X F:Scan"); const char* right = "Tap/Ent:Add"; display.setCursor(display.width() - display.getTextWidth(right) - 2, footerY); diff --git a/variants/lilygo_tdeck_max/TDeckProMaxBoard.h b/variants/lilygo_tdeck_max/TDeckProMaxBoard.h index 9660aac7..02f71386 100644 --- a/variants/lilygo_tdeck_max/TDeckProMaxBoard.h +++ b/variants/lilygo_tdeck_max/TDeckProMaxBoard.h @@ -39,7 +39,7 @@ #define BQ27220_I2C_ADDR 0x55 #ifndef BQ27220_DESIGN_CAPACITY_MAH -#define BQ27220_DESIGN_CAPACITY_MAH 1400 +#define BQ27220_DESIGN_CAPACITY_MAH 2500 #endif class TDeckProMaxBoard : public ESP32Board { diff --git a/variants/lilygo_tdeck_max/variant.h b/variants/lilygo_tdeck_max/variant.h index 07149c09..20522716 100644 --- a/variants/lilygo_tdeck_max/variant.h +++ b/variants/lilygo_tdeck_max/variant.h @@ -239,8 +239,8 @@ #define BQ27220_I2C_ADDR 0x55 #define BQ27220_I2C_SDA I2C_SDA #define BQ27220_I2C_SCL I2C_SCL -#define BQ27220_DESIGN_CAPACITY 1400 // -#define BQ27220_DESIGN_CAPACITY_MAH 1400 // Alias used by TDeckBoard.h +#define BQ27220_DESIGN_CAPACITY 2500 // +#define BQ27220_DESIGN_CAPACITY_MAH 2500 // Alias used by TDeckBoard.h #define HAS_PPM 1 // This board uses the SY6970 charger @ 0x6A (newer revision -- confirmed by I2C