Skip to content

Commit a0e043a

Browse files
Romaric-RILLETRomaric-RILLET
authored
Merge branch 'micropython:master' into master
2 parents 9c71d71 + 41ed01f commit a0e043a

File tree

88 files changed

+427
-258
lines changed

Some content is hidden

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

88 files changed

+427
-258
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
#all: Reformat remaining C code that doesn't have a space after a comma.
1+
# top: Update Python formatting to black "2023 stable style".
2+
8b2748269244304854b3462cb8902952b4dcb892
3+
4+
# all: Reformat remaining C code that doesn't have a space after a comma.
25
5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
36

47
# ports: Reformat more C and Python source code.

‎examples/SDdatalogger/datalogger.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
# loop
1212
while True:
13-
1413
# wait for interrupt
1514
# this reduces power consumption while waiting for switch press
1615
pyb.wfi()

‎examples/asmsum.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@micropython.asm_thumb
22
def asm_sum_words(r0, r1):
3-
43
# r0 = len
54
# r1 = ptr
65
# r2 = sum
@@ -25,7 +24,6 @@ def asm_sum_words(r0, r1):
2524

2625
@micropython.asm_thumb
2726
def asm_sum_bytes(r0, r1):
28-
2927
# r0 = len
3028
# r1 = ptr
3129
# r2 = sum

‎examples/bluetooth/ble_uart_repl.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
else:
2121
_timer = None
2222

23+
2324
# Batch writes into 50ms intervals.
2425
def schedule_in(handler, delay_ms):
2526
def _wrap(_arg):

‎examples/conwaylife.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
lcd = pyb.LCD("x")
55
lcd.light(1)
66

7+
78
# do 1 iteration of Conway's Game of Life
89
def conway_step():
910
for x in range(128): # loop over x coordinates

‎examples/rp2/pio_1hz.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Example using PIO to blink an LED and raise an IRQ at 1Hz.
2+
# Note: this does not work on Pico W because it uses Pin(25) for LED output.
23

34
import time
45
from machine import Pin

‎examples/rp2/pio_exec.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Example using PIO to turn on an LED via an explicit exec.
2+
# Note: this does not work on Pico W because it uses Pin(25) for LED output.
23
#
34
# Demonstrates:
45
# - using set_init and set_base
@@ -8,6 +9,7 @@
89
from machine import Pin
910
import rp2
1011

12+
1113
# Define an empty program that uses a single set pin.
1214
@rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
1315
def prog():

‎examples/rp2/pio_uart_tx.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def uart_tx():
3333
sm.active(1)
3434
uarts.append(sm)
3535

36+
3637
# We can print characters from each UART by pushing them to the TX FIFO
3738
def pio_uart_print(sm, s):
3839
for c in s:

‎examples/rp2/pwm_fade.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Example using PWM to fade an LED.
2+
# Note: this does not work on Pico W because it uses Pin(25) for LED output.
23

34
import time
45
from machine import Pin, PWM

‎extmod/uasyncio/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"StreamWriter": "stream",
1919
}
2020

21+
2122
# Lazy loader, effectively does:
2223
# global attr
2324
# from .mod import attr

0 commit comments

Comments
 (0)