Skip to content

Commit eaeab32

Browse files
jeplerjepler
authored
Merge pull request adafruit#1431 from dherrada/pulseio-to-pwmio
Moved pulseio.PWMOut to pwmio.PWMOut
2 parents d3f0d5e + dae70f4 commit eaeab32

File tree

66 files changed

+151
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+151
-144
lines changed

‎3D_Printed_Bionic_Eye/3D_Printed_Bionic_Eye.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import time
2020
import random
2121
import board
22-
import pulseio
22+
import pwmio
2323
from adafruit_motor import servo
2424

2525
# we are intentionally avoiding Trinket Pin #1 (board.A0)
@@ -28,8 +28,8 @@
2828
rotate_servo_pin = board.A1 # servo control line (orange) Trinket Pin #2
2929

3030
# servo object setup for the M0 boards:
31-
tilt_pwm = pulseio.PWMOut(tilt_servo_pin, duty_cycle=2 ** 15, frequency=50)
32-
rotate_pwm = pulseio.PWMOut(rotate_servo_pin, duty_cycle=2 ** 15, frequency=50)
31+
tilt_pwm = pwmio.PWMOut(tilt_servo_pin, duty_cycle=2 ** 15, frequency=50)
32+
rotate_pwm = pwmio.PWMOut(rotate_servo_pin, duty_cycle=2 ** 15, frequency=50)
3333
tilt_servo = servo.Servo(tilt_pwm)
3434
rotate_servo = servo.Servo(rotate_pwm)
3535

‎Adafruit_LED_Sequins/Adafruit_LED_Sequins.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import time
22

33
import board
4-
import pulseio
4+
import pwmio
55
from digitalio import DigitalInOut, Direction
66

77
# PWM (fading) LEDs are connected on D0 (PWM not avail on D1)
88
pwm_leds = board.D0
9-
pwm = pulseio.PWMOut(pwm_leds, frequency=1000, duty_cycle=0)
9+
pwm = pwmio.PWMOut(pwm_leds, frequency=1000, duty_cycle=0)
1010

1111
# digital LEDs connected on D2
1212
digital_leds = DigitalInOut(board.D2)

‎Adafruit_Prop_Maker_FeatherWing/Prop_Maker_3W_LED_Simpletest.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"""Simple rainbow swirl example for 3W LED"""
2-
import pulseio
2+
import pwmio
33
import board
44
import digitalio
55

66
enable = digitalio.DigitalInOut(board.D10)
77
enable.direction = digitalio.Direction.OUTPUT
88
enable.value = True
99

10-
red = pulseio.PWMOut(board.D11, duty_cycle=0, frequency=20000)
11-
green = pulseio.PWMOut(board.D12, duty_cycle=0, frequency=20000)
12-
blue = pulseio.PWMOut(board.D13, duty_cycle=0, frequency=20000)
10+
red = pwmio.PWMOut(board.D11, duty_cycle=0, frequency=20000)
11+
green = pwmio.PWMOut(board.D12, duty_cycle=0, frequency=20000)
12+
blue = pwmio.PWMOut(board.D13, duty_cycle=0, frequency=20000)
1313

1414

1515
def wheel(pos):

‎Annoy_O_Matic/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import time
44

55
import board
6-
import pulseio
6+
import pwmio
77

88
# pylint: disable=unused-variable,consider-using-enumerate,redefined-outer-name,too-many-locals
9-
piezo = pulseio.PWMOut(board.D0, duty_cycle=0, frequency=440,
9+
piezo = pwmio.PWMOut(board.D0, duty_cycle=0, frequency=440,
1010
variable_frequency=True)
1111

1212
# pick the mode here:

‎AutoSunglasses/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
import time
1616
import board
17-
import pulseio
17+
import pwmio
1818
from adafruit_circuitplayground.express import cpx
1919
from adafruit_motor import servo
2020

21-
pwm = pulseio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
21+
pwm = pwmio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
2222
my_servo = servo.Servo(pwm)
2323

2424
cpx.pixels.fill((0, 0, 0))

‎BLE_Candy_Claw/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import time
22
import board
3-
import pulseio
3+
import pwmio
44
from adafruit_motor import servo
55
from adafruit_bluefruit_connect.packet import Packet
66
from adafruit_bluefruit_connect.button_packet import ButtonPacket
@@ -12,7 +12,7 @@
1212
uart = UARTService()
1313
advertisement = ProvideServicesAdvertisement(uart)
1414

15-
pwm = pulseio.PWMOut(board.A3, duty_cycle=2 ** 15, frequency=50)
15+
pwm = pwmio.PWMOut(board.A3, duty_cycle=2 ** 15, frequency=50)
1616

1717
my_servo = servo.Servo(pwm)
1818

‎BowsetteCrown/LED_GEMMA_Crown.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import time
22

33
import board
4-
import pulseio
4+
import pwmio
55

66
# PWM (fading) LEDs are connected on D0, D2 (PWM not avail on D1)
77
pwm_leds = board.D2
8-
pwm = pulseio.PWMOut(pwm_leds, frequency=1000, duty_cycle=0)
8+
pwm = pwmio.PWMOut(pwm_leds, frequency=1000, duty_cycle=0)
99

1010
pwm2_leds = board.D0
11-
pwm2 = pulseio.PWMOut(pwm2_leds, frequency=1000, duty_cycle=0)
11+
pwm2 = pwmio.PWMOut(pwm2_leds, frequency=1000, duty_cycle=0)
1212

1313
brightness = 0 # how bright the LED is
1414
fade_amount = 1285 # 2% steping of 2^16

‎Buckaroo_Plant_Care_Bot/buckaroo_plant_care_bot.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from adafruit_display_text import label
99
import displayio
1010
import terminalio
11-
import pulseio
11+
import pwmio
1212

1313
moist_level = 50 # adjust this value as needed for your plant
1414

@@ -56,7 +56,7 @@
5656
motor = DigitalInOut(board.P2)
5757
motor.direction = Direction.OUTPUT
5858

59-
buzzer = pulseio.PWMOut(board.SPEAKER, variable_frequency=True)
59+
buzzer = pwmio.PWMOut(board.SPEAKER, variable_frequency=True)
6060
buzzer.frequency = 1000
6161

6262
sense_pin = board.P1

‎CLUE_Egg_Drop/clue_egg_drop.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import math
33
import board
44
from digitalio import DigitalInOut, Direction, Pull
5-
import pulseio
5+
import pwmio
66
from adafruit_lsm6ds.lsm6ds33 import LSM6DS33
77
from adafruit_lsm6ds import AccelRange, AccelHPF, Rate
88
from adafruit_display_text import label
@@ -50,7 +50,7 @@
5050
sensor.high_pass_filter_enabled = True
5151

5252
# and make a lil buzzer
53-
buzzer = pulseio.PWMOut(board.SPEAKER, variable_frequency=True)
53+
buzzer = pwmio.PWMOut(board.SPEAKER, variable_frequency=True)
5454
buzzer.frequency = 1000
5555

5656
max_slope = 0

‎CLUE_Hand_Wash_Timer/clue_hand_wash_timer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from adafruit_display_text import label
1111
from adafruit_bitmap_font import bitmap_font
1212
import displayio
13-
import pulseio
13+
import pwmio
1414

1515
clue.display.brightness = 0.8
1616
clue_display = displayio.Group(max_size=4)
@@ -74,7 +74,7 @@ def countdown(seconds):
7474
timer_label.text = ("Wave to start")
7575

7676
# setup buzzer
77-
buzzer = pulseio.PWMOut(board.SPEAKER, variable_frequency=True)
77+
buzzer = pwmio.PWMOut(board.SPEAKER, variable_frequency=True)
7878
buzzer.frequency = 1000
7979

8080
while True:

‎CLUE_Metal_Detector/clue-metal-detector.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import gc
4242

4343
import board
44-
import pulseio
44+
import pwmio
4545
import analogio
4646
import ulab
4747

@@ -483,7 +483,7 @@ def sample_sum(pin, num):
483483
# Start pwm output on P0 or A1
484484
# 400kHz and 55000 (84%) duty_cycle were chosen empirically to maximise
485485
# the voltage and the voltage drop detecting a small pair of metal scissors
486-
pwm = pulseio.PWMOut(board_pin_output, frequency=400 * 1000,
486+
pwm = pwmio.PWMOut(board_pin_output, frequency=400 * 1000,
487487
duty_cycle=0, variable_frequency=True)
488488
pwm.duty_cycle = 55000
489489

‎CP101_StateMachines/brute-force/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import adafruit_ds3231
2323
import audioio
2424
import audiocore
25-
import pulseio
25+
import pwmio
2626
from adafruit_motor import servo
2727
import neopixel
2828
from adafruit_debouncer import Debouncer
@@ -79,7 +79,7 @@
7979
switch = Debouncer(switch_io)
8080

8181
# create a PWMOut object on Pin A2.
82-
pwm = pulseio.PWMOut(SERVO_PIN, duty_cycle=2 ** 15, frequency=50)
82+
pwm = pwmio.PWMOut(SERVO_PIN, duty_cycle=2 ** 15, frequency=50)
8383

8484
# Create a servo object, my_servo.
8585
servo = servo.ContinuousServo(pwm)

‎CP101_StateMachines/classes/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import adafruit_ds3231
2323
import audioio
2424
import audiocore
25-
import pulseio
25+
import pwmio
2626
from adafruit_motor import servo
2727
import neopixel
2828
from adafruit_debouncer import Debouncer
@@ -67,7 +67,7 @@
6767
switch = Debouncer(switch_io)
6868

6969
# create a PWMOut object on Pin A2.
70-
pwm = pulseio.PWMOut(SERVO_PIN, duty_cycle=2 ** 15, frequency=50)
70+
pwm = pwmio.PWMOut(SERVO_PIN, duty_cycle=2 ** 15, frequency=50)
7171

7272
# Create a servo object, my_servo.
7373
servo = servo.ContinuousServo(pwm)

‎CPX_Marble_Maze/code.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Adafruit Industries, 2019. MIT License
33
import time
44
import board
5-
import pulseio
5+
import pwmio
66
from adafruit_motor import servo
77
import simpleio
88
from adafruit_circuitplayground.express import cpx
99

1010
# create a PWMOut object on Pin A2.
11-
pwm1 = pulseio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
12-
pwm2 = pulseio.PWMOut(board.A2, duty_cycle=2 ** 15, frequency=50)
11+
pwm1 = pwmio.PWMOut(board.A1, duty_cycle=2 ** 15, frequency=50)
12+
pwm2 = pwmio.PWMOut(board.A2, duty_cycle=2 ** 15, frequency=50)
1313

1414
# Create a servo object, my_servo.
1515
my_servo1 = servo.Servo(pwm1)

‎CircuitPython_101/basic_data_structures/play_note/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import time
22
import board
3-
import pulseio
3+
import pwmio
44

55
C4 = 261
66
C_SH_4 = 277
@@ -17,7 +17,7 @@
1717

1818
def play_note(note):
1919
if note[0] != 0:
20-
pwm = pulseio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
20+
pwm = pwmio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
2121
# Hex 7FFF (binary 0111111111111111) is half of the largest value for a 16-bit int,
2222
# i.e. 50%
2323
pwm.duty_cycle = 0x7FFF

‎CircuitPython_101/basic_data_structures/song_book/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from adafruit_debouncer import Debouncer
44
import busio as io
55
import digitalio
6-
import pulseio
6+
import pwmio
77
import adafruit_ssd1306
88

99
i2c = io.I2C(board.SCL, board.SDA)
@@ -56,7 +56,7 @@
5656

5757
def play_note(note):
5858
if note[0] != 0:
59-
pwm = pulseio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
59+
pwm = pwmio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
6060
# Hex 7FFF (binary 0111111111111111) is half of the largest value for a 16-bit int,
6161
# i.e. 50%
6262
pwm.duty_cycle = 0x7FFF

‎CircuitPython_101/basic_data_structures/song_list/code.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import time
22
import board
3-
import pulseio
3+
import pwmio
44

55
C4 = 261
66
C_SH_4 = 277
@@ -20,7 +20,7 @@
2020

2121
def play_note(note):
2222
if note[0] != 0:
23-
pwm = pulseio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
23+
pwm = pwmio.PWMOut(board.D12, duty_cycle = 0, frequency=note[0])
2424
# Hex 7FFF (binary 0111111111111111) is half of the largest value for a 16-bit int,
2525
# i.e. 50%
2626
pwm.duty_cycle = 0x7FFF

‎CircuitPython_Essentials/CircuitPython_Continuous_Servo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""CircuitPython Essentials Servo continuous rotation servo example"""
22
import time
33
import board
4-
import pulseio
4+
import pwmio
55
from adafruit_motor import servo
66

77
# create a PWMOut object on Pin A2.
8-
pwm = pulseio.PWMOut(board.A2, frequency=50)
8+
pwm = pwmio.PWMOut(board.A2, frequency=50)
99

1010
# Create a servo object, my_servo.
1111
my_servo = servo.ContinuousServo(pwm)

‎CircuitPython_Essentials/CircuitPython_PWM.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"""CircuitPython Essentials: PWM with Fixed Frequency example."""
22
import time
33
import board
4-
import pulseio
4+
import pwmio
55

66
# LED setup for most CircuitPython boards:
7-
led = pulseio.PWMOut(board.D13, frequency=5000, duty_cycle=0)
7+
led = pwmio.PWMOut(board.D13, frequency=5000, duty_cycle=0)
88
# LED setup for QT Py M0:
9-
# led = pulseio.PWMOut(board.SCK, frequency=5000, duty_cycle=0)
9+
# led = pwmio.PWMOut(board.SCK, frequency=5000, duty_cycle=0)
1010

1111
while True:
1212
for i in range(100):

‎CircuitPython_Essentials/CircuitPython_PWM_Piezo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""CircuitPython Essentials PWM with variable frequency piezo example"""
22
import time
33
import board
4-
import pulseio
4+
import pwmio
55

66
# For the M0 boards:
7-
piezo = pulseio.PWMOut(board.A2, duty_cycle=0, frequency=440, variable_frequency=True)
7+
piezo = pwmio.PWMOut(board.A2, duty_cycle=0, frequency=440, variable_frequency=True)
88

99
# For the M4 boards:
10-
# piezo = pulseio.PWMOut(board.A1, duty_cycle=0, frequency=440, variable_frequency=True)
10+
# piezo = pwmio.PWMOut(board.A1, duty_cycle=0, frequency=440, variable_frequency=True)
1111

1212
while True:
1313
for f in (262, 294, 330, 349, 392, 440, 494, 523):

‎CircuitPython_Essentials/CircuitPython_Servo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""CircuitPython Essentials Servo standard servo example"""
22
import time
33
import board
4-
import pulseio
4+
import pwmio
55
from adafruit_motor import servo
66

77
# create a PWMOut object on Pin A2.
8-
pwm = pulseio.PWMOut(board.A2, duty_cycle=2 ** 15, frequency=50)
8+
pwm = pwmio.PWMOut(board.A2, duty_cycle=2 ** 15, frequency=50)
99

1010
# Create a servo object, my_servo.
1111
my_servo = servo.Servo(pwm)

‎CircuitPython_Essentials/PWM_Test_Script.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""CircuitPython Essentials PWM pin identifying script"""
22
import board
3-
import pulseio
3+
import pwmio
44

55
for pin_name in dir(board):
66
pin = getattr(board, pin_name)
77
try:
8-
p = pulseio.PWMOut(pin)
8+
p = pwmio.PWMOut(pin)
99
p.deinit()
1010
print("PWM on:", pin_name) # Prints the valid, PWM-capable pins!
1111
except ValueError: # This is the error returned when the pin is invalid.

‎CircuitPython_Quick_Starts/CircuitPython_PWM.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import time
22

33
import board
4-
import pulseio
4+
import pwmio
55

6-
led = pulseio.PWMOut(board.D13, frequency=5000, duty_cycle=0)
6+
led = pwmio.PWMOut(board.D13, frequency=5000, duty_cycle=0)
77

88
while True:
99
for i in range(100):

‎CircuitPython_Quick_Starts/CircuitPython_PWM_Piezo.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import time
22

33
import board
4-
import pulseio
4+
import pwmio
55

6-
piezo = pulseio.PWMOut(board.A2, duty_cycle=0,
6+
piezo = pwmio.PWMOut(board.A2, duty_cycle=0,
77
frequency=440, variable_frequency=True)
88

99
while True:

0 commit comments

Comments
 (0)