From e8476445b2eb4cc01f57a3291fd46b972d22fd34 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Sat, 18 Jun 2022 17:24:47 +0200
Subject: [PATCH] fix: use parallel ws2812 driver

---
 vhdl/splink.vhdl | 71 ++++++++++++++++++++++++++----------------------
 vhdl/ws2812_vhdl |  2 +-
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/vhdl/splink.vhdl b/vhdl/splink.vhdl
index 7cfbf4c..69aa3cb 100644
--- a/vhdl/splink.vhdl
+++ b/vhdl/splink.vhdl
@@ -2,6 +2,9 @@ library ieee;
 use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;
 
+use work.ws2812_pkg.color_t;
+use work.ws2812_pkg.colors_vector;
+
 entity splink is
 	generic (
 		NUM_STRANDS : positive;
@@ -24,12 +27,11 @@ end entity;
 
 architecture a of splink is
 	constant BITS_PER_LED: natural := 24;
-	subtype color_t is std_logic_vector(BITS_PER_LED-1 downto 0);
+
+	signal led_addr : std_logic_vector(7 downto 0);
+	signal led_colors : colors_vector(NUM_STRANDS-1 downto 0);
 
 	type led_data_t is record
-		addr : std_logic_vector(7 downto 0);
-		current_color : color_t;
-
 		was_written : std_logic;
 	end record;
 
@@ -56,43 +58,46 @@ architecture a of splink is
 	constant RESET_STATE : receive_state_t := MAGIC;
 	signal receive_state : receive_state_t;
 begin
+	ws2812_inst: entity work.ws2812_parallel
+		generic map (
+			NUM_DRIVERS => NUM_STRANDS,
+			NUM_LEDS => MAX_STRAND_LEN,
+			COLOR_ORDER => "GRB",
+			T_CLK => 12.5 ns,
+
+			T0H => 0.35 us,
+			T0L => 0.9 us,
+			T1H => 0.7 us,
+			T1L => 0.55 us,
+
+			T_RES => 80 us
+		)
+		port map (
+			n_reset => not reset,
+			clk     => clk,
+			run     => run,
+
+			led_addr => led_addr,
+
+			led_colors => led_colors,
+
+			dout => drivers
+		);
+
 	driver_gen: for i in 0 to NUM_STRANDS-1 generate
-		ws2812_inst: entity work.ws2812
-			generic map (
-				NUM_LEDS => MAX_STRAND_LEN,
-				COLOR_ORDER => "GRB",
-				T_CLK => 12.5 ns,
-
-				T0H => 0.35 us,
-				T0L => 0.8 us,
-				T1H => 0.7 us,
-				T1L => 0.6 us,
-
-				T_RES => 80 us
-			)
-			port map (
-				n_reset => not reset,
-				clk     => clk,
-				run     => run,
-
-				led_addr => led_data_arr(i).addr,
-
-				led_red   => led_data_arr(i).current_color(23 downto 16),
-				led_green => led_data_arr(i).current_color(15 downto 8),
-				led_blue  => led_data_arr(i).current_color(7 downto 0),
-
-				dout => drivers(i)
-			);
-
 		writer: process(clk)
 			type strand_store_t is array(0 to MAX_STRAND_LEN-1) of color_t;
 			variable strand_store: strand_store_t;
 		begin
 			if rising_edge(clk) then
-				led_data_arr(i).current_color <= strand_store(to_integer(unsigned(led_data_arr(i).addr)));
+				led_colors(i) <= strand_store(to_integer(unsigned(led_addr)));
 
 				if udp_valid = '1' and receive_state = DATA and active_strand = i then
-					strand_store(pixels_received) := udp_data(23 downto 0);
+					strand_store(pixels_received) := (
+						red => udp_data(23 downto 16),
+						green => udp_data(15 downto 8),
+						blue => udp_data(7 downto 0)
+					);
 
 					if pixels_received = num_pixels - 1 and udp_last = '1' then
 						led_data_arr(i).was_written <= '1';
diff --git a/vhdl/ws2812_vhdl b/vhdl/ws2812_vhdl
index 0d4146d..7232f66 160000
--- a/vhdl/ws2812_vhdl
+++ b/vhdl/ws2812_vhdl
@@ -1 +1 @@
-Subproject commit 0d4146d3a3abeb6a20f9228e61e58f95a71b340a
+Subproject commit 7232f6606ddbcb099f1723506d95f27b3058e243