summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Kod/bilbana/yc4/get_time_as_string.m12
-rw-r--r--Kod/bilbana/yc4/main.m2
2 files changed, 11 insertions, 3 deletions
diff --git a/Kod/bilbana/yc4/get_time_as_string.m b/Kod/bilbana/yc4/get_time_as_string.m
index 24b6bc5..f99c53d 100644
--- a/Kod/bilbana/yc4/get_time_as_string.m
+++ b/Kod/bilbana/yc4/get_time_as_string.m
@@ -1,10 +1,16 @@
function num_as_str = get_time_as_string(millis)
%GET_TIME_AS_STRING Number of milliseconds, formatted mm:ss.s and rounded
% Detailed explanation goes here
-minutes = num2str(fix(millis / (1000*60)));
+minutes = fix(millis / (1000*60));
seconds = mod(millis, 1000*60);
+rest = round(mod(seconds, 1000), -2) / 100;
+if rest == 10
+ seconds = seconds + 1*1000;
+ rest = 0;
+end
+minutes_str = num2str(minutes);
seconds_str = sprintf('%02d', fix(seconds / 1000));
-rest_str = num2str(round(mod(seconds, 1000), -2) / 100);
-num_as_str = strjoin({minutes, ':', seconds_str, '.', rest_str}, '');
+rest_str = num2str(rest);
+num_as_str = strjoin({minutes_str, ':', seconds_str, '.', rest_str}, '');
end
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 67bbd6e..885d518 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -1,3 +1,5 @@
+clear all;
+
%% INIT TRACK
disp('Startar bilbanan. Avsluta med q.')
hf=figure('position', [0 0 eps eps], 'menubar', 'none');