diff options
author | Damien George <damien.p.george@gmail.com> | 2014-11-03 10:22:59 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-11-03 10:22:59 +0000 |
commit | 2cd79fa92484330e415cf0b400544ad90205a611 (patch) | |
tree | a85a115071d7dda8848525959692cd097f2c4c94 /docs/tutorial | |
parent | f6e825b42ebdb87ed38e8accf09a9b0098ecc3e4 (diff) | |
parent | bfd11a35dbed42040109b4e351d696839ab74af8 (diff) | |
download | micropython-2cd79fa92484330e415cf0b400544ad90205a611.tar.gz micropython-2cd79fa92484330e415cf0b400544ad90205a611.zip |
Merge branch 'szinya-master'
Diffstat (limited to 'docs/tutorial')
-rw-r--r-- | docs/tutorial/fading_led.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorial/fading_led.rst b/docs/tutorial/fading_led.rst index b40af3e3b1..0a4b5c5039 100644 --- a/docs/tutorial/fading_led.rst +++ b/docs/tutorial/fading_led.rst @@ -27,7 +27,7 @@ Code By examining the :ref:`quickref`, we see that ``X1`` is connected to channel 1 of timer 5 (``TIM5 CH1``). Therefore we will first create a ``Timer`` object for timer 5, then create a ``TimerChannel`` object for channel 1:: from pyb import Timer - from timer import sleep + from time import sleep # timer 5 will be created with a frequency of 100 Hz tim = pyb.Timer(5, freq=100) |