From c462be605d0a3f3e8d504b8038e2e892b27d2a08 Mon Sep 17 00:00:00 2001
From: alexmadison <git@mdsn.co.uk>
Date: Mon, 4 Apr 2022 17:48:20 +0200
Subject: [PATCH] chip wip

---
 dataflow_neuro/chips.act | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dataflow_neuro/chips.act b/dataflow_neuro/chips.act
index ecf4586..253be33 100644
--- a/dataflow_neuro/chips.act
+++ b/dataflow_neuro/chips.act
@@ -118,7 +118,7 @@ defproc chip_texel (bd<N_IN> in, out;
 	fifo<N_IN-1,N_BUFFERS> fifo_dmx2reg(.in = _demux.out2, .reset_B = reset_B, .supply = supply);
 	registerA_wr_array<REG_NCA, REG_NCW, REG_M> register(.in = fifo_dmx2reg.out, .data = reg_data,
 		.supply = supply, .reset_B = reset_B);
-	fifo<N_IN-2,N_BUFFERS> fifo_reg2mrg(.in = register.out)
+	fifo<N_IN-2,N_BUFFERS> fifo_reg2mrg(.in = register.out, .reset_B = reset_B, .supply = supply);
 
 	// TO ADD: nrn/syn mon decoders
 
@@ -133,6 +133,8 @@ defproc chip_texel (bd<N_IN> in, out;
 
 
 	// Neurons + encoder
+    pbool NC_NRN;
+    NC_NRN = NC_NRN_X + NC_NRN_Y;
 	nrn_hs_2D_array<N_NRN_X,N_NRN_Y,N_LINE_PD_DLY> nrn_grid(.in = neurons,
 		.supply = supply, .reset_B = reset_B);
 	encoder2D<NC_NRN_X, NC_NRN_Y, N_NRN_X, N_NRN_Y, 16> encoder(
@@ -140,10 +142,14 @@ defproc chip_texel (bd<N_IN> in, out;
 		.iny = nrn_grid.outy,
 		.reset_B = reset_B, .supply = supply
 		)
-	fifo<NC_NRN_X + NC_NRN_Y, N_BUFFERS> fifo_enc2mrg(.in = encoder.out,
+	fifo<NC_NRN, N_BUFFERS> fifo_enc2mrg(.in = encoder.out,
 		.reset_B = reset_B, .supply = supply);
+    append<NC_NRN, N_IN-NC_NRN,0> append_enc(.in = fifo_enc2mrg.in, )
 
 
+    // Merge
+
+    merge<> merge_enc8reg
 
 }
 }