summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Sörnäs <gusso230@student.liu.se>2019-11-05 14:09:22 +0100
committerGustav Sörnäs <gusso230@student.liu.se>2019-11-05 14:10:31 +0100
commit111adec14ad9447d92fbea83dd9fefe5f8401af6 (patch)
treeaa2a433d8af3583fe99d9425950e1e35ff1ec87f
parentc0c7f3c7c3bab6e4e39568a3e37405cca26014e0 (diff)
downloadtfyy51-111adec14ad9447d92fbea83dd9fefe5f8401af6.tar.gz
Copy manual control from run_scalextric.m
See #44
-rw-r--r--Kod/bilbana/yc4/main.m10
1 files changed, 7 insertions, 3 deletions
diff --git a/Kod/bilbana/yc4/main.m b/Kod/bilbana/yc4/main.m
index 8af4735..8acf859 100644
--- a/Kod/bilbana/yc4/main.m
+++ b/Kod/bilbana/yc4/main.m
@@ -167,17 +167,21 @@ while 1
car2.u = get_new_u(car2.v, car2.car_constant, car2.track_u_constant);
end
+ % TEMP VARIABLES FOR MANUAL CONTROL
+ _mult = 100;
+ _max = 55;
+ _div = 55;
+
%% CONTROLLER (CAR 1)
if car1.running == true && car1.automatic == false
- % TODO
+ set_car_speed(1, _mult * ((_max - get_manual_speed(1)) / _div));
end
%% CONTROLLER (CAR 2)
if car2.running == true && car2.automatic == false
- % TODO
+ set_car_speed(2, _mult * ((_max - get_manual_speed(2)) / _div));
end
-
%% EXECUTE
if car1.running == true && car1.automatic == true
set_car_speed(1, car1.u);