summaryrefslogtreecommitdiffstats
path: root/Kod/bilbana
diff options
context:
space:
mode:
authormatuv053 <matuv053@student.liu.se>2019-11-25 16:30:42 +0100
committermatuv053 <matuv053@student.liu.se>2019-11-25 16:30:42 +0100
commit51a803f74b5e3ddbbb8cd73bce72448dd82a2ff7 (patch)
tree0fdd12b59ff4fe83b1f57081b50af90aac001d5d /Kod/bilbana
parentce327fb49a6f30cfbf806eef46a04f4d98ded949 (diff)
downloadtfyy51-51a803f74b5e3ddbbb8cd73bce72448dd82a2ff7.tar.gz
Ändrat lite värden.
Diffstat (limited to 'Kod/bilbana')
-rw-r--r--Kod/bilbana/files/Bana2.matbin673 -> 668 bytes
-rw-r--r--Kod/bilbana/yc4/do_boot.m11
-rw-r--r--Kod/bilbana/yc4/main.m2
3 files changed, 8 insertions, 5 deletions
diff --git a/Kod/bilbana/files/Bana2.mat b/Kod/bilbana/files/Bana2.mat
index 31e256d..e92709f 100644
--- a/Kod/bilbana/files/Bana2.mat
+++ b/Kod/bilbana/files/Bana2.mat
Binary files differ
diff --git a/Kod/bilbana/yc4/do_boot.m b/Kod/bilbana/yc4/do_boot.m
index 1638fb2..d7e9b88 100644
--- a/Kod/bilbana/yc4/do_boot.m
+++ b/Kod/bilbana/yc4/do_boot.m
@@ -6,7 +6,7 @@ if car.running == true
if car.lap == 0
t = toc(boot.time);
if t > 0.6
- car.constant = car.constant + 0.05;
+ car.constant = car.constant + 0.12;
disp('###')
disp(car.num)
disp(car.constant)
@@ -21,16 +21,19 @@ if car.running == true
disp(car.constant)
end
%% First segment
- if car.lap == 1 && car.segment == 1
+ if car.lap == 1 && car.segment == 1 || car.lap == 1 && car.segment == 2
t = toc(boot.time);
- if t > 3
- car.constant = car.constant + 0.2;
+ if t > 0.8
+ car.constant = car.constant + 0.05;
disp('###')
disp(car.num)
disp(car.constant)
boot.time = tic;
end
end
+
+
+
%% END BOOTSTRAP
if car.segment > 2
boot.status = 0;
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index b7221e3..96e5374 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -223,7 +223,7 @@ disp(car1);
disp(car2);
terminate(1);
-terminate(2)
+terminate(2);
if display_active
matlabclient(3);
end