From a4889ae84425f9245ff48f7ab97d5b294c9bbec3 Mon Sep 17 00:00:00 2001
From: Michele <michelemastella27@gmail.com>
Date: Thu, 3 Mar 2022 17:54:29 +0100
Subject: [PATCH] fixed conflict with Madison commit

---
 dataflow_neuro/coders.act | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dataflow_neuro/coders.act b/dataflow_neuro/coders.act
index fd4287e..6a6266f 100644
--- a/dataflow_neuro/coders.act
+++ b/dataflow_neuro/coders.act
@@ -226,9 +226,8 @@ namespace tmpl {
 		}
 
 
-		template<pint N, pint M, pint ACK_STRENGTH>
-		defproc encoder2D(a1of1 x[N]; a1of1 y[M] ;avMx1of2<X> addr; bool! out_a; power supply)
-		{
+		template<pint N, pint M,pint address_size, pint ACK_STRENGTH>
+		defproc encoder2D(a1of1 x[N]; a1of1 y[M] ;avMx1of2<address_size> addr; power supply; bool reset_B)		{
 			// Reset buffers
 			bool _reset_BX,_reset_BXX[H];
             BUF_X1 reset_buf(.a=reset_B, .y=_reset_BX,.vdd=supply.vdd,.vss=supply.vss);