diff --git a/HMIcode/BigProject/.vs/BigProject/FileContentIndex/0a2eec5e-40ea-4d16-aa67-e5ff7050f98a.vsidx b/HMIcode/BigProject/.vs/BigProject/FileContentIndex/0a2eec5e-40ea-4d16-aa67-e5ff7050f98a.vsidx deleted file mode 100644 index 007b50f..0000000 Binary files a/HMIcode/BigProject/.vs/BigProject/FileContentIndex/0a2eec5e-40ea-4d16-aa67-e5ff7050f98a.vsidx and /dev/null differ diff --git a/HMIcode/BigProject/.vs/BigProject/FileContentIndex/7dc0be39-41f6-43d8-8599-f9e96b48d70e.vsidx b/HMIcode/BigProject/.vs/BigProject/FileContentIndex/7dc0be39-41f6-43d8-8599-f9e96b48d70e.vsidx new file mode 100644 index 0000000..4fba3ce Binary files /dev/null and b/HMIcode/BigProject/.vs/BigProject/FileContentIndex/7dc0be39-41f6-43d8-8599-f9e96b48d70e.vsidx differ diff --git a/HMIcode/BigProject/BigProject/MainWindow.xaml.cs b/HMIcode/BigProject/BigProject/MainWindow.xaml.cs index db1c051..340256a 100644 --- a/HMIcode/BigProject/BigProject/MainWindow.xaml.cs +++ b/HMIcode/BigProject/BigProject/MainWindow.xaml.cs @@ -131,7 +131,7 @@ namespace BigProject } //循环运动机械臂 - bool JointLoopIsRun = false; + bool JointLoopIsRun = false; private void bt_MoveLoop_Click(object sender, RoutedEventArgs e) { if (JointLoopIsRun) return; @@ -527,12 +527,20 @@ namespace BigProject private void UpdateClawMsg(double angle,double length,double power) { this.Dispatcher.Invoke(() => { - //pg_ClawAngle.Value = angle; - pg_ClawLength.Value = length; - pg_ClawPower.Value = power; - tb_ClawAngle.Text = $"{angle}°"; - tb_ClawLength.Text = $"{length}mm"; - tb_ClawPower.Text = $"{power}"; + try + { + //pg_ClawAngle.Value = angle; + pg_ClawLength.Value = length; + pg_ClawPower.Value = power; + tb_ClawAngle.Text = $"{angle}°"; + tb_ClawLength.Text = $"{length}mm"; + tb_ClawPower.Text = $"{power}"; + } + catch (Exception e) + { + Log.Error(e); + } + }); } diff --git a/HMIcode/BigProject/BigProject/bin/Debug/BigProject.exe b/HMIcode/BigProject/BigProject/bin/Debug/BigProject.exe index 9474007..b2b4b5a 100644 Binary files a/HMIcode/BigProject/BigProject/bin/Debug/BigProject.exe and b/HMIcode/BigProject/BigProject/bin/Debug/BigProject.exe differ diff --git a/HMIcode/BigProject/BigProject/bin/Debug/BigProject.pdb b/HMIcode/BigProject/BigProject/bin/Debug/BigProject.pdb index f04d527..2545509 100644 Binary files a/HMIcode/BigProject/BigProject/bin/Debug/BigProject.pdb and b/HMIcode/BigProject/BigProject/bin/Debug/BigProject.pdb differ diff --git a/HMIcode/BigProject/BigProject/obj/Debug/BigProject.exe b/HMIcode/BigProject/BigProject/obj/Debug/BigProject.exe index 9474007..b2b4b5a 100644 Binary files a/HMIcode/BigProject/BigProject/obj/Debug/BigProject.exe and b/HMIcode/BigProject/BigProject/obj/Debug/BigProject.exe differ diff --git a/HMIcode/BigProject/BigProject/obj/Debug/BigProject.pdb b/HMIcode/BigProject/BigProject/obj/Debug/BigProject.pdb index f04d527..2545509 100644 Binary files a/HMIcode/BigProject/BigProject/obj/Debug/BigProject.pdb and b/HMIcode/BigProject/BigProject/obj/Debug/BigProject.pdb differ diff --git a/机械臂配料表(不包含相机和夹爪).xls b/机械臂配料表(不包含相机和夹爪).xls index 2a506fb..80578df 100644 Binary files a/机械臂配料表(不包含相机和夹爪).xls and b/机械臂配料表(不包含相机和夹爪).xls differ