xiongyi/AutoControlSystem-git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 现场调试

Browse Source
This commit is contained in:
Gogs
2024-12-08 16:10:59 +08:00
parent d4fcb79394
commit 7c606caa7b
5 changed files with 196 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main.py
View File

@ -1005,7 +1005,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
log.log_message(logging.ERROR, Constant.str_sys_set_error+e)
pass
#self.pushButton_speed.setText(str(Constant.speed))
log.log_message(logging.INFO, Constant.str_sys_setSpeed + str(Constant.speed)+'|'+str(Constant.debug_speed))
log.log_message(logging.INFO, Constant.str_sys_setSpeed + str(self.robotClient.debug_speed)+'|'+str(self.robotClient.feed_speed))
pass
def send_get_safe_position_button_click(self):
@ -1134,13 +1134,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def send_reset_button_click(self):
line_head = self.comboBox_lineIndex.currentData()
safe_position = self.feedLine_dict[line_head].safe_position
#safe_position = self.feedLine_dict[line_head].safe_position
# self.send_position_command(safe_position.X, safe_position.Y, safe_position.Z, safe_position.U, safe_position.V, safe_position.W,move_type=MoveType.WORLD)
if self.remain_lineName != '':
line_head = f'{Constant.feedLine_set_section}{self.remain_lineName}'
return_positions = self.feedLine_dict[line_head].positions
position_origin = PositionModel()
position_origin.init_position(self.robotClient.origin_position)
return_positions.insert(0,position_origin)
if self.feedLine_dict.keys().__contains__(line_head):
self.feeding.feedConfig= FeedingConfig(0, FeedLine(self.feedLine_dict[line_head].id, self.feedLine_dict[line_head].name,
self.feedLine_dict[line_head].positions),
return_positions),
self.feeding.robotClient.photo_locs[:])
else:
log.log_message(logging.ERROR, Constant.str_feed_reset_no_line_error)
@ -1239,10 +1243,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if self.feeding.feedStatus == FeedStatus.FNone:
position_origin = PositionModel()
position_origin.init_position(self.robotClient.origin_position)
command.feed_config.feedLine.positions.insert(0,position_origin)
position_origin.status = 1
command.feed_config.feedLine.feed_positions.insert(0,position_origin)
self.feeding.feedConfig = command.feed_config
self.robotClient.send_emergency_sound()
time.sleep(5000)
time.sleep(5)
self.robotClient.send_emergency_stop()
self.feeding.feedStatus = FeedStatus.FStart
# self.feeding.feed_Mid_Status = FeedMidStatus.FMid_Start
@ -1271,6 +1276,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# if result == QMessageBox.StandardButton.Cancel:
# return
log.log_message(logging.ERROR, '人员进入安全区')
time.sleep(3)
pass
def updateUI(self):
@ -1789,8 +1796,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.lineEdit_w5.setText(str(self.robotClient.photo_locs[4][5]))
pass
def updateUI_Base_Set(self):
self.lineEdit_speed_run.setText(str(Constant.speed))
self.lineEdit_speed_debug.setText(str(Constant.shake_speed))
self.lineEdit_speed_run.setText(str(self.robotClient.feed_speed))
self.lineEdit_speed_debug.setText(str(self.robotClient.debug_speed))
self.lineEdit_speed_reset.setText(str(self.robotClient.reset_speed))
self.lineEdit_solenoid1_addr.setText(str(self.robotClient.con_ios[0]))
self.lineEdit_solenoid2_addr.setText(str(self.robotClient.con_ios[1]))
self.lineEdit_solenoid3_addr.setText(str(self.robotClient.con_ios[2]))