Merge branch 'dev' into portduino

# Conflicts: # .vscode/settings.json
2021-03-15 12:09:07 +08:00
parent da03490310 27c35f69aa
commit 3f401e8cac
116 changed files with 5000 additions and 1496 deletions
@@ -69,5 +69,13 @@
        "wifi"
    ],
    "C_Cpp.dimInactiveRegions": true,
-    "cmake.configureOnOpen": true
+    "cmake.configureOnOpen": true,
+    "protoc": {
+        "compile_on_save": false,
+        "compile_all_path": "/home/kevinh/development/meshtastic/meshtastic-esp32/proto",
+        "options": [
+            "--java_out=/tmp",
+            "-I=/home/kevinh/development/meshtastic/meshtastic-esp32/proto"
+        ]
+    }    
 }