summaryrefslogtreecommitdiffstats
path: root/Kod/bilbana/yc4/main.m
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-11-15 13:35:55 +0100
committerGustav Sörnäs <gusso230@student.liu.se>2019-11-15 13:37:03 +0100
commit231a9e0963e8341cc7a27e1b61d1cd2ecc35f00a (patch)
tree87586c7856a6ccf73f08a71919f6f1b64b944f0d /Kod/bilbana/yc4/main.m
parent0f95b8db3209e3cf802bf7f1af807faa9688d343 (diff)
parentd86e80be733c5081d72bbecd76aeb2b796d2e74b (diff)
downloadtfyy51-231a9e0963e8341cc7a27e1b61d1cd2ecc35f00a.tar.gz
Merge branch 'display-functions'
Diffstat (limited to 'Kod/bilbana/yc4/main.m')
-rw-r--r--Kod/bilbana/yc4/main.m5
1 files changed, 3 insertions, 2 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index fcff963..1f71a95 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -100,6 +100,7 @@ elseif not(isreal(ref_time))
end
%}
ref_time = 13;
+
%% MAIN LOOP
while 1
readTime = tic;
@@ -138,10 +139,10 @@ while 1
if toc(display.last_send) > display.send_interval
% queue control signal
if car1.running && car1.automatic
- display.data = [display.data, put_text(20, 16 + (16 * 1), 'L', num2str(car1.u))];
+ % display.data = [display.data, put_text(20, 16 + (16 * 1), 'L', num2str(car1.u))];
end
if car2.running && car2.automatic
- display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))];
+ % display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))];
end
% send all queued data