use customextravars first

Author: brianignacio5

.gitignore

@@ -10,7 +10,7 @@ testFiles/blink
 !testFiles/dist
 testFiles/tools
 testFiles/testWorkspace/build
-testFiles/testWorkspace/sdkconfig.*
+testFiles/testWorkspace/sdkconfig*
 *.log
 .DS_Store
 bandit_output.txt

src/eim/migrationTool.ts

@@ -27,6 +27,29 @@ import { pathExists } from "fs-extra";
 import { ESP } from "../config";
 import { getIdfMd5sum } from "./checkCurrentSettings";
 
+export async function useCustomExtraVarsAsIdfSetup(customExtraVars: { [key: string]: string }, workspaceFolder) {
+  if (customExtraVars["IDF_PATH"] && customExtraVars["IDF_TOOLS_PATH"] && customExtraVars["IDF_PYTHON_ENV_PATH"]) {
+    const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder);
+    const idfPathVersion = await getEspIdfFromCMake(customExtraVars["IDF_PATH"]);
+    const gitPath = readParameter("idf.gitPath", workspaceFolder);
+    const idfSetupId = getIdfMd5sum(customExtraVars["IDF_PATH"]);
+    const currentIdfSetup: IdfSetup = {
+      activationScript: "",
+      id: idfSetupId,
+      idfPath: customExtraVars["IDF_PATH"],
+      isValid: false,
+      gitPath: gitPath,
+      version: idfPathVersion,
+      toolsPath: customExtraVars["IDF_TOOLS_PATH"],
+      sysPythonPath: "",
+      python: pythonBinPath,
+    };
+    return currentIdfSetup;
+  } else {
+    return;
+  }
+}
+
 export async function useExistingSettingsToMakeNewConfig(workspaceFolder: Uri) {
   const espIdfPath = readParameter("idf.espIdfPath", workspaceFolder);
   const idfPathVersion = await getEspIdfFromCMake(espIdfPath);

src/versionSwitcher/index.ts

@@ -20,7 +20,10 @@ import { ConfigurationTarget, StatusBarItem, Uri, window } from "vscode";
 import { readParameter } from "../idfConfiguration";
 import { getIdfSetups } from "../eim/getExistingSetups";
 import { checkIdfSetup, saveSettings } from "../eim/verifySetup";
-import { useExistingSettingsToMakeNewConfig } from "../eim/migrationTool";
+import {
+  useCustomExtraVarsAsIdfSetup,
+  useExistingSettingsToMakeNewConfig,
+} from "../eim/migrationTool";
 
 export async function selectIdfSetup(
   workspaceFolder: Uri,
@@ -62,21 +65,24 @@ export async function getCurrentIdfSetup(
     "idf.customExtraVars",
     workspaceFolder
   ) as { [key: string]: string };
-  const idfSetups = await getIdfSetups();
+  const idfSetups = await getIdfSetups(logToChannel, false);
   let currentIdfSetup = idfSetups.find((idfSetup) => {
     idfSetup.idfPath === customExtraVars["IDF_PATH"] &&
       idfSetup.toolsPath === customExtraVars["IDF_TOOLS_PATH"];
   });
+  if (!currentIdfSetup) {
+    currentIdfSetup = await useCustomExtraVarsAsIdfSetup(
+      customExtraVars,
+      workspaceFolder
+    );
+  }
   if (!currentIdfSetup) {
     // Using implementation before EIM
     let currentIdfSetup = await useExistingSettingsToMakeNewConfig(
       workspaceFolder
     );
     return currentIdfSetup;
   }
-  currentIdfSetup.isValid = await checkIdfSetup(
-    currentIdfSetup,
-    logToChannel
-  );
+  currentIdfSetup.isValid = await checkIdfSetup(currentIdfSetup, logToChannel);
   return currentIdfSetup;
 }

testFiles/testWorkspace/main/hello_world_main.c

@@ -5,37 +5,14 @@
    CONDITIONS OF ANY KIND, either express or implied.
 */
 #include <stdio.h>
-#include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "esp_system.h"
-#include "esp_spi_flash.h"
 
 void app_main(void)
 {
-    printf("Hello world!\n");
-
-    /* Print chip information */
-    esp_chip_info_t chip_info;
-    esp_chip_info(&chip_info);
-    printf("This is %s chip with %d CPU core(s), WiFi%s%s, ",
-            CONFIG_IDF_TARGET,
-            chip_info.cores,
-            (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
-            (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
-
-    printf("silicon revision %d, ", chip_info.revision);
-
-    printf("%dMB %s flash\n", spi_flash_get_chip_size() / (1024 * 1024),
-            (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
-
-    printf("Minimum free heap size: %d bytes\n", esp_get_minimum_free_heap_size());
-
-    for (int i = 10; i >= 0; i--) {
-        printf("Restarting in %d seconds...\n", i);
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
+    int i = 0;
+    while(1) {
+        printf("Hello world!\n", i);
+        vTaskDelay(5000 / portTICK_PERIOD_MS);
     }
-    printf("Restarting now.\n");
-    fflush(stdout);
-    esp_restart();
 }