Merge branch 'develop' into feature/v7

# Conflicts:
#	docs

platformio/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (6, 1, "11a1")
+VERSION = (6, 1, "11a2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/home/rpc/handlers/project.py

@@ -37,9 +37,9 @@ class ProjectRPC(BaseRPCHandler):
             project_dir = init_kwargs["path"]
             init_kwargs["path"] = os.path.join(init_kwargs["path"], "platformio.ini")
         elif os.path.isfile(init_kwargs["path"]):
-            project_dir = get_project_dir()
-        else:
             project_dir = os.path.dirname(init_kwargs["path"])
+        else:
+            project_dir = get_project_dir()
         with fs.cd(project_dir):
             return getattr(ProjectConfig(**init_kwargs), method)(*args)
 

platformio/project/integration/tpls/vscode/.vscode/launch.json.tpl

@@ -17,7 +17,7 @@
 %    "name": "PIO Debug (skip Pre-Debug)",
 %    "executable": _escape_path(prog_path),
 %    "projectEnvName": env_name if forced_env_name else default_debug_env_name,
-%    "toolchainBinDir": _escape_path(os.path.dirname(gdb_path)),
+%    "toolchainBinDir": _escape_path(os.path.dirname(cc_path)),
 %    "internalConsoleOptions": "openOnSessionStart",
 %  }
 %