From b4e46b75f5e2a890b41d2e20a89767590e54ccb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDabkar?= <jure.zabkar@fri.uni-lj.si>
Date: Tue, 15 Dec 2015 10:34:40 +0100
Subject: Dodani plani za robotske probleme.

---
 robot/problems/introduction/gyro90/common.py |  3 ---
 robot/problems/introduction/gyro90/sl.py     | 11 +++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'robot/problems/introduction/gyro90')

diff --git a/robot/problems/introduction/gyro90/common.py b/robot/problems/introduction/gyro90/common.py
index 06b4f1d..78c5dca 100644
--- a/robot/problems/introduction/gyro90/common.py
+++ b/robot/problems/introduction/gyro90/common.py
@@ -10,9 +10,6 @@ number = 7
 visible = True
 
 solution = '''\
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
-
 robot = mindstorms_widgets()
 robot.connect_motor( 'left' )
 robot.connect_motor( 'right' )
diff --git a/robot/problems/introduction/gyro90/sl.py b/robot/problems/introduction/gyro90/sl.py
index 0a82c6d..c0f9451 100644
--- a/robot/problems/introduction/gyro90/sl.py
+++ b/robot/problems/introduction/gyro90/sl.py
@@ -27,3 +27,14 @@ hint = {
     'while':['''<p>Program naj teče dokler je kot zasuka manjši od 90 stopinj.</p>''',
              '''<p><code>robot.gyro_sensor_measure() < 90:</code></p>'''],
 }
+
+plan = ['''\
+<p>Program izvedemo v naslednjih korakih:</p>
+<ol>
+  <li>Naredimo objekt mindstorms_widgets(), s katerim predstavimo robota.</li>
+  <li>Nanj povežemo oba pogonska motorja.</li>
+  <li>Povežemo žiroskop in ga resetiramo.</li>
+  <li>Vklopimo oba motorja tako, da se vrtita z enako močjo, a v različnih smereh; robot se začne obračati na mestu.</li>
+  <li>V zanki merimo kot zasuka in zanko končamo, ko kot doseže 90 stopinj.</li>
+</ol>'''
+]
-- 
cgit v1.2.1


From 0883cb2a6b0bac23bd7553618f4e8db7c882a757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDabkar?= <jure.zabkar@fri.uni-lj.si>
Date: Tue, 15 Dec 2015 13:13:49 +0100
Subject: Popravki programov pred zagovorom projekta.

---
 robot/problems/introduction/gyro90/common.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'robot/problems/introduction/gyro90')

diff --git a/robot/problems/introduction/gyro90/common.py b/robot/problems/introduction/gyro90/common.py
index 78c5dca..1828001 100644
--- a/robot/problems/introduction/gyro90/common.py
+++ b/robot/problems/introduction/gyro90/common.py
@@ -18,11 +18,11 @@ robot.connect_sensor( 'gyro' )
 robot.gyro_set_mode( 'angle' )
 robot.reset_gyro()
 
-power = 15
+power = 10
 robot.move_tank( 'on', lr_power=[power,-power] )
 while robot.gyro_sensor_measure() < 90:
     pass
-robot.move_tank( 'off' )
+robot.move_tank( 'off', brake_at_end=True )
 '''
 
 hint_type = {
-- 
cgit v1.2.1