summaryrefslogtreecommitdiff
path: root/robot/problems/introduction/printcolors
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/printcolors
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/printcolors')
-rw-r--r--robot/problems/introduction/printcolors/common.py4
-rw-r--r--robot/problems/introduction/printcolors/naloga09_printColors.py3
-rw-r--r--robot/problems/introduction/printcolors/sl.py13
3 files changed, 15 insertions, 5 deletions
diff --git a/robot/problems/introduction/printcolors/common.py b/robot/problems/introduction/printcolors/common.py
index 4377c57..79f4d2a 100644
--- a/robot/problems/introduction/printcolors/common.py
+++ b/robot/problems/introduction/printcolors/common.py
@@ -11,8 +11,6 @@ visible = True
solution = '''\
import time
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
color_table = ['none', 'black', 'blue', 'green', 'yellow', 'red', 'white', 'brown']
@@ -24,7 +22,7 @@ robot.connect_sensor( 'color' )
robot.move_steering( 'on')
start = time.time()
color = -1
-while time.time()-start < 2.1:
+while time.time()-start < 1.2:
c = robot.color_sensor_measure('color')
if c!=color:
print( c, color_table[c])
diff --git a/robot/problems/introduction/printcolors/naloga09_printColors.py b/robot/problems/introduction/printcolors/naloga09_printColors.py
index 59dfdb0..2e9d323 100644
--- a/robot/problems/introduction/printcolors/naloga09_printColors.py
+++ b/robot/problems/introduction/printcolors/naloga09_printColors.py
@@ -17,8 +17,7 @@ Naloga 9:
import sys
sys.path.append('/home/user/codeq')
import time
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
+from mindstorms_widgets import *
color_table = ['none', 'black', 'blue', 'green', 'yellow', 'red', 'white', 'brown']
diff --git a/robot/problems/introduction/printcolors/sl.py b/robot/problems/introduction/printcolors/sl.py
index d233b0e..c705eaa 100644
--- a/robot/problems/introduction/printcolors/sl.py
+++ b/robot/problems/introduction/printcolors/sl.py
@@ -34,3 +34,16 @@ hint = {
'''<p><code>while time.time()-start < 1.1:</code>.</p>'''],
'print':['''<p>V zanki na zaslon izpisuj barvo, ki jo zazna robot.</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 barvni senzor.</li>
+ <li>Vklopimo oba motorja tako, da robot vozi naravnost.</li>
+ <li>V zanki naj robot bere barve in vsako izpiše na zaslon.</li>
+ <li>Zanka naj se konča po vnaprej določenem času, npr. 3 sekunde.</li>
+ <li>Ustavimo oba motorja.</li>
+</ol>'''
+]