adam/Meck
1
0
Fork 0
mirror of https://github.com/pelgraine/Meck.git synced 2026-08-08 01:32:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor footer fixes. Adjust key_cancel behaviour bug in main.cpp caused by swap from Q to sh+del

Browse Source
This commit is contained in:
pelgraine
2026-06-30 20:24:08 +10:00
parent 444631e08b
commit ad05c24881
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/main.cpp
+2 -2
View File
@@ -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;
examples/companion_radio/ui-new/AlarmScreen.h
+2 -2
View File
@@ -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 ----
examples/companion_radio/ui-new/ChannelPickerScreen.h
+1 -1
View File
@@ -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);
examples/companion_radio/ui-new/ChannelScreen.h
+2 -2
View File
@@ -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);
examples/companion_radio/ui-new/ContactsScreen.h
+1 -1
View File
@@ -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);
examples/companion_radio/ui-new/DiscoveryScreen.h
+1 -1
View File
@@ -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);
variants/lilygo_tdeck_max/TDeckProMaxBoard.h
+1 -1
View File
@@ -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 {
variants/lilygo_tdeck_max/variant.h
+2 -2
View File
@@ -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