btl143/QDAC-firmware
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: 修改glz的单词拼写错误

Browse Source
This commit is contained in:
bmy
2024-07-05 14:16:20 +08:00
parent 5d56543f64
commit 296d02ff4a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/gl_barrier.c
View File

@@ -3,7 +3,7 @@
enum barrier_type_e barrier_type = BARRIER_NONE; enum barrier_type_e barrier_type = BARRIER_NONE;
enum s_type_e s_type = S_NONE; enum s_type_e s_type = S_NONE;
enum shiled_type_e shiled_type = SHILED_NONE; enum shield_type_e shield_type = SHIELD_NONE;
float (*mid_track_s)[2]; float (*mid_track_s)[2];
int32_t mid_track_count_s; int32_t mid_track_count_s;
int temp_min_s; int temp_min_s;
@@ -150,17 +150,17 @@ void RunS()
} }
void Check_shiled(){ void Check_shield(){
if (begin_flag == 1) if (begin_flag == 1)
{ {
shiled_type = SHILED_BEGIN; shield_type = SHIELD_BEGIN;
timer_clear(TIM_3); timer_clear(TIM_3);
timer_start(TIM_3); timer_start(TIM_3);
begin_flag = 0; begin_flag = 0;
} }
if (timer_get(TIM_3) > 1000 && shiled_type == SHILED_BEGIN) if (timer_get(TIM_3) > 1000 && shield_type == SHIELD_BEGIN)
{ {
shiled_type = SHILED_NONE; shield_type = SHIELD_NONE;
timer_stop(TIM_3); timer_stop(TIM_3);
timer_clear(TIM_3); timer_clear(TIM_3);
} }

10
app/gl_barrier.h
View File

@@ -18,14 +18,14 @@ enum s_type_e {
S_OUT, S_OUT,
}; };
enum shiled_type_e { enum shield_type_e {
SHILED_NONE, SHIELD_NONE,
SHILED_BEGIN, SHIELD_BEGIN,
}; };
extern enum barrier_type_e barrier_type; extern enum barrier_type_e barrier_type;
extern enum s_type_e s_type; extern enum s_type_e s_type;
extern enum shiled_type_e shiled_type; extern enum shield_type_e shield_type;
extern float (*mid_track_s)[2]; extern float (*mid_track_s)[2];
extern int32_t mid_track_count_s; extern int32_t mid_track_count_s;
extern int temp_min_s; extern int temp_min_s;
@@ -34,7 +34,7 @@ extern int temp_max_s;
void CheckBarrier(void); void CheckBarrier(void);
void Check_s(void); void Check_s(void);
void RunBarrier(void); void RunBarrier(void);
void Check_shiled(void); void Check_shield(void);
#endif /* COMMON_H_ */ #endif /* COMMON_H_ */

4
app/gl_tracking.c
View File

@@ -112,8 +112,8 @@ void aim_distance_select(void)
void ElementJudge() void ElementJudge()
{ {
Check_shiled(); Check_shield();
if (shiled_type == SHILED_NONE) { if (shield_type == SHIELD_NONE) {
CheckGarage(); CheckGarage();
if (garage_type == GARAGE_NONE) { if (garage_type == GARAGE_NONE) {
CheckCross(); CheckCross();