diff --git a/app/gl_barrier.c b/app/gl_barrier.c index 76f6616..a4b735b 100644 --- a/app/gl_barrier.c +++ b/app/gl_barrier.c @@ -3,7 +3,7 @@ enum barrier_type_e barrier_type = BARRIER_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]; int32_t mid_track_count_s; int temp_min_s; @@ -150,17 +150,17 @@ void RunS() } -void Check_shiled(){ +void Check_shield(){ if (begin_flag == 1) { - shiled_type = SHILED_BEGIN; + shield_type = SHIELD_BEGIN; timer_clear(TIM_3); timer_start(TIM_3); 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_clear(TIM_3); } diff --git a/app/gl_barrier.h b/app/gl_barrier.h index be96377..bb4b136 100644 --- a/app/gl_barrier.h +++ b/app/gl_barrier.h @@ -18,14 +18,14 @@ enum s_type_e { S_OUT, }; -enum shiled_type_e { - SHILED_NONE, - SHILED_BEGIN, +enum shield_type_e { + SHIELD_NONE, + SHIELD_BEGIN, }; extern enum barrier_type_e barrier_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 int32_t mid_track_count_s; extern int temp_min_s; @@ -34,7 +34,7 @@ extern int temp_max_s; void CheckBarrier(void); void Check_s(void); void RunBarrier(void); -void Check_shiled(void); +void Check_shield(void); #endif /* COMMON_H_ */ \ No newline at end of file diff --git a/app/gl_tracking.c b/app/gl_tracking.c index 1093cc4..f478ac0 100644 --- a/app/gl_tracking.c +++ b/app/gl_tracking.c @@ -112,8 +112,8 @@ void aim_distance_select(void) void ElementJudge() { - Check_shiled(); - if (shiled_type == SHILED_NONE) { + Check_shield(); + if (shield_type == SHIELD_NONE) { CheckGarage(); if (garage_type == GARAGE_NONE) { CheckCross();