Merge branch 'master' of 192.168.15.97:codeq-problems

Conflicts:
	python/problems/functions/palindrome/sl.py
	python/problems/functions/palindromic_numbers/sl.py

2 files changed, 23 insertions, 12 deletions

diff --git a/robot/problems/introduction/gyrosquare/common.py b/robot/problems/introduction/gyrosquare/common.py
index 5bf6068..79ae131 100644
--- a/robot/problems/introduction/gyrosquare/common.py
+++ b/robot/problems/introduction/gyrosquare/common.py
@@ -10,8 +10,7 @@ number = 8
 visible = True
 
 solution = '''\
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
+import time
 
 robot = mindstorms_widgets()
 robot.connect_motor( 'left' )
@@ -19,20 +18,21 @@ robot.connect_motor( 'right' )
 robot.connect_sensor( 'gyro' )
 
 robot.gyro_set_mode( 'angle' )
-robot.reset_gyro()
 
-power = 20
-def forward_and_turnRight(power, angle):
-    robot.move_steering( 'on_for_seconds', direction=0, power=power, seconds=2 )
+def forward_and_turnRight(power=10, angle=90):
+    robot.move_steering( 'on_for_seconds', direction=0, power=power, seconds=5 )
+    time.sleep(.5)
+    robot.reset_gyro()
+    robot.gyro_set_mode( 'angle' )
+    print(robot.gyro_sensor_measure( ))
     robot.move_tank( 'on', lr_power=[power,-power] )
-    while robot.gyro_sensor_measure( 'angle' ) < angle:
+    while robot.gyro_sensor_measure( ) < angle:
         pass    
-    robot.move_tank( 'off' )
+    robot.move_tank( 'off', brake_at_end=True  )
+    print(robot.gyro_sensor_measure( ))
 
-forward_and_turnRight(power,  89)
-forward_and_turnRight(power, 179)
-forward_and_turnRight(power, 269)
-forward_and_turnRight(power, 359)
+for i in range(4):
+    forward_and_turnRight()
 '''
 
 hint_type = {
diff --git a/robot/problems/introduction/gyrosquare/sl.py b/robot/problems/introduction/gyrosquare/sl.py
index 16b2c94..7d1f832 100644
--- a/robot/problems/introduction/gyrosquare/sl.py
+++ b/robot/problems/introduction/gyrosquare/sl.py
@@ -36,3 +36,14 @@ hint = {
     'seconds':['''<p>Napiši časovno omejitev v sekundah.</p>''',
                     '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, seconds=3 )</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>Napišemo funkcijo, ki robota pelje naravnost po stranici, nato pa ga na mestu obrne za 90 stopinj.</li>
+  <li>Zgornja funkcijo pokličemo 4-krat zaporedoma.</li>
+</ol>'''
+]