Skip to content

Commit 2a6e684

Browse files
committed
mod: substitute sys.stdout.write with print
1 parent 1c7b873 commit 2a6e684

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

arduino_alvik/arduino_alvik.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,17 @@ def _print_battery_status(percentage: float, is_charging) -> None:
107107
:param is_charging: True if the battery is charging
108108
:return:
109109
"""
110-
sys.stdout.write(bytes('\r'.encode('utf-8')))
110+
print("\033[2K\033[1G", end='\r')
111111
if percentage > 97:
112112
marks_str = ' \U0001F50B'
113113
else:
114114
marks_str = ' \U0001FAAB'
115-
charging_str = f' \U0001F50C' if is_charging else ' \U000026A0WARNING: battery is discharging!'
116-
word = marks_str + f" {percentage}%" + charging_str + " \t"
117-
sys.stdout.write(bytes((word.encode('utf-8'))))
115+
if is_charging:
116+
charging_str = ' \U0001F50C '
117+
else:
118+
charging_str = ' \U000026A0 WARNING: battery is discharging!'
119+
word = marks_str + f" {percentage}% {charging_str} \t"
120+
print(word, end='')
118121

119122
def _lenghty_op(self, iterations=10000000) -> int:
120123
result = 0
@@ -194,18 +197,14 @@ def _snake_robot(duration: int = 1000):
194197

195198
frame = ''
196199
for i in range(0, cycles):
197-
sys.stdout.write(bytes('\r'.encode('utf-8')))
200+
print("\033[2K\033[1G", end='\r')
198201
pre = ' ' * i
199202
between = ' ' * (i % 2 + 1)
200203
post = ' ' * 5
201204
frame = pre + snake + between + robot + post
202-
sys.stdout.write(bytes(frame.encode('utf-8')))
205+
print(frame, end='')
203206
sleep_ms(200)
204207

205-
sys.stdout.write(bytes('\r'.encode('utf-8')))
206-
clear_frame = ' ' * len(frame)
207-
sys.stdout.write(bytes(clear_frame.encode('utf-8')))
208-
209208
def begin(self) -> int:
210209
"""
211210
Begins all Alvik operations

arduino_alvik/stm32_flash.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os
2-
import sys
32
from time import sleep_ms
43
from machine import UART, Pin
54

@@ -322,8 +321,9 @@ def STM32_writeMEM(file_path: str, toggle: "Generator" = None):
322321
print(f"STM32 ERROR FLASHING PAGE: {writeAddress}")
323322
return
324323

325-
sys.stdout.write('\r')
326-
sys.stdout.write(f"{int((i/file_pages)*100)}%")
324+
percentage = int((i / file_pages) * 100)
325+
print("\033[2K\033[1G", end='\r')
326+
print(f"Flashing STM32: {percentage:>3}%", end='')
327327
i = i + 1
328328
_incrementAddress(writeAddress)
329329
if toggle is not None:

0 commit comments

Comments
 (0)