Skip to content

Commit 16adbe4

Browse files
committed
The core doesn't like sideset_pin_count=0, so don't send it
1 parent d16bd7e commit 16adbe4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

adafruit_pioasm.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,12 @@ def __init__(self, text_program: str, *, build_debuginfo=False) -> None:
224224
# print(bin(assembled[-1]))
225225

226226
self.pio_kwargs = {
227-
"sideset_pin_count": sideset_count,
228227
"sideset_enable": sideset_enable,
229228
}
230229

230+
if sideset_count != 0:
231+
self.pio_kwargs["sideset_pin_count"] = sideset_count
232+
231233
if wrap is not None:
232234
self.pio_kwargs["wrap"] = wrap
233235
if wrap_target is not None:
@@ -255,9 +257,8 @@ def print_c_program(self, name, qualifier="const"):
255257
print(
256258
f"{qualifier} int {name}_wrap_target = {self.pio_kwargs.get('wrap_target', 0)};"
257259
)
258-
print(
259-
f"{qualifier} int {name}_sideset_pin_count = {self.pio_kwargs['sideset_pin_count']};"
260-
)
260+
sideset_pin_count = self.pio_kwargs.get("sideset_pin_count", 0)
261+
print(f"{qualifier} int {name}_sideset_pin_count = {sideset_pin_count};")
261262
print(
262263
f"{qualifier} bool {name}_sideset_enable = {self.pio_kwargs['sideset_enable']};"
263264
)

tests/testpioasm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def testLimits(self):
111111
self.assertAssemblyFails(".side_set 1 opt\nnop side 0 [8]")
112112

113113
def testCls(self):
114-
self.assertPioKwargs("", sideset_pin_count=0, sideset_enable=False)
114+
self.assertPioKwargs("", sideset_enable=False)
115115
self.assertPioKwargs(".side_set 1", sideset_pin_count=1, sideset_enable=False)
116116
self.assertPioKwargs(
117117
".side_set 3 opt", sideset_pin_count=3, sideset_enable=True
@@ -143,7 +143,6 @@ def testWrap(self):
143143
self.assertAssemblyFails(".wrap")
144144
self.assertPioKwargs(
145145
"nop\n.wrap_target\nnop\nnop\n.wrap",
146-
sideset_pin_count=0,
147146
sideset_enable=False,
148147
wrap=2,
149148
wrap_target=1,

0 commit comments

Comments
 (0)