@libs-scripts-mep/grav-fw-pvi 3.1.0 → 4.0.1

package/README.md

@@ -4,6 +4,8 @@ Biblioteca que auxilia na gravação de microcontroladores por linha de comando
 
 ## Instalando
 
+>  ### ⚠️ Compatibilidade PVI:  [>=  v4.8.0.0](https://git.inova.ind.br/Inova/PVI/releases/tag/4.8.0.0-beta0)
+
 Abra o terminal, e na pasta do script, execute:
 
 ```

package/grav-fw-pvi.js

@@ -7,7 +7,7 @@ export default class GravaFW {
      * @param {String} dirFirm 
      * @param {String} dirOpt 
      * @param {Object} objArguments 
-     * @param {Number} timeOut 
+     * @param {Number} [timeOut=5000] 
      * @returns 
      * 
      * # Exemplos
@@ -33,6 +33,7 @@ export default class GravaFW {
             if (dirFirm != null && dirOpt != null) { validationMsg = `Verify OPTION BYTE succeeds` }
             else if (dirFirm != null) { validationMsg = `Verifying PROGRAM MEMORY succeeds` }
             else if (dirOpt != null) { validationMsg = `Verify OPTION BYTE succeeds` }
+            else { validationMsg = "error" }
 
             let ObjWriteSTM8 = await defineWriteSTM8(dirFirm, dirOpt, objArguments)
 
@@ -88,7 +89,7 @@ export default class GravaFW {
                 resolve({ success: false, msg: `Nenhum diretório de firmware ou option byte informado` })
             }
 
-            FWLink.runInstructionS("EXEC", [`C:/Program Files (x86)/STMicroelectronics/st_toolset/stvp/STVP_CmdLine.exe`, ObjWriteSTM8.commandLineArguments, "true", "true"])
+            FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETRESOURCESPATH", [])}\\stvp\\STVP_CmdLine.exe`, ObjWriteSTM8.commandLineArguments, "true", "true"])
 
         })
 
@@ -143,14 +144,13 @@ export default class GravaFW {
     /**
      * 
      * @param {String} dirProject 
-     * @param {Number} timeOut 
+     * @param {Number} [timeOut=5000] 
      * @returns 
      * 
      * # Exemplos
      * 
      * ```js
      * const programPath = "I:/script_repo/fw_repo/fw_v1_0.2.rpj"
-     * const optionPath = "I:/script_repo/fw_repo/opt.hex"
      * const writeFirmware = await GravaFW.Renesas(programPath)
      * ```
      * 
@@ -209,7 +209,7 @@ export default class GravaFW {
 
                 }, "sniffer.exec")
 
-                FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETPVIPATH", [])}/Resources/Renesas/RFPV3.Console.exe`, dirProject, "true", "true"])
+                FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETRESOURCESPATH", [])}/Renesas/RFPV3.Console.exe`, dirProject, "true", "true"])
 
                 let timeOutGravacao = setTimeout(() => {
 
@@ -225,48 +225,84 @@ export default class GravaFW {
         })
     }
 
+
     /**
-     * Realiza gravacao nos microcontroladores Nuvoton atraves do PVI, via JLink command line
+     * Realiza gravacao nos microcontroladores Nuvoton atraves do PVI, via JLink command line.
+     * 
      * @param {string} dirProject caminho do firmware
-     * @param {string} commandFile Arquivo de comandos JLink, pseudo-script de gravação
+     * @param {string} nameFile nome para o arquivo de comandos JLink que ficará na pasta 'C:/Temp/', sujestão: código effective
      * @param {string} device modelo do micrcontrolador
-     * @param {number} timeOut 
+     * @param {number} [speed=4000] velocidade de gravação
+     * @param {number} [timeOut=5000] tempo máximo de gravação
+     * @returns {Promise<{success: boolean, msg: string}>} - resultado da gravação
+     * 
+     * # Exemplos
+     * 
+     * ```js
+     * const programPath = "I:/script_repo/fw_repo/fw_v1_0.2.hex"
+     * const codigo_effective = "1234"
+     * const device = "STM32C031K6"
+     * const writeFirmware = await GravaFW.JLink_v7(programPath, codigo_effective, device)
+     * ```
+     * 
+     * # Retorno
+     * 
+     * ```js
+     * { success: Boolean, msg: String }
+     * ```
      */
-    static async JLink_v7(dirProject = null, commandFile = null, device, timeOut = 10000) {
+    static async JLink_v7(dirProject = null, nameFile, device, speed = 4000, timeOut = 5000) {
 
-        let logGravacao = ""
+        return new Promise((resolve) => {
+            let logGravacao = ""
 
-        const id = FWLink.PVIEventObserver.add((msg, param) => {
+            const id = FWLink.PVIEventObserver.add((msg, param) => {
 
-            console.log(`%cLog Program: ${param[0]}`, ' color: #B0E0E6')
-            logGravacao = logGravacao + param[0]
+                console.log(`%cLog Program: ${param[0]}`, ' color: #B0E0E6')
+                logGravacao = logGravacao + param[0]
 
-            if (data == "Script processing completed.") {
+                if (param == "Script processing completed.") {
 
-                FWLink.PVIEventObserver.remove(id)
+                    FWLink.PVIEventObserver.remove(id)
 
-                if (logGravacao.includes(`O.K.`)) {
+                    if (logGravacao.includes('Program & Verify speed')) {
 
-                    clearTimeout(timeOutGravacao)
-                    resolve({ success: true, msg: dirProject })
+                        clearTimeout(timeOutGravacao)
+                        resolve({ success: true, msg: dirProject })
 
-                } else if (logGravacao.includes(`Cannot connect to target.`)) {
+                    } else if (logGravacao.includes(`Cannot connect to target.`)) {
 
-                    clearTimeout(timeOutGravacao)
-                    resolve({ success: false, msg: `Cannot connect to target.` })
+                        clearTimeout(timeOutGravacao)
+                        resolve({ success: false, msg: `Cannot connect to target.` })
 
-                }
+                    }
 
-            }
-        }, "sniffer.exec")
+                }
+            }, "sniffer.exec")
 
-        FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETPVIPATH", [])}\\Plugins\\JLINK7\\JLink.exe`, `-device ${device} -CommandFile ${commandFile}`, "true", "true"])
+            const commandFile = commandJlink(nameFile, speed, dirProject)
+            FWLink.runInstructionS("EXEC", [`${FWLink.runInstructionS("GETPVIPATH", [])}\\Plugins\\JLINK7\\JLink.exe`, `-device ${device} -CommandFile ${commandFile}`, "true", "true"])
 
-        let timeOutGravacao = setTimeout(() => {
-            FWLink.PVIEventObserver.remove(id)
-            resolve({ success: false, msg: `Falha na gravação, verifique a conexão USB do gravador.` })
-        }, timeOut)
+            let timeOutGravacao = setTimeout(() => {
+                FWLink.PVIEventObserver.remove(id)
+                resolve({ success: false, msg: `Falha na gravação, verifique a conexão USB do gravador.` })
+            }, timeOut)
+        })
 
+        function commandJlink(nameFile, speed, dirProject) {
+            if (FWLink.runInstructionS("vfs.directoryexists", [`C:/Temp/`]) == '1') {
+                if (FWLink.runInstructionS("vfs.fileexists", [`C:/Temp/${nameFile}.txt`]) == '1') {
+                    FWLink.runInstructionS("EXEC", ["cmd.exe", `/c (echo si 1 & echo speed ${speed} & echo r & echo h & echo erase & echo loadfile ${dirProject} & echo exit) > C:/Temp/${nameFile}.txt`, true, true])
+                    return `C:/Temp/${nameFile}.txt`
+                } else {
+                    FWLink.runInstructionS("EXEC", ["cmd.exe", `/c (echo texto invalido) > C:/Temp/${nameFile}.txt`, true, true])
+                    return commandJlink(nameFile, speed, dirProject)
+                }
+            } else {
+                FWLink.runInstructionS("vfs.createdirectory", [`C:/Temp/`])
+                return commandJlink(nameFile, speed, dirProject)
+            }
+        }
     }
 
 
@@ -364,4 +400,6 @@ export default class GravaFW {
         })
     }
 
+    static { window.GravaFW = GravaFW }
+
 }

package/package.json

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