Skip to content

Commit

Permalink
-add time consuming message
Browse files Browse the repository at this point in the history
-remove serial port name SLAB_USBtoUART
add Bittle X in menu list of UI interface
  • Loading branch information
JasonWong08 committed Sep 26, 2023
1 parent dc2b4c5 commit 58e5c70
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pyUI/FirmwareUploader.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ def __init__(self,model,lan):
self.NybbleBiBoardModes = list(map(lambda x: txt(x), ['Standard']))
self.inv_txt = {v: k for k, v in language.items()}
self.initWidgets()
if self.strProduct.get() == 'Bittle X':
self.strBoardVersion.set(BiBoard_version_list[0])
board_version_list = BiBoard_version_list
else:
board_version_list = NyBoard_version_list + BiBoard_version_list
self.cbBoardVersion['values'] = board_version_list
self.updateMode()
self.setActiveOption()

Expand Down Expand Up @@ -614,7 +620,7 @@ def autoupload(self):

filename = [fnBootLoader, fnPartitions, fnBootApp, fnMainFunc]
print(filename)
self.strStatus.set(txt('Uploading') + txt('Main function') + '...' )
self.strStatus.set(txt('Uploading') + txt('Main function') + ', ' + txt('Time consuming') + '...' )
self.win.update()
if self.OSname == 'win32': # Windows
esptoolPath = resourcePath + 'esptoolWin/'
Expand Down
1 change: 1 addition & 0 deletions pyUI/commonVar.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
NaJoints = {
'Nybble': [3, 4, 5, 6, 7],
'Bittle': [1, 2, 3, 4, 5, 6, 7],
'Bittle X': [1, 2, 3, 4, 5, 6, 7],
'DoF16' : []
}
scaleNames = [
Expand Down
8 changes: 8 additions & 0 deletions pyUI/translate.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
'rbnCamera': 'Camera',
'Parameters':'Parameters',
'Main function':'Main function',
'Time consuming': 'it will take about 1 minute',
'btnFacReset':'Factory Reset',
'tipFacReset':''' After factory reset, you need to do joint calibration, please refer to:
https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -420,6 +421,7 @@
'RandomMind_Ultrasonic':'随机_超声波',
'Parameters':'参数',
'Main function':'主程序',
'Time consuming': '它将大概需要1分钟',
'btnFacReset':'恢复出厂设置',
'tipFacReset':''' 恢复出厂设置后,你需要重新校准关节舵机,请参考:
https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -650,6 +652,7 @@
'RandomMind_Ultrasonic':'随機_超聲波',
'Parameters':'參數',
'Main function':'主程序',
'Time consuming': '它將大概需要1分鐘',
'btnFacReset':'恢復出廠設置',
'tipFacReset':''' 恢復出廠設置後,你需要重新校準關節舵機,請參考:
https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -837,6 +840,7 @@
'rbnCamera': 'Kamera',
'Parameters':'Parameter',
'Main function':'Hauptfunktion',
'Time consuming': 'es dauert etwa 1 Minute',
'btnFacReset':'Werkseinstellungen zurückgesetzt',
'tipFacReset':''' Nach dem Zurücksetzen auf die Werkseinstellungen müssen Sie eine gemeinsame Kalibrierung durchführen.
Weitere Informationen finden Sie unter: https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -1072,6 +1076,7 @@
'rbnCamera': 'กล้อง',
'Parameters':'พารามิเตอร์',
'Main function':'ฟังก์ชั่นหลัก',
'Time consuming': 'จะใช้เวลาประมาณ 1 นาที',
'btnFacReset':'รีเซ็ตเป็นค่าเริ่มต้นจากโรงงาน',
'tipFacReset':''' หลังจากการรีเซ็ตเป็นค่าเริ่มต้นจากโรงงาน คุณต้องทำการปรับเทียบร่วม โปรดดูที่:
https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -1308,6 +1313,7 @@
'rbnCamera': 'Caméra',
'Parameters':'Paramètres',
'Main function':'Fonction principale',
'Time consuming': 'cela prendra environ 1 minute',
'btnFacReset':'Réinitialisation d\'usine',
'tipFacReset':''' Après la réinitialisation d'usine, vous devrez effectuer l'étalonnage des articulations. Veuillez vous référer à :
https://docs.petoi.com/joint-calibration ''',
Expand Down Expand Up @@ -1533,6 +1539,7 @@
'rbnCamera': 'カメラ',
'Parameters': 'パラメーター',
'Main function': 'メイン機能',
'Time consuming': '約1分かかります',
'btnFacReset': '工場出荷時設定に戻す',
'tipFacReset':'ファクトリーリセット後、関節のキャリブレーションを行う必要があります。詳細は次を参照してください:https://docs.petoi.com/joint-calibration',
'btnUpgrade':'ファームウェアのアップグレード',
Expand Down Expand Up @@ -1751,6 +1758,7 @@
'rbnCamera': 'Telecamera',
'Parameters':'Parametri',
'Main function':'Funzione principale',
'Time consuming': 'ci vorrà circa 1 minuto',
'btnFacReset':'Ripristino delle impostazioni di fabbrica',
'tipFacReset':''' Dopo il ripristino delle impostazioni di fabbrica,
è necessario eseguire la calibrazione del giunto, fare riferimento a:
Expand Down
2 changes: 2 additions & 0 deletions serialMaster/ardSerial.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@ def keepCheckingPort(portList, cond1=None, check=True, updateFunc = lambda:None)
for p in newPort:
logger.debug(f"Adding serial port: {p}")
portName = p.split('/')[-1]
if platform.system() == "Darwin" and "SLAB_USBtoUART" in portName:
continue
portStrList.insert(0, portName) # remove '/dev/' in the port name
tk.messagebox.showinfo(title=txt('Info'), message=txt('New port prompt') + portName)
updateFunc()
Expand Down

0 comments on commit 58e5c70

Please sign in to comment.