diff options
| -rw-r--r-- | Kod/bilbana/yc4/debug.m | 6 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/get_time_as_string.m | 12 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/main.m | 31 | ||||
| -rw-r--r-- | Kod/bilbana/yc4/verbose.m | 6 |
4 files changed, 40 insertions, 15 deletions
diff --git a/Kod/bilbana/yc4/debug.m b/Kod/bilbana/yc4/debug.m new file mode 100644 index 0000000..0295e02 --- /dev/null +++ b/Kod/bilbana/yc4/debug.m @@ -0,0 +1,6 @@ +function [] = debug(tag, strings) +global log_debug; +if log_debug + disp(strjoin({'DEBUG (', tag, '): ', strings}, '')) +end +end 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 a57c69f..d1f4e8d 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -1,5 +1,23 @@ -%% INIT clear all; + +%% INIT TRACK +disp('Startar bilbanan. Avsluta med q.') +hf=figure('position', [0 0 eps eps], 'menubar', 'none'); + +initialize_counters(1) +initialize_counters(2) + +config_IOs + +start_race(1) +start_race(2) + +%% INIT +global log_debug; +log_debug = true; +global log_verbose; +log_verbose = false; + % INIT DISPLAY addpath display/ClientServerApp/Release cd display/ClientServerApp/Release @@ -18,20 +36,9 @@ display.last_send = tic; display.last_request = tic; display.send_interval = 0.5; -disp('Startar bilbanan. Avsluta med q.') -hf=figure('position', [0 0 eps eps], 'menubar', 'none'); - -initialize_counters(1) -initialize_counters(2) - -config_IOs - load('bilbana\files\Bana1.mat') load('bilbana\files\Bana2.mat') -start_race(1) -start_race(2) - car1 = struct; car1.num = 1; car1.running = false; diff --git a/Kod/bilbana/yc4/verbose.m b/Kod/bilbana/yc4/verbose.m new file mode 100644 index 0000000..d24a384 --- /dev/null +++ b/Kod/bilbana/yc4/verbose.m @@ -0,0 +1,6 @@ +function [] = verbose(tag, strings) +global log_verbose; +if log_verbose + disp(strjoin({'VERBOSE (', tag, '): ', strings}, '')) +end +end |
