force Brace and Z550 make one line

2 years ago · ec83406628
3 changed files with 289 additions and 331 deletions
--- a/tools/esp8266/.vscode/settings.json
+++ b/tools/esp8266/.vscode/settings.json
@ -19,8 +19,5 @@
    "editor.detectIndentation": false,

    // https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-    "C_Cpp.vcFormat.newLine.closeBraceSameLine.emptyFunction": false,
-    "C_Cpp.vcFormat.newLine.beforeOpenBrace.block": "sameLine",
-    "C_Cpp.vcFormat.newLine.beforeOpenBrace.function": "sameLine",
-    "C_Cpp.vcFormat.newLine.beforeOpenBrace.lambda": "sameLine"
+    "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0}",
 }
--- a/tools/esp8266/app.cpp
+++ b/tools/esp8266/app.cpp
--- a/tools/esp8266/platformio.ini
+++ b/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