Merge branch 'master' of github.com:meshtastic/Meshtastic-device

src/mesh/NodeDB.cpp

@@ -440,7 +440,7 @@ uint32_t sinceLastSeen(const NodeInfo *n)
     return delta;
 }
 
-#define NUM_ONLINE_SECS (60 & 60 * 2) // 2 hrs to consider someone offline
+#define NUM_ONLINE_SECS (60 * 60 * 2) // 2 hrs to consider someone offline
 
 size_t NodeDB::getNumOnlineNodes()
 {

src/mesh/http/ContentHandler.cpp

@@ -798,7 +798,9 @@ void handleBlinkLED(HTTPRequest *req, HTTPResponse *res)
             count = count - 1;
         }
     } else {
+#ifndef NO_SCREEN        
         screen->blink();
+#endif        
     }
 
     Json jsonObjOuter = Json::object{{"status", "ok"}};

src/mesh/http/WebServer.cpp

@@ -152,10 +152,11 @@ void createSSLCert()
 
                     yield();
                     esp_task_wdt_reset();
-
+#ifndef NO_SCREEN
                     if (millis() / 1000 >= 3) {
                         screen->setSSLFrames();
                     }
+#endif                    
                 }
                 runLoop = false;
             } else {