@libs-scripts-mep/grav-fw-pvi 4.0.3 → 4.1.0

package/compat.py

@@ -0,0 +1,66 @@
+import subprocess
+import sys
+import os
+from importlib.metadata import version as get_version, PackageNotFoundError
+
+
+# Detecta se há um ambiente virtual na pasta atual
+def detect_venv_python():
+    venv_path = os.path.join(os.getcwd(), ".venv", "Scripts", "python.exe")
+    if os.path.exists(venv_path):
+        return venv_path
+    return sys.executable  # Fallback para o Python atual (global ou outro venv)
+
+
+PYTHON_EXEC = detect_venv_python()
+
+
+def get_installed_version(package):
+    try:
+        return get_version(package)
+    except PackageNotFoundError as e:
+        print(e)
+        return None
+
+
+def uninstall_package(package):
+    try:
+        print(f"[ESP DEP]Uninstalling {package}...")
+        subprocess.check_call([PYTHON_EXEC, "-m", "pip", "uninstall", "-y", package])
+    except subprocess.CalledProcessError as e:
+        print(f"[ESP DEP]Failed to uninstall {package}. Error: {e}")
+
+
+def install_package(package, version):
+    try:
+        print(f"[ESP DEP]Installing {package} version {version}...")
+        subprocess.check_call([PYTHON_EXEC, "-m", "pip", "install", f"{package}=={version}"])
+    except subprocess.CalledProcessError as e:
+        print(f"[ESP DEP]Failed to install {package} version {version}. Error: {e}")
+
+
+def check_and_fix_package(package, module, expected_version):
+    installed_version = get_installed_version(package)
+
+    if installed_version:
+        print(f"[ESP DEP]{package} is installed with version {installed_version}.")
+        if installed_version != expected_version:
+            print(f"[ESP DEP]Version mismatch! Expected: {expected_version}, Installed: {installed_version}.")
+            uninstall_package(package)
+            install_package(package, expected_version)
+        else:
+            print(f"[ESP DEP]{package} is already at the expected version ({expected_version}).")
+    else:
+        print(f"[ESP DEP]{package} is not installed.")
+        install_package(package, expected_version)
+
+
+packages = {
+    "esptool": ("esptool", "4.10")
+}
+
+# Check and fix packages
+for package, (module, expected_version) in packages.items():
+    check_and_fix_package(package, module, expected_version)
+
+print("[ESP DEP]Package version check and update completed.")

package/grav-fw-pvi.js

@@ -1,7 +1,10 @@
 import FWLink from "../daq-fwlink/FWLink.js"
+import Log from "../script-loader/utils-script.js"
 
 export default class GravaFW {
 
+    static progress
+
     /**
      * 
      * @param {String} dirFirm 
@@ -45,6 +48,7 @@ export default class GravaFW {
 
                     console.log(`%cLog Program: ${param[0]}`, ' color: #B0E0E6')
                     logGravacao = logGravacao + param[0]
+                    this.progress = param[0]
 
                     if (param[0] != undefined) {
 
@@ -89,7 +93,7 @@ export default class GravaFW {
                 resolve({ success: false, msg: `Nenhum diretório de firmware ou option byte informado` })
             }
 
-            FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETRESOURCESPATH", [])}\\stvp\\STVP_CmdLine.exe`, ObjWriteSTM8.commandLineArguments, "true", "true"])
+            FWLink.runInstructionS("EXEC", [`I:/Teste_Producao/Resources/stvp/STVP_CmdLine.exe`, ObjWriteSTM8.commandLineArguments, "true", "true"])
 
         })
 
@@ -172,6 +176,7 @@ export default class GravaFW {
 
                     console.log(`%cLog Program: ${param[0]}`, ' color: #B0E0E6')
                     logGravacao = logGravacao + param[0]
+                    this.progress = param[0]
 
                     if (param[0] != undefined) {
 
@@ -209,7 +214,7 @@ export default class GravaFW {
 
                 }, "sniffer.exec")
 
-                FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETRESOURCESPATH", [])}/Renesas/RFPV3.Console.exe`, dirProject, "true", "true"])
+                FWLink.runInstructionS("EXEC", [`I:/Teste_Producao/Resources/Renesas/RFPV3.Console.exe`, dirProject, "true", "true"])
 
                 let timeOutGravacao = setTimeout(() => {
 
@@ -263,6 +268,7 @@ export default class GravaFW {
 
                 console.log(`%cLog Program: ${param[0]}`, ' color: #B0E0E6')
                 logGravacao = logGravacao + param[0]
+                this.progress = param[0]
 
                 if (param == "Script processing completed.") {
 
@@ -284,7 +290,7 @@ export default class GravaFW {
             }, "sniffer.exec")
 
             const commandFile = commandJlink(nameFile, speed, dirProject)
-            FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETPVIPATH", [])}\\Plugins\\JLINK7\\JLink.exe`, `-device ${device} -CommandFile ${commandFile}`, "true", "true"])
+            FWLink.runInstructionS("EXEC", [`I:/Teste_Producao/Resources/JLink7/JLink.exe`, `-device ${device} -CommandFile ${commandFile}`, "true", "true"])
 
             let timeOutGravacao = setTimeout(() => {
                 FWLink.PVIEventObserver.remove(id)
@@ -329,9 +335,10 @@ export default class GravaFW {
      * { success: Boolean, msg: String }
      * ```
      */
-    static async ESP32(sessionStorageTag, AddressFilePath, isBatFile, betweenMsgTimeout) {
+    static async ESP32(sessionStorageTag, AddressFilePath, isBatFile, betweenMsgTimeout = 10000, chip = "esp32") {
 
-        return new Promise((resolve) => {
+        return new Promise(async (resolve) => {
+            await this.checkDependenciesPython()
 
             if (!AddressFilePath) {
                 resolve({ success: false, msg: "Caminho de arquivo para gravação não especificado", AddressFilePath: AddressFilePath }); return
@@ -362,16 +369,15 @@ export default class GravaFW {
                 } else if (info.includes("Serial port")) {
                     const splittedInfo = info.split(" ")
                     tryingPorts.push(splittedInfo[2])
-                    UI.setMsg(`Tentando gravar na porta ${splittedInfo[2]}`)
 
-                } else if (info.includes("failed to connect")) {
+                } else if (info.includes("Failed to connect")) {
                     if (tryingPorts.length >= portsFound) {
                         FWLink.PVIEventObserver.remove(id)
                         resolve({ success: false, msg: "Gravador não conseguiu se conectar com o ESP32", AddressFilePath: AddressFilePath }); return
                     }
 
                 } else if (info.includes("%")) {
-                    UI.setMsg(info)
+                    this.progress = info
 
                 } else if (info.includes("Hard resetting via RTS pin...")) {
                     sessionStorage.getItem(sessionStorageTag) == null ? sessionStorage.setItem(sessionStorageTag, tryingPorts.pop()) : null
@@ -384,25 +390,55 @@ export default class GravaFW {
 
             console.log("writeFirmware ID", id)
 
-            let pythonPath = "C:/esp-idf/Python/python.exe"
-            let espToolPath = "C:/esp-idf/components/esptool_py/esptool/esptool.py"
             let port = ""
 
             sessionStorage.getItem(sessionStorageTag) != null ? port = `-p${sessionStorage.getItem(sessionStorageTag)}` : null
 
-            const args = `${espToolPath} ${port} -b 480600 --before default_reset --after hard_reset --chip esp32  write_flash --flash_mode dio --flash_size detect --flash_freq 40m ${AddressFilePath}`
+            const args = `${port} -b 480600 --before default_reset --after hard_reset --chip esp32  write_flash --flash_mode dio --flash_size detect --flash_freq 40m ${AddressFilePath}`
 
             if (isBatFile) {
                 console.log(`Executando batch: ${AddressFilePath} args: ${port}`)
                 FWLink.runInstructionS("EXEC", [AddressFilePath, port, "true", "true", "true"])
             } else {
-                console.log(`Executando python: ${pythonPath} args: ${args}`)
-                FWLink.runInstructionS("EXEC", [pythonPath, args, "true", "true", "true"])
+                console.log(`Executando esptoll, args: ${args}`)
+                FWLink.runInstructionS("EXEC", ["esptool", args, "true", "true", "true"])
             }
 
         })
     }
 
+    static getScriptPath() {
+        const pathC = location.pathname.slice(location.pathname.indexOf("C:/"), location.pathname.lastIndexOf("/"))
+        const pathI = location.pathname.slice(location.pathname.indexOf("I:/"), location.pathname.lastIndexOf("/"))
+
+        if (pathC.length > 0) {
+            return pathC
+        } else if (pathI.length > 0) {
+            return pathI
+        }
+    }
+
+    static async checkDependenciesPython(pyFilePath = this.getScriptPath() + '/node_modules/@libs-scripts-mep/grav-fw-pvi/compat.py') {
+        return new Promise((resolve) => {
+            const id = FWLink.PVIEventObserver.add((message, params) => {
+                const msg = params?.[0]
+
+                if (msg.includes("[ESP DEP]")) { Log.warn(msg, Log.Colors.Brown.SandyBrown) }
+
+                if (msg.includes("[ESP DEP]") && msg.includes("Package version check and update completed.")) {
+                    FWLink.PVIEventObserver.remove(id)
+                    Log.console("ESP: Dependências instaladas com sucesso.", Log.Colors.Green.SpringGreen)
+                    resolve({ success: true, msg: msg, })
+                }
+
+            }, "PVI.Sniffer.sniffer.PID_")
+
+            setTimeout(() => {
+                FWLink.runInstructionS("EXEC", ["Python", pyFilePath, "true", "true"])
+            }, 300)
+        })
+    }
+
     static { window.GravaFW = GravaFW }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libs-scripts-mep/grav-fw-pvi",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "description": "Auxilia na gravação de microcontroladores por linha de comando através do PVI",
   "main": "grav-fw-pvi.js",
   "scripts": {