diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a67d055 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/Release/ +/Debug/ +*.si4project \ No newline at end of file diff --git a/diaoerqiege/BHBF_Robot_Lifting_Lug/.settings/language.settings.xml b/diaoerqiege/BHBF_Robot_Lifting_Lug/.settings/language.settings.xml index 46ca587..07f8dd5 100644 --- a/diaoerqiege/BHBF_Robot_Lifting_Lug/.settings/language.settings.xml +++ b/diaoerqiege/BHBF_Robot_Lifting_Lug/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/jueyuanzijiance/Insulator_Inspection/.settings/language.settings.xml b/jueyuanzijiance/Insulator_Inspection/.settings/language.settings.xml index 645d148..e4dea11 100644 --- a/jueyuanzijiance/Insulator_Inspection/.settings/language.settings.xml +++ b/jueyuanzijiance/Insulator_Inspection/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/jueyuanzijiance/Insulator_Inspection/Core/FSM/Src/fsm_state_control.c b/jueyuanzijiance/Insulator_Inspection/Core/FSM/Src/fsm_state_control.c index dd5da1b..fc73405 100644 --- a/jueyuanzijiance/Insulator_Inspection/Core/FSM/Src/fsm_state_control.c +++ b/jueyuanzijiance/Insulator_Inspection/Core/FSM/Src/fsm_state_control.c @@ -472,13 +472,13 @@ void joystickerLS_manual_control() // 右拨 if (abs(angle - 0) <= CV.Joy_Sticker_Angle_Allowance) { - fsm_state_set(¤t_rotate_state, &negative_rotate_state); + fsm_state_set(¤t_rotate_state, &positive_rotate_state); return; } // 左拨 if (abs(angle - 180) <= CV.Joy_Sticker_Angle_Allowance || abs(angle - (-180)) <= CV.Joy_Sticker_Angle_Allowance) { - fsm_state_set(¤t_rotate_state, &positive_rotate_state); + fsm_state_set(¤t_rotate_state, &negative_rotate_state); return; } // }