Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc/cores/led: Split LED-SHIFT in LED-READ/LED-SHIFT, simplify and fix off by one error.

This commit is contained in:
Florent Kermarrec 2021-12-27 14:06:04 +01:00
parent 2c68135eb4
commit 8ac3fbc039
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
litex/soc/cores/led.py
View File

@ -165,11 +165,11 @@ class WS2812(Module):
trst_timer.wait.eq(1), trst_timer.wait.eq(1),
If(trst_timer.done, If(trst_timer.done,
NextValue(led_count, 0), NextValue(led_count, 0),
NextState("LED-SHIFT") NextState("LED-READ")
) )
) )
if bus_mastering: if bus_mastering:
fsm.act("LED-SHIFT", fsm.act("LED-READ",
bus.stb.eq(1), bus.stb.eq(1),
bus.cyc.eq(1), bus.cyc.eq(1),
bus.we.eq(0), bus.we.eq(0),
@ -177,26 +177,16 @@ class WS2812(Module):
bus.adr.eq(bus_base[2:] + led_count), bus.adr.eq(bus_base[2:] + led_count),
If(bus.ack, If(bus.ack,
NextValue(bit_count, 24-1), NextValue(bit_count, 24-1),
NextValue(led_data, bus.dat_r), NextValue(led_data, bus.dat_r),
NextValue(led_count, led_count + 1), NextState("BIT-TEST")
If(led_count == (nleds-1),
NextState("RST")
).Else(
NextState("BIT-TEST")
)
) )
) )
else: else:
self.comb += port.adr.eq(led_count) self.comb += port.adr.eq(led_count)
fsm.act("LED-SHIFT", fsm.act("LED-READ",
NextValue(bit_count, 24-1), NextValue(bit_count, 24-1),
NextValue(led_data, port.dat_r), NextValue(led_data, port.dat_r),
NextValue(led_count, led_count + 1), NextState("BIT-TEST")
If(led_count == (nleds-1),
NextState("RST")
).Else(
NextState("BIT-TEST")
)
) )
fsm.act("BIT-TEST", fsm.act("BIT-TEST",
@ -232,3 +222,11 @@ class WS2812(Module):
NextState("BIT-TEST") NextState("BIT-TEST")
) )
) )
fsm.act("LED-SHIFT",
NextValue(led_count, led_count + 1),
If(led_count == (nleds-1),
NextState("RST")
).Else(
NextState("LED-READ")
)
)