keyboard mejorado

bmorcelli · Nov 29, 2024 · dfcc2b7 · dfcc2b7
1 parent 6e37a48
commit dfcc2b7
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 23 deletions.
diff --git a/ports/CYD-2432S028/interface.cpp b/ports/CYD-2432S028/interface.cpp
@@ -363,7 +363,7 @@ String keyboard(String mytext, int maxSize, String msg) {
         tft.setTextSize(FM);
 
         //Draw the rectangles
-        if(y<0) {
+        if(y<0 || y2<0) {
             tft.fillRect(0,1,WIDTH,22,BGCOLOR);
             tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
             tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/lilygo-t-deck/platformio.ini b/ports/lilygo-t-deck/platformio.ini
@@ -22,6 +22,7 @@ build_flags =
 	-Iports/lilygo-t-deck
 	;-DCORE_DEBUG_LEVEL=5
 	-DBOARD_HAS_PSRAM=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DT_DECK=1
 	-DPIN_POWER_ON=10

diff --git a/ports/lilygo-t-display-s3-touch/interface.cpp b/ports/lilygo-t-display-s3-touch/interface.cpp
@@ -358,7 +358,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,~BGCOLOR);       // Ok Rectangle
         tft.drawRect(55,2,50,20,~BGCOLOR);      // CAP Rectangle

diff --git a/ports/lilygo-t-display-s3-touch/platformio.ini b/ports/lilygo-t-display-s3-touch/platformio.ini
@@ -21,6 +21,7 @@ build_flags =
 	-Iports/lilygo-t-display-s3-touch
 	;-DCORE_DEBUG_LEVEL=5
 	-DBOARD_HAS_PSRAM=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DT_DISPLAY_S3=1
 	-DREDRAW_DELAY=200

diff --git a/ports/lilygo-t-embed-cc1101/interface.cpp b/ports/lilygo-t-embed-cc1101/interface.cpp
@@ -314,7 +314,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/lilygo-t-embed-cc1101/platformio.ini b/ports/lilygo-t-embed-cc1101/platformio.ini
@@ -23,6 +23,7 @@ build_flags =
 	-Iports/lilygo-t-embed-cc1101
 	;-DCORE_DEBUG_LEVEL=5
 	-DBOARD_HAS_PSRAM=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DT_EMBED=1
 	-DPIN_POWER_ON=46
@@ -110,6 +111,7 @@ build_flags =
 	-Iports/lilygo-t-embed-cc1101
 	;-DCORE_DEBUG_LEVEL=5
 	-DBOARD_HAS_PSRAM=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DT_EMBED=1
 	-DT_EMBED_1101=1

diff --git a/ports/m5stack-cardputer/platformio.ini b/ports/m5stack-cardputer/platformio.ini
@@ -20,6 +20,7 @@ build_flags =
 	${env.build_flags}
 	-Iports/m5stack-cardputer
 	-DCORE_DEBUG_LEVEL=5
+	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DCARDPUTER=1
 	-DREDRAW_DELAY=200
 

diff --git a/ports/m5stack-core/interface.cpp b/ports/m5stack-core/interface.cpp
@@ -221,7 +221,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/m5stack-core2/interface.cpp b/ports/m5stack-core2/interface.cpp
@@ -310,7 +310,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/m5stack-cores3/interface.cpp b/ports/m5stack-cores3/interface.cpp
@@ -328,7 +328,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/m5stack-cores3/platformio.ini b/ports/m5stack-cores3/platformio.ini
@@ -23,6 +23,7 @@ build_flags =
 	-Iports/m5stack-cores3
 	;-DCORE_DEBUG_LEVEL=5
 	-DBOARD_HAS_PSRAM
+	-DARDUINO_USB_CDC_ON_BOOT=1
 
 	-DCORE3=1
 	-DREDRAW_DELAY=200

diff --git a/ports/m5stack-cplus1_1/interface.cpp b/ports/m5stack-cplus1_1/interface.cpp
@@ -183,7 +183,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/m5stack-cplus2/interface.cpp b/ports/m5stack-cplus2/interface.cpp
@@ -234,7 +234,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle

diff --git a/ports/marauder-mini/interface.cpp b/ports/marauder-mini/interface.cpp
@@ -235,7 +235,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,TFT_WHITE);       // Ok Rectangle
         tft.drawRect(55,2,50,20,TFT_WHITE);      // CAP Rectangle
@@ -244,24 +244,24 @@ String keyboard(String mytext, int maxSize, String msg) {
         tft.drawRect(3,32,WIDTH-3,20,FGCOLOR); // mystring Rectangle
 
 
-        if(x==0 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(7,2,50,20,TFT_WHITE); }
-        else tft.setTextColor(TFT_WHITE, BGCOLOR);
-        tft.drawString("OK", 18, 4);
+        if(x==0 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(7,2,24,20,TFT_WHITE); }
+        else tft.setTextColor(TFT_WHITE, BGCOLOR); 
+        tft.drawString("OK", 9, 4);
 
 
-        if(x==1 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(55,2,50,20,TFT_WHITE); }
-        else if(caps) { tft.fillRect(55,2,50,20,TFT_DARKGREY); tft.setTextColor(TFT_WHITE, TFT_DARKGREY); }
+        if(x==1 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(33,2,24,20,TFT_WHITE); }
+        else if(caps) { tft.fillRect(33,2,24,20,TFT_DARKGREY); tft.setTextColor(TFT_WHITE, TFT_DARKGREY); }
         else tft.setTextColor(TFT_WHITE, BGCOLOR);
-        tft.drawString("CAP", 64, 4);
+        tft.drawString("CAP", 35, 4);
 
 
-        if(x==2 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(107,2,50,20,TFT_WHITE); }
+        if(x==2 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(59,2,24,20,TFT_WHITE); }
         else tft.setTextColor(TFT_WHITE, BGCOLOR);
-        tft.drawString("DEL", 115, 4);
+        tft.drawString("DEL", 61, 4);
 
-        if(x>2 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(159,2,74,20,TFT_WHITE); }
+        if(x>2 && y==-1) { tft.setTextColor(BGCOLOR, TFT_WHITE); tft.fillRect(85,2,36,20,TFT_WHITE); }
         else tft.setTextColor(TFT_WHITE, BGCOLOR);
-        tft.drawString("SPACE", 168, 4);
+        tft.drawString("SPACE", 87, 4);
       }
 
       tft.setTextSize(FP);

diff --git a/ports/marauder-v4og/interface.cpp b/ports/marauder-v4og/interface.cpp
@@ -347,7 +347,7 @@ String keyboard(String mytext, int maxSize, String msg) {
       tft.setTextSize(FM);
 
       //Draw the rectangles
-      if(y<0) {
+      if(y<0 || y2<0) {
         tft.fillRect(0,1,WIDTH,22,BGCOLOR);
         tft.drawRect(7,2,46,20,~BGCOLOR);       // Ok Rectangle
         tft.drawRect(55,2,50,20,~BGCOLOR);      // CAP Rectangle

diff --git a/src/display.cpp b/src/display.cpp
@@ -484,8 +484,8 @@ void drawMainMenu(int index) {
 
     setTftDisplay(-1, -1, FGCOLOR, 1, BGCOLOR);
 
-#if WIDTH<200
-  tft.drawCentreString(messages[index], WIDTH / 2, 18, 1);
+#if WIDTH<125
+    tft.drawCentreString(messages[index], WIDTH / 2, 26, 1);
 #else
     tft.drawCentreString(messages[index], WIDTH / 2, HEIGHT - 25, 1);
 #endif
@@ -517,8 +517,10 @@ void drawBatteryStatus() {
     tft.drawRoundRect(WIDTH - 42, 7, 34, 17, 2, FGCOLOR);
     int bat = getBattery();
     tft.setTextSize(FONT_P);
-    tft.setTextColor(FGCOLOR, BGCOLOR);
+    tft.setTextColor(FGCOLOR, BGCOLOR); 
+  #if WIDTH>140 // Excludes Marauder Mini
     tft.drawRightString("  " + String(bat) + "%", WIDTH - 45, 12, 1);
+  #endif
     tft.fillRoundRect(WIDTH - 40, 9, 30, 13, 2, BGCOLOR);
     tft.fillRoundRect(WIDTH - 40, 9, 30 * bat / 100, 13, 2, FGCOLOR);
     tft.drawLine(WIDTH - 30, 9, WIDTH - 30, 9 + 13, BGCOLOR);