Commit Graph

64 Commits

Author SHA1 Message Date
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 00869fc16e programmable delay tested 2022-03-01 15:26:43 +01:00
alexmadison 8268379572 bug to prev bug 2022-03-01 14:00:47 +01:00
alexmadison 18f84bc652 Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev 2022-03-01 13:55:47 +01:00
alexmadison 05f46ccf33 added try except for assert printing 2022-03-01 13:55:45 +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 fc4ccea3c0 added and tree 2022-03-01 12:22:36 +01:00
alexmadison a8b1710f65 merged buf_s into primitives 2022-03-01 10:09:08 +01:00
alexmadison 66cbbe3da7 unit tests working 2022-03-01 09:58:20 +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
Michele 1bb1d0be40 Merge remote-tracking branch 'origin/dev' into dev 2022-02-28 18:55:00 +01:00
Michele 2678dfc1e1 merge wrote, still need to test it 2022-02-28 18:54:52 +01:00
alexmadison 84b2831d89 buf_s_5 unit tests 2022-02-28 18:27:22 +01:00
alexmadison 5bae88d56f added flag to plot all times 2022-02-28 17:56:12 +01:00
alexmadison 225d481ae1 fifo t 5 unit tests checked 2022-02-28 15:52:20 +01:00
alexmadison 94109bb157 plotting in ex bugs 2022-02-28 15:44:24 +01:00
alexmadison e21e132d8b Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev 2022-02-28 13:57:32 +01:00
alexmadison 73ae3b0f19 added assert plots 2022-02-28 13:57:28 +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
alexmadison ee59fc9a44 fixed a plotting bug oops 2022-02-28 10:52:07 +01:00
alexmadison 6db6a2072b minor qol to plotting 2022-02-28 10:46:41 +01:00
alexmadison 1510746bfa merged w michele 2022-02-28 10:44:23 +01:00
alexmadison 9e4f090af2 added times and alternative colours 2022-02-28 10:21:43 +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 c20bfd74ee updated pdf of the result 2022-02-25 11:34:52 +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 6f53a76dbc Added arbiter_handshake 2022-02-23 19:01:54 +01:00
M. Mastella 97b0be5af0 trying arbiter 2022-02-23 15:30:01 +01:00
alexmadison 68fea3633e Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev 2022-02-23 14:59:58 +01:00
alexmadison 97f7489100 minor plotting qol changes 2022-02-23 14:59:56 +01:00
M. Mastella f2a388fb09 Auto stash before merge of "dev" and "origin/dev" 2022-02-23 12:51:02 +01:00
alexmadison 3405e471d1 added png output 2022-02-23 12:49:07 +01:00
alexmadison 84ea663fd8 Merge branch 'dev' of ssh://git.web.rug.nl:222/bics/actlib_dataflow_neuro into dev 2022-02-23 12:27:40 +01:00
alexmadison 404c403e83 init prsim plotter 2022-02-23 12:23:10 +01:00
Ole Richter 68f9728faa added bd helpers 2022-02-23 11:43:28 +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