diff options
| author | Martin Možina <martin.mozina@fri.uni-lj.si> | 2015-12-28 10:23:46 +0100 |
|---|---|---|
| committer | Martin Možina <martin.mozina@fri.uni-lj.si> | 2015-12-28 10:23:46 +0100 |
| commit | 165c7165bb2184c9c9e0576a074ba4f29052bf8f (patch) | |
| tree | 9b86dbbd1d4c39b52bfd7f54cfb13c2354727a53 /robot/problems/introduction/gyro90 | |
| parent | 4cdea335b0951e3c12dfb7b906f958d6b5be25c6 (diff) | |
| parent | c1bb0d56b2c0482c766d094c65fdf0fd9d1aa0ba (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/gyro90')
| -rw-r--r-- | robot/problems/introduction/gyro90/common.py | 7 | ||||
| -rw-r--r-- | robot/problems/introduction/gyro90/sl.py | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/robot/problems/introduction/gyro90/common.py b/robot/problems/introduction/gyro90/common.py index 06b4f1d..1828001 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' ) @@ -21,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 = { 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>''' +] |