Commit Graph

53 Commits

Author SHA1 Message Date
Michele 3e1b63c201 continued handshaking tree, not finished 2022-03-03 12:11:20 +01:00
Michele b49b9d98c3 started arbiter tree 2022-03-03 12:11:20 +01:00
alexmadison c61a570f80 fixed wiring bug in prog delay 2022-03-02 15:11:22 +01:00
alexmadison c580d21efe fixed supply in fifo_t 2022-03-02 11:24:28 +01:00
alexmadison 8060051da0 Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev 2022-03-02 09:48:11 +01:00
alexmadison b456ea40fd changed delayprog to outin vs ya naming scheme 2022-03-02 09:48:05 +01:00
Michele 9f5bbc487d some more supplies added, need still to run all the codes 2022-03-01 19:02:10 +01:00
Michele c99ed439a6 added supply also to sigbuf in fifo 2022-03-01 18:57:06 +01:00
Michele d507deba84 Merge remote-tracking branch 'origin/dev' into dev 2022-03-01 18:51:10 +01:00
Michele 3d273b164d added power supply to sigbuf in fifo_t 2022-03-01 18:51:06 +01:00
Greatorex b15d8c11e9 Merge remote-tracking branch 'origin/dev' into dev 2022-03-01 17:56:39 +01:00
Greatorex ba5e695be5 finished and simmed demuxtd 2022-03-01 17:56:30 +01:00
Michele 357df7f66e merge tested with concurrent inputs work 2022-03-01 17:36:49 +01:00
Michele 018b308f61 Merge remote-tracking branch 'origin/dev' into dev 2022-03-01 17:14:15 +01:00
Michele 97784db492 merge with simple test is working 2022-03-01 17:14:10 +01:00
alexmadison 233c9a7d10 cleaned up minor 2022-03-01 15:27:27 +01:00
alexmadison 00869fc16e programmable delay tested 2022-03-01 15:26:43 +01:00
Michele 0a8496d4f7 Merge remote-tracking branch 'origin/dev' into dev 2022-03-01 13:26:32 +01:00
Michele 340a20e49e Added merge, syntax clean but violating dual rail 2022-03-01 13:26:29 +01:00
alexmadison c947b28b03 added yours truely to the authors 2022-03-01 10:18:32 +01:00
alexmadison aeed4e5527 changed c->v tree in buf_s 2022-03-01 10:15:23 +01:00
alexmadison a8b1710f65 merged buf_s into primitives 2022-03-01 10:09:08 +01:00
Michele 8b40e70058 differentiated between ctree and vtree, all primitives updated 2022-03-01 09:44:51 +01:00
Michele 92b0b36325 pushed merge in primitives.act 2022-02-28 18:58:32 +01:00
alexmadison 3fc4b1fb1a buf_s_tempalte init 2022-02-28 18:27:03 +01:00
Michele c96a154833 Merge remote-tracking branch 'origin/dev' into dev 2022-02-28 11:11:51 +01:00
Michele 2afec288a8 fifo_test_adv works 2022-02-28 11:11:30 +01:00
Greatorex 705adcfc87 started demuxtd 2022-02-28 09:46:26 +01:00
Michele b94715b6d9 buffer_t and fifo_t_15 work 2022-02-28 09:39:36 +01:00
M. Mastella c06912d446 Merge remote-tracking branch 'origin/dev' into dev 2022-02-25 19:16:44 +01:00
M. Mastella 72bccc295b started token buffer and token fifo. conmtinued arbiter tb 2022-02-25 19:16:40 +01:00
Greatorex e9f0f4ac0f Added Demux 2022-02-25 15:16:38 +01:00
Greatorex dbb7107da0 Demux Simmed, fixed treegates 2022-02-25 15:13:21 +01:00
Michele 8057bf54d3 Continued test arbiter_handshake, no results 2022-02-24 19:02:37 +01:00
Michele 4819635e35 continued arbitrer_handshake test (still doesn't work) 2022-02-24 16:47:24 +01:00
M. Mastella 739aadbc4d Merged with Hugh mux (mux doesn't compile 2022-02-23 19:02:56 +01:00
M. Mastella 6f53a76dbc Added arbiter_handshake 2022-02-23 19:01:54 +01:00
Greatorex d98ddf37c5 Errors on demux fixed 2022-02-23 16:02:11 +01:00
Greatorex 10446c43c8 Finished demux again 2022-02-23 15:51:22 +01:00
Greatorex d545221e88 Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 15:49:43 +01:00
Greatorex 5f74b285a4 Finished demux 2022-02-23 15:49:36 +01:00
M. Mastella f2a388fb09 Auto stash before merge of "dev" and "origin/dev" 2022-02-23 12:51:02 +01:00
M. Mastella 4bf13b4859 Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 11:36:27 +01:00
M. Mastella 84cc93d2e1 Added merge empty func 2022-02-23 11:36:15 +01:00
Greatorex 04baa491eb Fixed buffer again in FORK 2022-02-23 11:35:16 +01:00
Greatorex 6dbc87c455 Merge remote-tracking branch 'origin/dev' into dev 2022-02-23 11:34:02 +01:00
Greatorex 39e863aa92 Fixed Buffer and Started MUX 2022-02-23 11:32:16 +01:00
M. Mastella 864460a68a Fork template done (basic simulation works) 2022-02-23 11:26:11 +01:00
M. Mastella 53d11963fb Async buffer test fully working 2022-02-22 18:04:21 +01:00
Greatorex 7e86815e28 attempting to complete the buffer 2022-02-22 13:52:54 +01:00