diff --git a/.eide/eide.json b/.eide/eide.json index 21b0c8d..59c83c9 100644 --- a/.eide/eide.json +++ b/.eide/eide.json @@ -60,8 +60,7 @@ "libraries/zf_driver", "3rd-lib/crc16", "app/page", - "3rd-lib/lwrb/inc", - "app/tiny_frame" + "3rd-lib/lwrb/inc" ], "libList": [ "libraries/zf_device" diff --git a/app/gl_circle.c b/app/gl_circle.c index 9992e58..08f3350 100644 --- a/app/gl_circle.c +++ b/app/gl_circle.c @@ -60,8 +60,8 @@ void RunCircle() { } } else if (circle_type == CIRCLE_LEFT_RUNNING) // 正常巡线,寻外圆右线 { - // Track_Type = TRACK_RIGHT; - track_type = TRACK_LEFT; // 看看加一个如果丢线才切换 + track_type = TRACK_RIGHT; + // track_type = TRACK_LEFT; // 看看加一个如果丢线才切换 if (Lpt1_found) { pts_resample_right_count = mid_right_count = Lpt1_rpts1s_id; } @@ -126,8 +126,8 @@ void RunCircle() { } } else if (circle_type == CIRCLE_RIGHT_RUNNING) // 正常巡线,寻外圆左线 { - // track_type = TRACK_LEFT; - track_type = TRACK_RIGHT; // 看看加一个如果丢线才切换 + track_type = TRACK_LEFT; + // track_type = TRACK_RIGHT; // 看看加一个如果丢线才切换 if (Lpt0_found) // 外环存在拐点,可再加拐点距离判据 (左 L 点) { pts_resample_left_count = mid_left_count = Lpt0_rpts0s_id;