From 30dda57ab349e612f10377c7167c2487aeacfbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 13 Nov 2019 17:15:53 +0100 Subject: Add pre-loop to input active track on display --- Kod/bilbana/yc4/main.m | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index cad395a..effe075 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -6,7 +6,7 @@ cd display/ClientServerApp/Release cd ../../.. display = struct; -display.data = [clear_display()]; +display.data = []; display.out = 0; display.shm = 0; display.shm_interp = struct; @@ -14,7 +14,6 @@ display.shm_interp.ack = 0; display.shm_interp.start_code = ''; display.shm_interp.data = []; display.last_send = tic; -display.last_request = tic; display.send_interval = 0.5; disp('Startar bilbanan. Avsluta med q.') @@ -64,6 +63,43 @@ highToc = 0; %% ASK ACTIVE CARS disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); +%% DRAW DISPLAY +matlabclient(1, get_smallpackage([ ... + put_text(160, 30, 'C', 'Choose which car to drive'), ... + define_touch_switch(98 , 60 , 130, 90 , 11, 12, 'C', '1'), ... + define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... + define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... + define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... + define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... +])); + +display.last_check = tic; +while 1 + pause(0.1); + if toc(display.last_check) > 0.5 + display.last_check = tic; + % read internal mem from last send + [display.out, display.shm] = matlabclient(2); + [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); + + % request internal mem + matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); + + if isempty(display.shm_interp.data) + disp('tomt') + continue + end + for i = 1:length(display.shm_interp.data) + disp(num2str(length(display.shm_interp.data))) + data = display.shm_interp.data(i); + disp(data) + if data.data == 31 + disp('WAHO') + end + end + end +end + car1.response = input('Vill du köra bil 1? [N] ', 's'); if car1.response == 'J' car1.running = true; -- cgit v1.2.1 From 3d13499d560f1e81bb594ac3596f1e768e154b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 13 Nov 2019 20:34:02 +0100 Subject: respond to buttons pressed + indents --- Kod/bilbana/yc4/main.m | 162 ++++++++++++++++++++++++++++++------------------- 1 file changed, 101 insertions(+), 61 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index effe075..c2521fd 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -60,67 +60,61 @@ car2.miss_probability = 0.05; t = 0; highToc = 0; -%% ASK ACTIVE CARS -disp('J = Ja (automatiskt), M = Ja (manuellt), N = Nej'); - %% DRAW DISPLAY matlabclient(1, get_smallpackage([ ... put_text(160, 30, 'C', 'Choose which car to drive'), ... define_touch_switch(98 , 60 , 130, 90 , 11, 12, 'C', '1'), ... define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... - define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... - define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... - define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... -])); + define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... + define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... + define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... + ])); +%% CHECK DISPLAY BUTTONS display.last_check = tic; +done = false; while 1 pause(0.1); - if toc(display.last_check) > 0.5 - display.last_check = tic; - % read internal mem from last send - [display.out, display.shm] = matlabclient(2); - [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); - - % request internal mem - matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); - - if isempty(display.shm_interp.data) - disp('tomt') - continue - end - for i = 1:length(display.shm_interp.data) - disp(num2str(length(display.shm_interp.data))) - data = display.shm_interp.data(i); - disp(data) - if data.data == 31 - disp('WAHO') - end - end - end -end - -car1.response = input('Vill du köra bil 1? [N] ', 's'); -if car1.response == 'J' - car1.running = true; - car1.automatic = true; -elseif car1.response == 'M' - car1.running = true; - car1.automatic = false; -else - car1.running = false; -end + if toc(display.last_check) > 0.5 + display.last_check = tic; + % read internal mem from last send + [display.out, display.shm] = matlabclient(2); + [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); + % request internal mem + matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); -car2.response = input('Vill du köra bil 2? [N] ', 's'); -if car2.response == 'J' - car2.running = true; - car2.automatic = true; -elseif car2.response == 'M' - car2.running = true; - car2.automatic = false; -else - car2.running = false; + if isempty(display.shm_interp.data) + continue + end + for i = 1:length(display.shm_interp.data) + disp(num2str(length(display.shm_interp.data))) + data = display.shm_interp.data(i); + disp(data) + if data.data == 32 + done = true + elseif data.data == 11 + car1.running = true + elseif data.data == 12 + car1.running = false + elseif data.data == 13 + car1.automatic = true + elseif data.data == 14 + car1.automatic = false + elseif data.data == 21 + car2.running = true + elseif data.data == 22 + car2.running = false + elseif data.data == 23 + car2.automatic = true + elseif data.data == 24 + car2.automatic = false + end + end + if done == true + break + end + end end %{ ref_time = input('Vilken referenstid ska användas? [13] ', 's'); @@ -137,16 +131,16 @@ matlabclient(1, get_smallpackage([define_bar_graph('O', 2, 266, 30, 290, 210, 0, %% MAIN LOOP while 1 - readTime = tic; - %% PRE-LOOP - if strcmp(get(hf,'currentcharacter'),'q') - close(hf) - break - end - - figure(hf) - drawnow - + readTime = tic; + %% PRE-LOOP + if strcmp(get(hf,'currentcharacter'),'q') + close(hf) + break + end + + figure(hf) + drawnow + [car1, car1.stop, display.data] = do_car(car1, t, display.data); [car2, car2.stop, display.data] = do_car(car2, t, display.data); @@ -158,6 +152,7 @@ while 1 disp('stopped by car 2'); break; end +<<<<<<< HEAD %% END OF LOOP while 1 %Whileloop med paus som k�rs till pausen �verskridit 0.07 sekunder @@ -202,8 +197,53 @@ while 1 end pause(0.001); end +======= + + %% END OF LOOP + while 1 %Whileloop med paus som k�rs till pausen �verskridit 0.07 sekunder + % DISPLAY + display.send_delay = tic; + 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))]; + end + if car2.running && car2.automatic + display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))]; + end + + % send all queued data + if ~isempty(display.data) + [display.out] = matlabclient(1, get_smallpackage(display.data)); + display.data = []; + end + display.last_send = tic; + + % read internal mem from last send + [display.out, display.shm] = matlabclient(2); + [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); + + % request internal mem + % matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); + end + % disp(strjoin({'display took additional ', num2str(toc(display.send_delay))})); + % ACTUAL END OF LOOP + 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 + if t > 0.1 + % beep; + end + break; + end + pause(0.001); + end +>>>>>>> respond to buttons pressed + indents end - + %% END OF PROGRAM disp(highToc); disp(car1); -- cgit v1.2.1 From ce5be50ee6d0663d2a456ea88a6408306d0571d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Thu, 14 Nov 2019 09:58:02 +0100 Subject: comment out track-code --- Kod/bilbana/yc4/main.m | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index c2521fd..e6a1663 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -19,21 +19,21 @@ 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) +% initialize_counters(1) +% initialize_counters(2) -config_IOs +% config_IOs load('bilbana\files\Bana1.mat') load('bilbana\files\Bana2.mat') -start_race(1) -start_race(2) +% start_race(1) +% start_race(2) car1 = struct; car1.num = 1; car1.running = false; -car1.automatic = true; +car1.automatic = false; car1.segment = 1; car1.lap = 0; car1.lap_times = []; @@ -47,7 +47,7 @@ car1.miss_probability = 0.0; car2 = struct; car2.num = 2; car2.running = false; -car2.automatic = true; +car2.automatic = false; car2.segment = 1; car2.lap = 0; car2.lap_times = []; @@ -92,23 +92,23 @@ while 1 data = display.shm_interp.data(i); disp(data) if data.data == 32 - done = true + done = true; elseif data.data == 11 - car1.running = true + car1.running = true; elseif data.data == 12 - car1.running = false + car1.running = false; elseif data.data == 13 - car1.automatic = true + car1.automatic = false; elseif data.data == 14 - car1.automatic = false + car1.automatic = true; elseif data.data == 21 - car2.running = true + car2.running = true; elseif data.data == 22 - car2.running = false + car2.running = false; elseif data.data == 23 - car2.automatic = true + car2.automatic = false; elseif data.data == 24 - car2.automatic = false + car2.automatic = true; end end if done == true -- cgit v1.2.1 From f9f5c7afa381ecaad5b9d9f608a49268de4b467e Mon Sep 17 00:00:00 2001 From: Albin Date: Thu, 14 Nov 2019 09:35:15 +0100 Subject: Add ref-time --- Kod/bilbana/yc4/main.m | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index e6a1663..052f59e 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -57,6 +57,8 @@ car2.seg_len = [0.0 2.53 3.05 4.92 7.60 8.84 10.65 14.68 17.76]; car2.map = Bana2; car2.miss_probability = 0.05; +ref_time = 13; + t = 0; highToc = 0; @@ -116,6 +118,7 @@ while 1 end end end + %{ ref_time = input('Vilken referenstid ska användas? [13] ', 's'); ref_time = str2double(ref_time); -- cgit v1.2.1 From 20667f30666d8fa9f112dd62837064df952585e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 00:21:53 +0100 Subject: Add ability to choose ref time from display Also additional comments --- Kod/bilbana/yc4/main.m | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 052f59e..7fdf005 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -65,11 +65,16 @@ highToc = 0; %% DRAW DISPLAY matlabclient(1, get_smallpackage([ ... put_text(160, 30, 'C', 'Choose which car to drive'), ... - define_touch_switch(98 , 60 , 130, 90 , 11, 12, 'C', '1'), ... - define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... - define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... - define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... - define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... + define_touch_switch(98 , 60 , 130, 90 , 11, 12, 'C', '1'), ... % ACTIVATE TRACK 1 + define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... % MANUAL CONTROL TRACK 1 + define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... % ACTIVATE TRACK 2 + define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... % MANUAL CONTROL TRACK 2 + put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME + define_touch_key( 98 , 110, 130, 140, 41, 42, 'C', '-'), ... % DECREASE REFERENCE TIME + define_touch_key( 190, 110, 220, 140, 43, 44, 'C', '+'), ... % INCREASE REFERENCE TIME + define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... % START BUTTON + %TODO CLEAR BUTTON + put_text() ])); %% CHECK DISPLAY BUTTONS @@ -77,18 +82,17 @@ display.last_check = tic; done = false; while 1 pause(0.1); - if toc(display.last_check) > 0.5 - display.last_check = tic; + if toc(display.last_check) > 0.4 % read internal mem from last send [display.out, display.shm] = matlabclient(2); [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); % request internal mem matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); - if isempty(display.shm_interp.data) continue end + update_ref_time = false; for i = 1:length(display.shm_interp.data) disp(num2str(length(display.shm_interp.data))) data = display.shm_interp.data(i); @@ -111,11 +115,26 @@ while 1 car2.automatic = false; elseif data.data == 24 car2.automatic = true; + elseif data.data == 41 + % ignore + elseif data.data == 42 + ref_time = max(ref_time - 0.5, 12.0) + update_ref_time = true; + elseif data.data == 43 + % ignore + elseif data.data == 44 + ref_time = min(ref_time + 0.5, 15.0) + update_ref_time = true; end end if done == true break end + if update_ref_time == true + pause(0.4); + matlabclient(1, get_smallpackage(put_text(160, 120, 'C', num2str(ref_time, '%.1f')))); + end + display.last_check = tic; end end -- cgit v1.2.1 From 9df65bb954975329d23be5bfba3fd91039f5bfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 00:27:59 +0100 Subject: add debug-output when display is done --- Kod/bilbana/yc4/main.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 7fdf005..a7c8cea 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -147,7 +147,10 @@ elseif not(isreal(ref_time)) ref_time = 13; end %} -ref_time = 13; + +debug('DISPLAY', ['CAR1.RUNNING=', car1.running, ', CAR1.AUTOMATIC=', car1.automatic]) +debug('DISPLAY', ['CAR2.RUNNING=', car2.running, ', CAR2.AUTOMATIC=', car2.automatic]) +debug('DISPLAY', ['CHOSEN REFERENCE TIME=', ref_time]) matlabclient(1, get_smallpackage([define_bar_graph('O', 2, 266, 30, 290, 210, 0, 64, 1, 1)])); -- cgit v1.2.1 From b19ae6983f87076b986577f5534bcd20e3053dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 15 Nov 2019 11:06:53 +0100 Subject: issues --- Kod/bilbana/yc4/main.m | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index a7c8cea..bfb18a2 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -68,14 +68,17 @@ matlabclient(1, get_smallpackage([ ... define_touch_switch(98 , 60 , 130, 90 , 11, 12, 'C', '1'), ... % ACTIVATE TRACK 1 define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... % MANUAL CONTROL TRACK 1 define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... % ACTIVATE TRACK 2 - define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M'), ... % MANUAL CONTROL TRACK 2 - put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME + define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M') ... % MANUAL CONTROL TRACK 2 +])); +pause(0.5); +matlabclient(1, get_smallpackage([ ... + % TODO ????????????????????????????????????????? + put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME define_touch_key( 98 , 110, 130, 140, 41, 42, 'C', '-'), ... % DECREASE REFERENCE TIME define_touch_key( 190, 110, 220, 140, 43, 44, 'C', '+'), ... % INCREASE REFERENCE TIME define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... % START BUTTON %TODO CLEAR BUTTON - put_text() - ])); +])); %% CHECK DISPLAY BUTTONS display.last_check = tic; @@ -83,6 +86,8 @@ done = false; while 1 pause(0.1); if toc(display.last_check) > 0.4 + display.last_check = tic; + % read internal mem from last send [display.out, display.shm] = matlabclient(2); [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); @@ -118,12 +123,12 @@ while 1 elseif data.data == 41 % ignore elseif data.data == 42 - ref_time = max(ref_time - 0.5, 12.0) + ref_time = max(ref_time - 0.5, 12.0); update_ref_time = true; elseif data.data == 43 % ignore elseif data.data == 44 - ref_time = min(ref_time + 0.5, 15.0) + ref_time = min(ref_time + 0.5, 15.0); update_ref_time = true; end end -- cgit v1.2.1 From a16acaf17caf06c53c2fc4e7f424f84f7ac4778a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Nov 2019 18:10:28 +0100 Subject: remove todo --- Kod/bilbana/yc4/main.m | 1 - 1 file changed, 1 deletion(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index bfb18a2..0d0f5f1 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -72,7 +72,6 @@ matlabclient(1, get_smallpackage([ ... ])); pause(0.5); matlabclient(1, get_smallpackage([ ... - % TODO ????????????????????????????????????????? put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME define_touch_key( 98 , 110, 130, 140, 41, 42, 'C', '-'), ... % DECREASE REFERENCE TIME define_touch_key( 190, 110, 220, 140, 43, 44, 'C', '+'), ... % INCREASE REFERENCE TIME -- cgit v1.2.1 From d195a43eef3817d6a1f926725eeaba6770345c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 23 Nov 2019 23:05:05 +0100 Subject: more work --- Kod/bilbana/yc4/main.m | 68 ++++++++------------------------------------------ 1 file changed, 11 insertions(+), 57 deletions(-) (limited to 'Kod/bilbana/yc4/main.m') diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m index 0d0f5f1..64951aa 100644 --- a/Kod/bilbana/yc4/main.m +++ b/Kod/bilbana/yc4/main.m @@ -69,15 +69,15 @@ matlabclient(1, get_smallpackage([ ... define_touch_switch(102, 98 , 126, 122, 13, 14, 'C', 'M'), ... % MANUAL CONTROL TRACK 1 define_touch_switch(190, 60 , 222, 90 , 21, 22, 'C', '2'), ... % ACTIVATE TRACK 2 define_touch_switch(194, 98 , 218, 122, 23, 61, 'C', 'M') ... % MANUAL CONTROL TRACK 2 -])); + ])); pause(0.5); matlabclient(1, get_smallpackage([ ... - put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME + put_text(160, 120, 'C', '13.0'), ... % CURRENT REFERENCE TIME define_touch_key( 98 , 110, 130, 140, 41, 42, 'C', '-'), ... % DECREASE REFERENCE TIME define_touch_key( 190, 110, 220, 140, 43, 44, 'C', '+'), ... % INCREASE REFERENCE TIME define_touch_key( 272, 192, 304, 224, 31, 32, 'C', 'S') ... % START BUTTON %TODO CLEAR BUTTON -])); + ])); %% CHECK DISPLAY BUTTONS display.last_check = tic; @@ -85,8 +85,8 @@ done = false; while 1 pause(0.1); if toc(display.last_check) > 0.4 - display.last_check = tic; - + display.last_check = tic; + % read internal mem from last send [display.out, display.shm] = matlabclient(2); [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); @@ -146,9 +146,9 @@ end ref_time = input('Vilken referenstid ska användas? [13] ', 's'); ref_time = str2double(ref_time); if isnan(ref_time) - ref_time = 13; -elseif not(isreal(ref_time)) - ref_time = 13; + ref_time = 13; + elseif not(isreal(ref_time)) + ref_time = 13; end %} @@ -181,52 +181,6 @@ while 1 disp('stopped by car 2'); break; end -<<<<<<< HEAD - - %% END OF LOOP - while 1 %Whileloop med paus som k�rs till pausen �verskridit 0.07 sekunder - % DISPLAY - display.send_delay = tic; - 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))]; - end - if car2.running && car2.automatic - % display.data = [display.data, put_text(20, 16 + (16 * 2), 'L', num2str(car2.u))]; - display.data = [display.data, update_bar_graph(2, car2.u)]; - end - - % send all queued data - if ~isempty(display.data) - [display.out] = matlabclient(1, get_smallpackage(display.data)); - display.data = []; - end - display.last_send = tic; - - % read internal mem from last send - [display.out, display.shm] = matlabclient(2); - [display.shm_interp.ack, display.shm_interp.start_code, display.shm_interp.data] = get_response(display.shm); - - % request internal mem - % matlabclient(1, hex2dec(['12'; '01'; '53'; '66'])); - end - % disp(strjoin({'display took additional ', num2str(toc(display.send_delay))})); - % ACTUAL END OF LOOP - 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 - if t > 0.1 - % beep; - end - break; - end - pause(0.001); - end -======= %% END OF LOOP while 1 %Whileloop med paus som k�rs till pausen �verskridit 0.07 sekunder @@ -235,10 +189,11 @@ 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))]; + display.data = [display.data, update_bar_graph(2, car2.u)]; end % send all queued data @@ -270,7 +225,6 @@ while 1 end pause(0.001); end ->>>>>>> respond to buttons pressed + indents end %% END OF PROGRAM -- cgit v1.2.1