summaryrefslogtreecommitdiffstats
path: root/Kod/bilbana/yc4/do_car.m
diff options
context:
space:
mode:
authorAlbin <albwa833@student.liu.se>2019-11-16 14:52:01 +0100
committerAlbin <albwa833@student.liu.se>2019-11-16 14:52:01 +0100
commit206a04d0b9490d9ca092a15efbfc856c6916bfdf (patch)
tree3687d483072ee2c21de9a545780acbb7d82fe3f3 /Kod/bilbana/yc4/do_car.m
parentf3819da0232f8f1877b25a3f166174de7134ba8c (diff)
downloadtfyy51-206a04d0b9490d9ca092a15efbfc856c6916bfdf.tar.gz
Seg_constant 'borde' funka #62
Diffstat (limited to 'Kod/bilbana/yc4/do_car.m')
-rw-r--r--Kod/bilbana/yc4/do_car.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m
index ed8de89..d630ac5 100644
--- a/Kod/bilbana/yc4/do_car.m
+++ b/Kod/bilbana/yc4/do_car.m
@@ -110,7 +110,8 @@ if car.running == true
%% NEW LAP
if car.new_lap == true
- car.new_lap = false;
+ lap_constants = gov_set(get_car_constant(car.num));
+ car.new_lap = false; %TODO remove
beep;
if car.lap == 0
% dont save time for first lap
@@ -136,10 +137,9 @@ end
%% CALCULATE
if car.running == true && car.automatic == true
- car.car_constant = get_car_constant(car.num);
car.v = get_new_v(car.position, car.map);
- car.track_u_constant = get_track_u_constant();
- car.u = get_new_u(car.v, car.car_constant, car.track_u_constant);
+ seg_constant = get_seg_constant(car.position, lap_constants, car.num);
+ car.u = get_new_u(car.v, seg_constant, car.track_u_constant);
end
%% CONTROLLER