summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-11-05 15:25:52 +0100
committerGustav Sörnäs <gusso230@student.liu.se>2019-11-05 15:25:52 +0100
commit3871966521dd39f8b766d17652c042d5fc8874a7 (patch)
tree66738d9bce895394a884a255beaa9c443d41553b
parentc0c7f3c7c3bab6e4e39568a3e37405cca26014e0 (diff)
parentb91a89bab321071c54cfc514c697247bf7d13a1c (diff)
downloadtfyy51-3871966521dd39f8b766d17652c042d5fc8874a7.tar.gz
Merge branch 'TicTocPaus'
-rw-r--r--Kod/bilbana/yc4/main.m21
1 files changed, 16 insertions, 5 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 8af4735..4a3d667 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -37,7 +37,7 @@ car2.lap = 0;
car2.lap_times = [];
car2.seg_times = [];
-tocs = [];
+highToc = 0;
%% ASK ACTIVE CARS
disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej');
@@ -67,7 +67,7 @@ end
%% MAIN LOOP
while 1
- tic;
+ readTime = tic;
%% PRE-LOOP
if strcmp(get(hf,'currentcharacter'),'q')
close(hf)
@@ -188,13 +188,24 @@ while 1
%% DISPLAY
%% END OF LOOP
- pause(0.1)
- tocs(end + 1) = toc;
+ while 1 %Whileloop med paus som körs till pausen överskridit 0.07 sekunder
+ pause(0.01)
+ t = toc(readTime);
+ if t > 0.07
+ if t > highToc
+ highToc = t; %Om det nya värdet på pausen är högre än den tidigare högsta så sparas det som den högsta
+ end
+
+ break;
+ end
+ end
+
+
send_data_to_display();
end
%% END OF PROGRAM
-disp(tocs);
+disp(highToc);
disp(car1);
disp(car2);