diff --git a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics.py b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics.py index 0c5cdbb..728b030 100644 --- a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics.py +++ b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics.py @@ -85,17 +85,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_jsnn.py b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_jsnn.py index 2080723..1b9258f 100644 --- a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_jsnn.py +++ b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_jsnn.py @@ -92,17 +92,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_pi.py b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_pi.py index ab6e9a0..16424bd 100644 --- a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_pi.py +++ b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_pi.py @@ -89,17 +89,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_seeed.py b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_seeed.py index bb7f713..1c37b87 100644 --- a/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_seeed.py +++ b/mecharm/mecharm_communication/mecharm_communication/mecharm_topics_seeed.py @@ -87,17 +87,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mecharm/mecharm_pi/mecharm_pi/simple_gui.py b/mecharm/mecharm_pi/mecharm_pi/simple_gui.py index a9bca0d..17960c1 100755 --- a/mecharm/mecharm_pi/mecharm_pi/simple_gui.py +++ b/mecharm/mecharm_pi/mecharm_pi/simple_gui.py @@ -463,7 +463,7 @@ def main(args=None): # ----------- # w = threading.Thread(target=Window(window).run()) - # w.setDaemon(True) + # w.daemon = True # t.start() # w.start() # window.mainloop() diff --git a/mycobot_communication/mycobot_communication/mycobot_topics.py b/mycobot_communication/mycobot_communication/mycobot_topics.py index c143b8b..64f64d1 100644 --- a/mycobot_communication/mycobot_communication/mycobot_topics.py +++ b/mycobot_communication/mycobot_communication/mycobot_topics.py @@ -97,17 +97,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mycobot_communication/mycobot_communication/mycobot_topics_jsnn.py b/mycobot_communication/mycobot_communication/mycobot_topics_jsnn.py index 3cd87c1..057ce27 100644 --- a/mycobot_communication/mycobot_communication/mycobot_topics_jsnn.py +++ b/mycobot_communication/mycobot_communication/mycobot_topics_jsnn.py @@ -104,17 +104,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mycobot_communication/mycobot_communication/mycobot_topics_pi.py b/mycobot_communication/mycobot_communication/mycobot_topics_pi.py index fe84c92..70a669a 100644 --- a/mycobot_communication/mycobot_communication/mycobot_topics_pi.py +++ b/mycobot_communication/mycobot_communication/mycobot_topics_pi.py @@ -100,17 +100,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mycobot_communication/mycobot_communication/mycobot_topics_seeed.py b/mycobot_communication/mycobot_communication/mycobot_topics_seeed.py index 002c54f..38e7e7a 100644 --- a/mycobot_communication/mycobot_communication/mycobot_topics_seeed.py +++ b/mycobot_communication/mycobot_communication/mycobot_topics_seeed.py @@ -98,17 +98,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics.py b/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics.py index 611e932..dde78af 100644 --- a/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics.py +++ b/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics.py @@ -86,17 +86,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics_seeed.py b/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics_seeed.py index b866736..d28bcaf 100644 --- a/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics_seeed.py +++ b/mypalletizer_260/mypalletizer_communication/mypalletizer_communication/mypalletizer_topics_seeed.py @@ -88,17 +88,17 @@ def start(self): sg = threading.Thread(target=self.sub_gripper_status) sp = threading.Thread(target=self.sub_pump_status) - pa.setDaemon(True) + pa.daemon = True pa.start() - pb.setDaemon(True) + pb.daemon = True pb.start() - sa.setDaemon(True) + sa.daemon = True sa.start() - sb.setDaemon(True) + sb.daemon = True sb.start() - sg.setDaemon(True) + sg.daemon = True sg.start() - sp.setDaemon(True) + sp.daemon = True sp.start() pa.join() diff --git a/ultraArm/ultraArm_Testtool/main.py b/ultraArm/ultraArm_Testtool/main.py index 2914470..3e76a53 100644 --- a/ultraArm/ultraArm_Testtool/main.py +++ b/ultraArm/ultraArm_Testtool/main.py @@ -66,7 +66,7 @@ def build_code(self): build_mes = 'start build...' self.textBrowser.append('[' + str(current_time) + ']' + ' ' + build_mes) t1 = threading.Thread(target=self.start_bulid) - t1.setDaemon(True) + t1.daemon = True t1.start() def start_bulid(self): @@ -80,25 +80,25 @@ def run_program(self): if self.comboBox.currentText() == 'rviz2': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'start test.....') t1 = threading.Thread(target=self.rviz_test) - t1.setDaemon(True) + t1.daemon = True t1.start() elif self.comboBox.currentText() == '滑块控制': self.textBrowser.append('[' + str(current_time) + ']' + ' '+ 'start slider control......') t1 = threading.Thread(target=self.rviz_test) - t1.setDaemon(True) + t1.daemon = True t1.start() else: if self.comboBox.currentText() == 'rviz2': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'start test.....') t1 = threading.Thread(target=self.rviz_test) - t1.setDaemon(True) + t1.daemon = True t1.start() elif self.comboBox.currentText() == 'slider control': self.textBrowser.append('[' + str(current_time) + ']' + ' '+ 'start slider control......') t1 = threading.Thread(target=self.rviz_test) - t1.setDaemon(True) + t1.daemon = True t1.start() except Exception as e: @@ -127,23 +127,23 @@ def close_rviz(self): if self.comboBox.currentText() == 'rviz2': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'rviz2 test closed ! ! !') t1 = threading.Thread(target=self.close_test) - t1.setDaemon(True) + t1.daemon = True t1.start() elif self.comboBox.currentText() == '滑块控制': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'slider control closed ! ! !') t1 = threading.Thread(target=self.close_test) - t1.setDaemon(True) + t1.daemon = True t1.start() else: if self.comboBox.currentText() == 'rviz2': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'rviz2 test closed ! ! !') t1 = threading.Thread(target=self.close_test) - t1.setDaemon(True) + t1.daemon = True t1.start() elif self.comboBox.currentText() == 'slider control': self.textBrowser.append('[' + str(current_time) + ']' + ' ' + 'slider control closed ! ! !') t1 = threading.Thread(target=self.close_test) - t1.setDaemon(True) + t1.daemon = True t1.start() except Exception as e: