From be94b55b835283de53c686343164641e15abe806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jure=20=C5=BDabkar?= <jure.zabkar@fri.uni-lj.si>
Date: Mon, 14 Dec 2015 12:44:58 +0100
Subject: Zadnje spremembe pred zagovorom.

---
 robot/problems/introduction/circle20/sl.py                      | 8 ++++++++
 robot/problems/introduction/countlines/common.py                | 3 +--
 robot/problems/introduction/countlines/naloga10_countLines.py   | 3 +--
 robot/problems/introduction/followline/naloga12_followLine.py   | 3 +--
 robot/problems/introduction/mindstorms_widgets_OLD.py           | 1 +
 robot/problems/introduction/printcolors/naloga09_printColors.py | 3 +--
 robot/problems/introduction/rotateback/common.py                | 1 -
 robot/problems/introduction/rotateback/naloga11_rotateBack.py   | 3 +--
 robot/problems/introduction/wall1m/common.py                    | 3 +--
 9 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'robot')

diff --git a/robot/problems/introduction/circle20/sl.py b/robot/problems/introduction/circle20/sl.py
index 219f9c7..abe70eb 100644
--- a/robot/problems/introduction/circle20/sl.py
+++ b/robot/problems/introduction/circle20/sl.py
@@ -24,3 +24,11 @@ hint = {
                '''<p>Za dani polmer izmeri čas, ki ga robot potrebuje za en obhod.</p>''',
                '''<p><code>robot.move_steering( 'on_for_seconds', direction=0, seconds=3 )</code>.</p>'''],
 }
+
+plan = [ '''\
+<p>1) Naredi robota</p>
+''',
+'''
+
+'''
+]
diff --git a/robot/problems/introduction/countlines/common.py b/robot/problems/introduction/countlines/common.py
index 5b8db2e..6a50988 100644
--- a/robot/problems/introduction/countlines/common.py
+++ b/robot/problems/introduction/countlines/common.py
@@ -11,8 +11,7 @@ visible = True
 
 solution = '''\
 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/countlines/naloga10_countLines.py b/robot/problems/introduction/countlines/naloga10_countLines.py
index d1a8326..7079f7c 100644
--- a/robot/problems/introduction/countlines/naloga10_countLines.py
+++ b/robot/problems/introduction/countlines/naloga10_countLines.py
@@ -7,8 +7,7 @@ Naloga 10:
 """
 
 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/followline/naloga12_followLine.py b/robot/problems/introduction/followline/naloga12_followLine.py
index 347e89e..e6e19a0 100644
--- a/robot/problems/introduction/followline/naloga12_followLine.py
+++ b/robot/problems/introduction/followline/naloga12_followLine.py
@@ -8,8 +8,7 @@ Naloga 12:
 import sys
 sys.path.append('/home/user/codeq')
 import time
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
+from mindstorms_widgets import *
 
 robot = mindstorms_widgets()
 robot.connect_motor( 'left' )
diff --git a/robot/problems/introduction/mindstorms_widgets_OLD.py b/robot/problems/introduction/mindstorms_widgets_OLD.py
index 4151133..f69f5c7 100644
--- a/robot/problems/introduction/mindstorms_widgets_OLD.py
+++ b/robot/problems/introduction/mindstorms_widgets_OLD.py
@@ -302,6 +302,7 @@ class mindstorms_widgets:
         if mode == 'on' and pulse:
             self._led_pulse( color )
             pass
+
     # the sensor should be perfectly still while resetting the gyro
     def resetGyro(self):
         self.gs.mode = 'GYRO-RATE'
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/rotateback/common.py b/robot/problems/introduction/rotateback/common.py
index 10cca87..2dacaf3 100644
--- a/robot/problems/introduction/rotateback/common.py
+++ b/robot/problems/introduction/rotateback/common.py
@@ -10,7 +10,6 @@ number = 11
 visible = True
 
 solution = '''\
-from ev3dev import *
 from mindstorms_widgets import mindstorms_widgets
 
 def sgn(x):
diff --git a/robot/problems/introduction/rotateback/naloga11_rotateBack.py b/robot/problems/introduction/rotateback/naloga11_rotateBack.py
index 0bab735..2677f05 100644
--- a/robot/problems/introduction/rotateback/naloga11_rotateBack.py
+++ b/robot/problems/introduction/rotateback/naloga11_rotateBack.py
@@ -2,12 +2,11 @@
 # coding=utf-8
 
 print ("""
-Naloga 11: 
+Naloga 11: Robot naj drži smer - če ga obrnemo iz začetne smeri, naj se zasuka nazaj v prvotno smer. Ob pritisku na stikalo, naj se resetira (smer nastavi na 0).
 """)
 import sys
 sys.path.append('/home/user/codeq')
 import time
-from ev3dev import *
 from mindstorms_widgets import mindstorms_widgets
 
 def sgn(x):
diff --git a/robot/problems/introduction/wall1m/common.py b/robot/problems/introduction/wall1m/common.py
index 07d1e1a..4492cdc 100644
--- a/robot/problems/introduction/wall1m/common.py
+++ b/robot/problems/introduction/wall1m/common.py
@@ -10,8 +10,7 @@ number = 6
 visible = True
 
 solution = '''\
-from ev3dev import *
-from mindstorms_widgets import mindstorms_widgets
+from mindstorms_widgets import *
 
 robot = mindstorms_widgets()
 robot.connect_motor( 'left' )
-- 
cgit v1.2.1