summaryrefslogtreecommitdiff
path: root/robot/problems/introduction/square20
diff options
context:
space:
mode:
authorMartin Možina <martin.mozina@fri.uni-lj.si>2015-12-28 10:23:46 +0100
committerMartin Možina <martin.mozina@fri.uni-lj.si>2015-12-28 10:23:46 +0100
commit165c7165bb2184c9c9e0576a074ba4f29052bf8f (patch)
tree9b86dbbd1d4c39b52bfd7f54cfb13c2354727a53 /robot/problems/introduction/square20
parent4cdea335b0951e3c12dfb7b906f958d6b5be25c6 (diff)
parentc1bb0d56b2c0482c766d094c65fdf0fd9d1aa0ba (diff)
Merge branch 'master' of 192.168.15.97:codeq-problems
Conflicts: python/problems/functions/palindrome/sl.py python/problems/functions/palindromic_numbers/sl.py
Diffstat (limited to 'robot/problems/introduction/square20')
-rw-r--r--robot/problems/introduction/square20/common.py3
-rw-r--r--robot/problems/introduction/square20/sl.py11
2 files changed, 11 insertions, 3 deletions
diff --git a/robot/problems/introduction/square20/common.py b/robot/problems/introduction/square20/common.py
index a293712..ce8bc14 100644
--- a/robot/problems/introduction/square20/common.py
+++ b/robot/problems/introduction/square20/common.py
@@ -10,9 +10,6 @@ number = 4
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/square20/sl.py b/robot/problems/introduction/square20/sl.py
index f52ddf7..50b335f 100644
--- a/robot/problems/introduction/square20/sl.py
+++ b/robot/problems/introduction/square20/sl.py
@@ -27,3 +27,14 @@ hint = {
'lrPower': ['''<p>Za obrat na mestu se morata kolesi vrteti z enako močjo in v nasprotni smeri.</p>''',
'''<p><code>robot.move_tank( 'on_for_seconds', lr_power=[20,-20], seconds=.95 )</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>Vklopimo oba motorja tako, da robot vozi naravnost.</li>
+ <li>Robot se na mestu obrne za 90 stopinj; motorja z enako močjo, v različnih smereh.</li>
+ <li>Še 3-krat ponovimo koraka 3 in 4.</li>
+</ol>'''
+]