Merge pull request #361 from DanielR92/dev03

app.cpp make nicer readable and shorten if statements

tools/esp8266/.vscode/settings.json

@@ -0,0 +1,23 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    // identify that settings is loaded
+    "workbench.colorCustomizations": {
+        "editorLineNumber.foreground": "#00ff00"
+    },
+
+    "editor.wordWrap": "off",
+    "files.eol" : "\n",
+    "files.trimTrailingWhitespace" : true,
+
+    "diffEditor.ignoreTrimWhitespace": true,
+    "files.autoSave": "afterDelay",
+
+    "editor.tabSize": 4,
+    "editor.insertSpaces": true,
+    // `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.
+    // Set to false to keep the values you've explicitly set, above.
+    "editor.detectIndentation": false,
+
+    // https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+    "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0}",
+}

tools/esp8266/platformio.ini

@@ -69,7 +69,6 @@ platform = espressif32
 board = lolin_d32
 build_flags = -D RELEASE -std=gnu++14
 build_unflags = -std=gnu++11
-upload_port = /dev/cu.SLAB_USBtoUART
 monitor_filters =
 	;default   ; Remove typical terminal control codes from input
 	time      ; Add timestamp with milliseconds for each new line
@@ -81,7 +80,6 @@ board = lolin_d32
 build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial -std=gnu++14
 build_unflags = -std=gnu++11
 build_type = debug
-upload_port = /dev/cu.SLAB_USBtoUART
 monitor_filters =
 	;default   ; Remove typical terminal control codes from input
 	time      ; Add timestamp with milliseconds for each new line

tools/rpi/hoymiles/__main__.py

@@ -322,8 +322,10 @@ if __name__ == '__main__':
 
             print('', end='', flush=True)
 
-            if loop_interval > 0 and (time.time() - t_loop_start) < loop_interval:
-                time.sleep(loop_interval - (time.time() - t_loop_start))
+            time_to_sleep = loop_interval - (time.time() - t_loop_start)
+
+            if loop_interval > 0 and time_to_sleep > 0:
+                time.sleep(time_to_sleep) 
 
     except KeyboardInterrupt:
         sys.exit()