Skip to content

Commit 7794a0c

Browse files
wangWkingwangWking
committed
renamed risc-v to riscv
1 parent e1dd7f8 commit 7794a0c

10 files changed

+38
-38
lines changed

libraries/offset/myCobot 280 for RISC V_color.txt renamed to libraries/offset/myCobot 280 for RISCV_color.txt

File renamed without changes.

libraries/offset/myCobot 280 for RISC V_encode.txt renamed to libraries/offset/myCobot 280 for RISCV_encode.txt

File renamed without changes.

libraries/offset/myCobot 280 for RISC V_feature.txt renamed to libraries/offset/myCobot 280 for RISCV_feature.txt

File renamed without changes.

libraries/offset/myCobot 280 for RISC V_shape.txt renamed to libraries/offset/myCobot 280 for RISCV_shape.txt

File renamed without changes.

libraries/offset/myCobot 280 for RISC V_yolov5.txt renamed to libraries/offset/myCobot 280 for RISCV_yolov5.txt

File renamed without changes.

‎libraries/pyqtFile/AiKit_auto.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ def retranslateUi(self, AiKit_UI):
938938
self.comboBox_device.setItemText(0, _translate("AiKit_UI", "myCobot 280 for Pi"))
939939
self.comboBox_device.setItemText(1, _translate("AiKit_UI", "myCobot 280 for JN"))
940940
self.comboBox_device.setItemText(2, _translate("AiKit_UI", "myCobot 280 for M5"))
941-
self.comboBox_device.setItemText(3, _translate("AiKit_UI", "myCobot 280 for RISC V"))
941+
self.comboBox_device.setItemText(3, _translate("AiKit_UI", "myCobot 280 for RISCV"))
942942
self.comboBox_device.setItemText(4, _translate("AiKit_UI", "myPalletizer 260 for M5"))
943943
self.comboBox_device.setItemText(5, _translate("AiKit_UI", "mechArm 270 for Pi"))
944944
self.comboBox_device.setItemText(6, _translate("AiKit_UI", "ultraArm P340"))

‎libraries/pyqtFile/AiKit_auto.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ border-style: outset;</string>
492492
</item>
493493
<item>
494494
<property name="text">
495-
<string>myCobot 280 for RISC V</string>
495+
<string>myCobot 280 for RISCV</string>
496496
</property>
497497
</item>
498498
<item>

main-risc-v-opencv4.10.py renamed to main-riscv-opencv4.10.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def _init_variable(self):
100100
self.M5 = ['myPalletizer 260 for M5', 'myCobot 280 for M5', 'ultraArm P340', 'mechArm 270 for M5'] # M5 robot
101101
self.Pi = ['myCobot 280 for Pi', 'mechArm 270 for Pi', 'myCobot 280 for JN',
102102
'myPalletizer 260 for Pi'] # Pi robot
103-
self.RISC_V = ['myCobot 280 for RISC V']
103+
self.RISCV = ['myCobot 280 for RISCV']
104104

105105
# angles to move
106106
self.move_angles = [
@@ -426,7 +426,7 @@ def buad_choose(self):
426426
# self.comboBox_buad.clear()
427427
# self.comboBox_buad.addItem('1000000')
428428
self.comboBox_buad.setCurrentIndex(0)
429-
elif value in self.RISC_V:
429+
elif value in self.RISCV:
430430
self.comboBox_buad.setCurrentIndex(0)
431431
else:
432432
# self.comboBox_buad.clear()
@@ -441,7 +441,7 @@ def buad_choose(self):
441441
else:
442442
self.widget_11.show()
443443
self.widget_20.show()
444-
if value in ['myCobot 280 for RISC V']:
444+
if value in ['myCobot 280 for RISCV']:
445445
self.camera_edit.setText('20')
446446
else:
447447
self.camera_edit.setText('0')
@@ -452,7 +452,7 @@ def buad_choose(self):
452452
def device_coord(self):
453453
"""Get points according to the device"""
454454
value = self.comboBox_device.currentText()
455-
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
455+
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
456456
# yolov5 model file path
457457
self.modelWeights = libraries_path + "/yolov5File/yolov5s.onnx"
458458
# y-axis offset
@@ -1848,7 +1848,7 @@ def decide_move(self, x, y, color):
18481848
elif device == 'ultraArm P340':
18491849
_moved = threading.Thread(target=self.moved(x + 50, y + 60))
18501850
_moved.start()
1851-
elif device == 'myCobot 280 for RISC V':
1851+
elif device == 'myCobot 280 for RISCV':
18521852
_moved = threading.Thread(target=self.moved(x - 5, y + 145))
18531853
_moved.start()
18541854
else:
@@ -1946,7 +1946,7 @@ def moved(self, x, y):
19461946
[self.home_coords[0] + x, self.home_coords[1] - y, self.camera_z, 0], 50)
19471947
time.sleep(3)
19481948

1949-
elif device == 'myCobot 280 for RISC V':
1949+
elif device == 'myCobot 280 for RISCV':
19501950
self.myCobot.send_coords(
19511951
[self.home_coords[0] + x, self.home_coords[1] + y, self.camera_z, 178.99, -3.78,
19521952
-62.9], 25, 1)
@@ -1990,7 +1990,7 @@ def moved(self, x, y):
19901990
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
19911991
time.sleep(2)
19921992

1993-
elif device in ['myCobot 280 for RISC V']:
1993+
elif device in ['myCobot 280 for RISCV']:
19941994
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
19951995
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
19961996

@@ -2023,7 +2023,7 @@ def moved(self, x, y):
20232023
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
20242024
time.sleep(2)
20252025

2026-
elif device in ['myCobot 280 for RISC V']:
2026+
elif device in ['myCobot 280 for RISCV']:
20272027
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
20282028
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
20292029

@@ -2056,7 +2056,7 @@ def moved(self, x, y):
20562056
# self.stop_wait(3)
20572057
self.check_position([tmp[0], 5.39, -83.49, -10.37, -0.08, tmp[5]], 0)
20582058

2059-
elif device in ['myCobot 280 for RISC V']:
2059+
elif device in ['myCobot 280 for RISCV']:
20602060
self.myCobot.send_angles([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 25)
20612061
self.check_position([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 0)
20622062

@@ -2081,7 +2081,7 @@ def moved(self, x, y):
20812081
self.myCobot.set_coords(self.move_coords[color], 40)
20822082
self.stop_wait(4)
20832083

2084-
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
2084+
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
20852085
self.myCobot.send_angles(self.new_move_coords_to_angles[color], 25)
20862086
self.check_position(self.new_move_coords_to_angles[color], 0)
20872087
else:
@@ -2117,7 +2117,7 @@ def pump_on(self):
21172117
else:
21182118
self.myCobot.set_basic_output(5, 0)
21192119
time.sleep(0.05)
2120-
elif self.comboBox_device.currentText() in self.RISC_V:
2120+
elif self.comboBox_device.currentText() in self.RISCV:
21212121
from gpiozero.pins.lgpio import LGPIOFactory
21222122
from gpiozero import Device, LED
21232123
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0
@@ -2154,7 +2154,7 @@ def pump_off(self):
21542154
time.sleep(1)
21552155
self.myCobot.set_basic_output(2, 1)
21562156
time.sleep(0.05)
2157-
elif self.comboBox_device.currentText() in self.RISC_V:
2157+
elif self.comboBox_device.currentText() in self.RISCV:
21582158
from gpiozero.pins.lgpio import LGPIOFactory
21592159
from gpiozero import Device, LED
21602160
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0

main-risc-v-opencv4.6.py renamed to main-riscv-opencv4.6.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def _init_variable(self):
100100
self.M5 = ['myPalletizer 260 for M5', 'myCobot 280 for M5', 'ultraArm P340', 'mechArm 270 for M5'] # M5 robot
101101
self.Pi = ['myCobot 280 for Pi', 'mechArm 270 for Pi', 'myCobot 280 for JN',
102102
'myPalletizer 260 for Pi'] # Pi robot
103-
self.RISC_V = ['myCobot 280 for RISC V']
103+
self.RISCV = ['myCobot 280 for RISCV']
104104

105105
# angles to move
106106
self.move_angles = [
@@ -423,7 +423,7 @@ def buad_choose(self):
423423
# self.comboBox_buad.clear()
424424
# self.comboBox_buad.addItem('1000000')
425425
self.comboBox_buad.setCurrentIndex(0)
426-
elif value in self.RISC_V:
426+
elif value in self.RISCV:
427427
self.comboBox_buad.setCurrentIndex(0)
428428
else:
429429
# self.comboBox_buad.clear()
@@ -438,7 +438,7 @@ def buad_choose(self):
438438
else:
439439
self.widget_11.show()
440440
self.widget_20.show()
441-
if value in ['myCobot 280 for RISC V']:
441+
if value in ['myCobot 280 for RISCV']:
442442
self.camera_edit.setText('20')
443443
else:
444444
self.camera_edit.setText('0')
@@ -450,7 +450,7 @@ def buad_choose(self):
450450
def device_coord(self):
451451
"""Get points according to the device"""
452452
value = self.comboBox_device.currentText()
453-
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
453+
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
454454
# yolov5 model file path
455455
self.modelWeights = libraries_path + "/yolov5File/yolov5s.onnx"
456456
# y-axis offset
@@ -1824,7 +1824,7 @@ def decide_move(self, x, y, color):
18241824
elif device == 'ultraArm P340':
18251825
_moved = threading.Thread(target=self.moved(x + 50, y + 60))
18261826
_moved.start()
1827-
elif device == 'myCobot 280 for RISC V':
1827+
elif device == 'myCobot 280 for RISCV':
18281828
_moved = threading.Thread(target=self.moved(x - 5, y + 145))
18291829
_moved.start()
18301830
else:
@@ -1922,7 +1922,7 @@ def moved(self, x, y):
19221922
[self.home_coords[0] + x, self.home_coords[1] - y, self.camera_z, 0], 50)
19231923
time.sleep(3)
19241924

1925-
elif device == 'myCobot 280 for RISC V':
1925+
elif device == 'myCobot 280 for RISCV':
19261926
self.myCobot.send_coords(
19271927
[self.home_coords[0] + x, self.home_coords[1] + y, self.camera_z, 178.99, -3.78,
19281928
-62.9], 25, 1)
@@ -1966,7 +1966,7 @@ def moved(self, x, y):
19661966
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
19671967
time.sleep(2)
19681968

1969-
elif device in ['myCobot 280 for RISC V']:
1969+
elif device in ['myCobot 280 for RISCV']:
19701970
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
19711971
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
19721972

@@ -1999,7 +1999,7 @@ def moved(self, x, y):
19991999
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
20002000
time.sleep(2)
20012001

2002-
elif device in ['myCobot 280 for RISC V']:
2002+
elif device in ['myCobot 280 for RISCV']:
20032003
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
20042004
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
20052005

@@ -2032,7 +2032,7 @@ def moved(self, x, y):
20322032
# self.stop_wait(3)
20332033
self.check_position([tmp[0], 5.39, -83.49, -10.37, -0.08, tmp[5]], 0)
20342034

2035-
elif device in ['myCobot 280 for RISC V']:
2035+
elif device in ['myCobot 280 for RISCV']:
20362036
self.myCobot.send_angles([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 25)
20372037
self.check_position([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 0)
20382038

@@ -2057,7 +2057,7 @@ def moved(self, x, y):
20572057
self.myCobot.set_coords(self.move_coords[color], 40)
20582058
self.stop_wait(4)
20592059

2060-
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
2060+
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
20612061
self.myCobot.send_angles(self.new_move_coords_to_angles[color], 25)
20622062
self.check_position(self.new_move_coords_to_angles[color], 0)
20632063
else:
@@ -2093,7 +2093,7 @@ def pump_on(self):
20932093
else:
20942094
self.myCobot.set_basic_output(5, 0)
20952095
time.sleep(0.05)
2096-
elif self.comboBox_device.currentText() in self.RISC_V:
2096+
elif self.comboBox_device.currentText() in self.RISCV:
20972097
from gpiozero.pins.lgpio import LGPIOFactory
20982098
from gpiozero import Device, LED
20992099
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0
@@ -2131,7 +2131,7 @@ def pump_off(self):
21312131
self.myCobot.set_basic_output(2, 1)
21322132
time.sleep(0.05)
21332133

2134-
elif self.comboBox_device.currentText() in self.RISC_V:
2134+
elif self.comboBox_device.currentText() in self.RISCV:
21352135
from gpiozero.pins.lgpio import LGPIOFactory
21362136
from gpiozero import Device, LED
21372137
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0

‎main.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def _init_variable(self):
9999
# device
100100
self.M5 = ['myPalletizer 260 for M5', 'myCobot 280 for M5', 'ultraArm P340', 'mechArm 270 for M5'] # M5 robot
101101
self.Pi = ['myCobot 280 for Pi', 'mechArm 270 for Pi', 'myCobot 280 for JN', 'myPalletizer 260 for Pi'] # Pi robot
102-
self.RISC_V = ['myCobot 280 for RISC V']
102+
self.RISCV = ['myCobot 280 for RISCV']
103103

104104
# angles to move
105105
self.move_angles = [
@@ -422,7 +422,7 @@ def buad_choose(self):
422422
# self.comboBox_buad.clear()
423423
# self.comboBox_buad.addItem('1000000')
424424
self.comboBox_buad.setCurrentIndex(0)
425-
elif value in self.RISC_V:
425+
elif value in self.RISCV:
426426
self.comboBox_buad.setCurrentIndex(0)
427427
else:
428428
# self.comboBox_buad.clear()
@@ -437,7 +437,7 @@ def buad_choose(self):
437437
else:
438438
self.widget_11.show()
439439
self.widget_20.show()
440-
if value in ['myCobot 280 for RISC V']:
440+
if value in ['myCobot 280 for RISCV']:
441441
self.camera_edit.setText('20')
442442
else:
443443
self.camera_edit.setText('0')
@@ -449,7 +449,7 @@ def buad_choose(self):
449449
def device_coord(self):
450450
"""Get points according to the device"""
451451
value = self.comboBox_device.currentText()
452-
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
452+
if value in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
453453
# yolov5 model file path
454454
self.modelWeights = libraries_path + "/yolov5File/yolov5s.onnx"
455455
# y-axis offset
@@ -1823,7 +1823,7 @@ def decide_move(self, x, y, color):
18231823
elif device == 'ultraArm P340':
18241824
_moved = threading.Thread(target=self.moved(x + 50, y + 60))
18251825
_moved.start()
1826-
elif device == 'myCobot 280 for RISC V':
1826+
elif device == 'myCobot 280 for RISCV':
18271827
_moved = threading.Thread(target=self.moved(x - 5, y + 145))
18281828
_moved.start()
18291829
else:
@@ -1921,7 +1921,7 @@ def moved(self, x, y):
19211921
[self.home_coords[0] + x, self.home_coords[1] - y, self.camera_z, 0], 50)
19221922
time.sleep(3)
19231923

1924-
elif device == 'myCobot 280 for RISC V':
1924+
elif device == 'myCobot 280 for RISCV':
19251925
self.myCobot.send_coords(
19261926
[self.home_coords[0] + x, self.home_coords[1] + y, self.camera_z, 178.99, -3.78,
19271927
-62.9], 25, 1)
@@ -1965,7 +1965,7 @@ def moved(self, x, y):
19651965
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
19661966
time.sleep(2)
19671967

1968-
elif device in ['myCobot 280 for RISC V']:
1968+
elif device in ['myCobot 280 for RISCV']:
19691969
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
19701970
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
19711971

@@ -1998,7 +1998,7 @@ def moved(self, x, y):
19981998
self.myCobot.set_coords([x, -y, self.camera_z, 0], 50)
19991999
time.sleep(2)
20002000

2001-
elif device in ['myCobot 280 for RISC V']:
2001+
elif device in ['myCobot 280 for RISCV']:
20022002
self.myCobot.send_coords([x, y, self.camera_z, 179.87, -3.78, -62.75], 25, 1)
20032003
self.check_position([x, y, self.camera_z, 179.87, -3.78, -62.75], 1)
20042004

@@ -2031,7 +2031,7 @@ def moved(self, x, y):
20312031
# self.stop_wait(3)
20322032
self.check_position([tmp[0], 5.39, -83.49, -10.37, -0.08, tmp[5]], 0)
20332033

2034-
elif device in ['myCobot 280 for RISC V']:
2034+
elif device in ['myCobot 280 for RISCV']:
20352035
self.myCobot.send_angles([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 25)
20362036
self.check_position([tmp[0], -0.71, -74.49, -23.02, -0.79, tmp[5]], 0)
20372037

@@ -2056,7 +2056,7 @@ def moved(self, x, y):
20562056
self.myCobot.set_coords(self.move_coords[color], 40)
20572057
self.stop_wait(4)
20582058

2059-
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISC V']:
2059+
elif device in ['myCobot 280 for Pi', 'myCobot 280 for M5', 'myCobot 280 for RISCV']:
20602060
self.myCobot.send_angles(self.new_move_coords_to_angles[color], 25)
20612061
self.check_position(self.new_move_coords_to_angles[color], 0)
20622062
else:
@@ -2092,7 +2092,7 @@ def pump_on(self):
20922092
else:
20932093
self.myCobot.set_basic_output(5, 0)
20942094
time.sleep(0.05)
2095-
elif self.comboBox_device.currentText() in self.RISC_V:
2095+
elif self.comboBox_device.currentText() in self.RISCV:
20962096
from gpiozero.pins.lgpio import LGPIOFactory
20972097
from gpiozero import Device, LED
20982098
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0
@@ -2130,7 +2130,7 @@ def pump_off(self):
21302130
self.myCobot.set_basic_output(2, 1)
21312131
time.sleep(0.05)
21322132

2133-
elif self.comboBox_device.currentText() in self.RISC_V:
2133+
elif self.comboBox_device.currentText() in self.RISCV:
21342134
from gpiozero.pins.lgpio import LGPIOFactory
21352135
from gpiozero import Device, LED
21362136
Device.pin_factory = LGPIOFactory(chip=0) # 显式指定/dev/gpiochip0

0 commit comments

Comments
 (0)