Fix functions after test

3 files changed, 10 insertions, 8 deletions

diff --git a/Kod/bilbana/yc4/do_car.m b/Kod/bilbana/yc4/do_car.m
index cb9068f..be5d3bd 100644
--- a/Kod/bilbana/yc4/do_car.m
+++ b/Kod/bilbana/yc4/do_car.m
@@ -1,4 +1,4 @@
-function [car, stop] = do_car(car, t)
+function [car, stop, display_data] = do_car(car, t, display_data)
 
 stop = false;
 
@@ -17,7 +17,7 @@ if car.running == true
 		if toc(car.seg_tic) > 9.0
 			set_car_speed(1, 0);
 			set_car_speed(2, 0);
-			disp(strjoin{'Avåkning bil'; num2str(car.num)});
+			%disp(strjoin{'Avåkning bil'; num2str(car.num)});
 			disp('J = Ja, N = Nej')
 			car.response = input('Vill du fortsätta? [N] ', 's');
 			if car.response == 'J'
@@ -30,7 +30,7 @@ if car.running == true
 	end
 	%% CALC POSITION
 	if car.lap > 1
-		car.last_seg_times = car.seg_times(car.lap - 1, 1:9);
+		% car.last_seg_times = car.seg_times(car.lap - 1, 1:9);
 		aprox_v = get_aprox_v(car.segment + detect_missed(car.position, car.segment, car.num), car.lap, car.seg_times, car.num);
 		car.position = get_position(aprox_v, car.position, t);
 		if detect_missed( car.position, car.segment, car.num)
@@ -101,7 +101,7 @@ end
 
 %% CONTROLLER
 if car.running == true && car.automatic == false
-	set_car_speed(car.num, mult * ((max - get_manual_speed(car.num)) / div));
+	% set_car_speed(car.num, mult * ((max - get_manual_speed(car.num)) / div));
 end
 
 %% EXECUTE
diff --git a/Kod/bilbana/yc4/get_car_constant.m b/Kod/bilbana/yc4/get_car_constant.m
index 5513721..e5e9801 100644
--- a/Kod/bilbana/yc4/get_car_constant.m
+++ b/Kod/bilbana/yc4/get_car_constant.m
@@ -15,7 +15,7 @@ switch(in_pos)
     case 1
         car_constant = 0.95;
     case 2
-        car_constant = 0.8;
+        car_constant = 1.2;
 end
 end
 
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index cd512eb..12f9dd1 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -38,6 +38,7 @@ car1.seg_len = [0.0 2.53 3.05 4.73 7.68 8.98 10.93 14.69 17.57];
 car1.map = Bana1;
 car1.approximation = [];
 car1.miss_probability = 0.0;
+car1.num = 1;
 
 
 car2 = struct;
@@ -52,6 +53,7 @@ car2.position = 0;
 car2.seg_len = [0.0 2.53 3.05 4.92 7.60 8.84 10.65 14.68 17.76];
 car2.map = Bana2;
 car2.miss_probability = 0.0;
+car2.num = 2;
 
 
 highToc = 0;
@@ -95,10 +97,10 @@ while 1
     figure(hf)
     drawnow
     
-	[car1, car1.stop] = do_car(car1, t);
-	[car2, car2.stop] = do_car(car2, t);
+	[car1, car1.stop, display_data] = do_car(car1, t, display_data);
+	[car2, car2.stop, display_data] = do_car(car2, t, display_data);
 
-	if car1.stop == truej
+	if car1.stop == true
 		disp('stopped by car 1');
 		break;
 	end