Merge remote-tracking branch 'upstream/master'

Author: matth-x

platformio.ini

@@ -237,7 +237,7 @@ src_build_flags =
   ${common.src_build_flags}
   ${common.debug_flags}
   -D NEO_PIXEL_PIN=17
-  -D NEO_PIXEL_LENGTH=2
+  -D NEO_PIXEL_LENGTH=14
   -D WIFI_PIXEL_NUMBER=1
   -D WIFI_BUTTON=0
   -D WIFI_BUTTON_PRESSED_STATE=LOW

src/input.cpp

@@ -23,12 +23,6 @@
 
 #include "RapiSender.h"
 
-int espflash = 0;
-int espfree = 0;
-
-long current_scale = 0;
-long current_offset = 0;
-
 class InputTask : public MicroTasks::Task
 {
   private:

src/net_manager.cpp

@@ -61,7 +61,7 @@ static bool eth_connected = false;
 // Start Access Point
 // Access point is used for wifi network selection
 // -------------------------------------------------------------------
-void
+static void
 startAP() {
   DBUGLN("Starting AP");
 
@@ -105,7 +105,7 @@ startAP() {
 // -------------------------------------------------------------------
 // Start Client, attempt to connect to Wifi network
 // -------------------------------------------------------------------
-void
+static void
 startClient()
 {
   DEBUG.print("Connecting to SSID: ");

src/ohm.cpp

@@ -15,7 +15,7 @@
 #endif
 
 String ohm_hour = "NotConnected";
-int evse_sleep = 0;
+static int evse_sleep = 0;
 
 static MongooseHttpClient client;
 

tesla_login/package-lock.json

@@ -15,7 +15,7 @@
     "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.17.1",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "nodemon": "^2.0.7",
     "teslajs": "^4.9.8"
   },