fixed icon in the webui, other headless fixes (pr3y#107)

Author: eadmaster

src/core/mykeyboard.cpp

@@ -55,8 +55,9 @@ bool checkSelPress(){
   #if defined (CARDPUTER)
     Keyboard.update();
     if(Keyboard.isKeyPressed(KEY_ENTER) || digitalRead(0)==LOW)
-  //#elif defined(NEW_DEVICE)
-
+  #elif ! defined(HAS_SCREEN)
+    // always return false
+    if(false)
   #else
     if(digitalRead(SEL_BTN)==LOW)
   #endif
@@ -131,9 +132,8 @@ int checkNumberShortcutPress() {
       }
     // else
     return -1;
-#endif
 }
-
+#endif
 
 /* Starts keyboard to type data */
 String keyboard(String mytext, int maxSize, String msg) {

src/core/serialcmds.cpp

@@ -86,7 +86,9 @@ void handleSerialCommands() {
 
   //log_d(cmd_str.c_str());
   cmd_str.trim();
-  //cmd_str.toLowerCase();  // case-insensitive matching  -> issue with filenames
+  // case-insensitive matching only without filename args -- TODO: better solution for this
+  if(cmd_str.indexOf("from_file ") == -1)
+    cmd_str.toLowerCase();
 
   processSerialCommand(cmd_str);
 }
@@ -100,6 +102,9 @@ bool processSerialCommand(String cmd_str) {
   }
 
   if(cmd_str.startsWith("ir") ) {
+    
+      gsetIrTxPin(false);
+      //if(IrTx==0) IrTx = LED;  // quickfix init issue? CARDPUTER is 44
 
     // ir tx <protocol> <address> <command>
     // <protocol>: NEC, NECext, NEC42, NEC42ext, Samsung32, RC6, RC5, RC5X, SIRC, SIRC15, SIRC20, Kaseikyo, RCA
@@ -124,7 +129,8 @@ bool processSerialCommand(String cmd_str) {
        sendRC6Command(address, command);
        return true;
       }
-    // TODO: more protocols: Samsung32, SIRC
+    //if(cmd_str.startsWith("ir tx sirc")){
+    //if(cmd_str.startsWith("ir tx samsung")){
 
     //if(cmd_str.startsWith("ir tx raw")){
 
@@ -144,7 +150,6 @@ bool processSerialCommand(String cmd_str) {
       // e.g. IRSend {"Protocol":"NEC","Bits":32,"Data":"0x20DF10EF"}
       // TODO: rewrite using ArduinoJson parser?
       // TODO: decode "data" into "address, command" and use existing "send*Command" funcs
-      if(IrTx==0) IrTx = LED;  // quickfix init issue? CARDPUTER is 44
 
       //IRsend irsend(IrTx);  //inverted = false
       //Serial.println(IrTx);
@@ -197,7 +202,9 @@ bool processSerialCommand(String cmd_str) {
   }  // end of ir commands
 
   if(cmd_str.startsWith("rf") || cmd_str.startsWith("subghz" )) {
-    if(RfTx==0) RfTx=GROVE_SDA; // quick fix
+    
+    gsetRfTxPin(false);
+    //if(RfTx==0) RfTx=GROVE_SDA; // quick fix
     pinMode(RfTx, OUTPUT);
     //Serial.println(RfTx);
 

src/modules/ir/TV-B-Gone.cpp

@@ -499,6 +499,8 @@ void otherIRcodes() {
     if(checkEscPress() || exit) break;
     delay(200);
   }
+  
+  returnToMenu=true;
 }  // end of otherIRcodes
 
 

src/modules/others/webInterface.cpp

@@ -130,10 +130,10 @@ String listFiles(FS fs, bool ishtml, String folder, bool isLittleFS) {
         returnText += "<td style=\"font-size: 10px; text-align=center;\">" + humanReadableSize(foundfile.size()) + "</td>\n";
         returnText += "<td><i class=\"gg-arrow-down-r\" onclick=\"downloadDeleteButton(\'"+ String(foundfile.path()) + "\', \'download\')\"></i>&nbsp&nbsp\n";
         //if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("bin")) returnText+= "<i class=\"gg-arrow-up-r\" onclick=\"startUpdate(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
-        if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("sub")) returnText+= "<i class=\"gg-arrow-up-r\" onclick=\"sendSubFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
-        if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("ir")) returnText+= "<i class=\"gg-arrow-up-r\" onclick=\"sendIrFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
+        if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("sub")) returnText+= "<i class=\"gg-data\" onclick=\"sendSubFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
+        if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("ir")) returnText+= "<i class=\"gg-data\" onclick=\"sendIrFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
         #if defined(USB_as_HID)
-          if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("txt")) returnText+= "<i class=\"gg-arrow-up-r\" onclick=\"sendBadusbFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
+          if (String(foundfile.name()).substring(String(foundfile.name()).lastIndexOf('.') + 1).equalsIgnoreCase("txt")) returnText+= "<i class=\"gg-data\" onclick=\"sendBadusbFile(\'" + String(foundfile.path()) + "\')\"></i>&nbsp&nbsp\n";
         #endif
         returnText += "<i class=\"gg-rename\"  onclick=\"renameFile(\'" + String(foundfile.path()) + "\', \'" + String(foundfile.name()) + "\')\"></i>&nbsp&nbsp\n";
         returnText += "<i class=\"gg-trash\"  onclick=\"downloadDeleteButton(\'" + String(foundfile.path()) + "\', \'delete\')\"></i></td></tr>\n\n";
@@ -255,6 +255,22 @@ void configureWebServer() {
   // Index page
   server->on("/", HTTP_GET, []() {
     if (checkUserWebAuth()) {
+      // WIP: custom webui page serving
+      /*
+      FS* fs = NULL;
+      File custom_index_html_file = NONE;
+      if(SD.exists("/webui.html")) fs = &SD;
+      if(LittleFS.exists("/webui.html")) fs = &LittleFS;
+      if(fs) {
+        // try to read the custom page and serve that
+        File custom_index_html_file =  fs->open("/webui.html", FILE_READ);
+        if(custom_index_html_file) {
+          // read the whole file
+          //server->send(200, "text/html", processor(custom_index_html));
+        }
+      }
+      */
+      // just serve the hardcoded page
       server->send(200, "text/html", processor(index_html));
     } else {
       server->requestAuthentication();

src/modules/others/webInterface.h

@@ -27,6 +27,7 @@ const char index_html[] PROGMEM = R"rawliteral(
   <meta charset="UTF-8">
 
   <!-- CSS sample thanks to @im.nix (Discord) -->
+  <!-- MEMO: more icons available here https://css.gg/app  -->
   <style>
     .gg-rename {
       box-sizing: border-box;
@@ -136,16 +137,42 @@ const char index_html[] PROGMEM = R"rawliteral(
         top: -7px;
         left: -2px
     }
-    .gg-arrow-up-r {
-        box-sizing: border-box;
-        position: relative;
-        display: inline-block;
-        width: 22px;
-        height: 22px;
-        border: 2px solid;
-        transform: scale(var(--ggs,1));
-        cursor: pointer;
-        border-radius: 4px
+    .gg-data {
+      transform: scale(var(--ggs,1))
+    }
+    .gg-data,
+    .gg-data::after,
+    .gg-data::before {
+      box-sizing: border-box;
+      position: relative;
+      display: block;
+      border: 2px solid;
+      border-radius: 50%;
+      width: 14px;
+      height: 14px
+    }
+    .gg-data::after,
+    .gg-data::before {
+      content: "";
+      position: absolute;
+      width: 6px;
+      height: 6px;
+      top: 2px;
+      left: 2px
+    }
+    .gg-data::after {
+      background: linear-gradient( to left,
+          currentColor 8px,transparent 0)
+          no-repeat bottom center/2px 8px;
+      width: 22px;
+      height: 22px;
+      top: -6px;
+      left: -6px
+    }
+    .gg-data,
+    .gg-data::after {
+      border-top-color: transparent;
+      border-bottom-color: transparent
     }
     .gg-arrow-down-r {
         box-sizing: border-box;

src/modules/rf/rf.cpp

@@ -688,6 +688,7 @@ void otherRFcodes() {
   if(filepath=="") return;  //  cancelled
   // else
   txSubFile(fs, filepath);
+  returnToMenu=true;
 }