apio upload: Fixed a bug when uploading with iceprog

FPGAwars · Mar 17, 2024 · ceca262 · ceca262
1 parent e226a2e
commit ceca262
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -33,7 +33,7 @@
             "justMyCode": true,
             //-- Change to the folder with the example to test
             //-- Testing the Alhanbra-II board
-            "cwd": "${workspaceFolder}/test-examples/Alhambra-II/ledon"
+            "cwd": "${workspaceFolder}/test-examples/Alhambra-II/temp-ledon"
         },
         {
             "name": "Upload (TinyFPGA)",

diff --git a/apio/managers/scons.py b/apio/managers/scons.py
@@ -1011,14 +1011,14 @@ def _on_stderr(line: str):
         # -- Regular expression remainder:
         # -- \s --> Match one blank space
         # -- \d{2} one or two decimal digits
-        pattern_tinyprog = r"\s\d{2}%|█*\s+|\s"
+        pattern_tinyprog = r"\s\d{2}%\|█*\s+\|\s"
 
         # -- Calculate if there is a match
         match_tinyprog = re.search(pattern_tinyprog, line)
 
         # -- Math all the progress bar lines except the
         # -- initial one (when it is 0%)
-        if match_tinyprog and " 0%|" not in line:
+        if match_tinyprog: # and " 0%|" not in line:
             # -- Delete the previous line
             print(CURSOR_UP + ERASE_LINE, end="")
         # ------- tinyprog output processing END