Skip to content

Commit

Permalink
std_blocks: remove file_logger block
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Klotzbuecher <mk@mkio.de>
  • Loading branch information
kmarkus committed Jul 10, 2020
1 parent 76a71d9 commit 702c196
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 474 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This file tracks user visible API changes

## 0.9.1

- removed the deprecated `file_logger` block. This was messy and hard to
maintain. The preferred approach to log is now by using `ubx/mqueue`
blocks and `ubx-mq(1)`.

- `std_blocks`: cleanup block naming. all blocks under `std_blocks/`
are now called `ubx/BLOCKNAME`.

Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ std_blocks/const/Makefile
std_blocks/cppdemo/Makefile
std_blocks/hexdump/Makefile
std_blocks/lfds_buffers/Makefile
std_blocks/logging/Makefile
std_blocks/luablock/Makefile
std_blocks/math/Makefile
std_blocks/mqueue/Makefile
Expand Down
18 changes: 3 additions & 15 deletions examples/usc/composition/rndchain.usc
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
-- of block N is connected to the seed of random block N+1. The
-- system is constructed by hierarchically composing these blocks.

logger_report_conf = [[
{ { blockname='rnd0', portname="rnd" },
{ blockname='rnd1', portname="rnd" },
}
]]


return bd.system
{
-- include subsystems
Expand All @@ -19,29 +12,24 @@ return bd.system
},

imports = {
"stdtypes", "random", "ptrig", "lfds_cyclic", "logger",
"stdtypes", "random", "ptrig", "lfds_cyclic"
},

blocks = {
{ name='ptrig', type="ubx/ptrig" },
{ name="rnd0", type="ubx/random" },
{ name="logger", type="logging/file_logger" },
},

configurations = {
{ name="rnd0", config = { min_max_config={min=127, max=256} } },
{ name="ptrig", config = { period = {sec=1, usec=0 },
chain0={ { b="#rnd0", num_steps=1, measure=0 },
-- trigger the included subsystems trigger:
{ b="#trig", num_steps=1, measure=0 },
{ b="#logger", num_steps=1, measure=0 } } } },
{ b="#rnd1/trig", num_steps=1, measure=0 } } } },

{ name="logger", config = { filename="rndchain.log",
separator=",",
report_conf = logger_report_conf, } },
},

connections = {
{ src="rnd0.rnd", tgt="rnd1.seed" },
{ src="rnd0.rnd", tgt="rnd1/rnd1.seed" },
},
}
1 change: 0 additions & 1 deletion std_blocks/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ SUBDIRS = const \
examples \
hexdump \
lfds_buffers \
logging \
luablock \
math \
mqueue \
Expand Down
16 changes: 0 additions & 16 deletions std_blocks/logging/Makefile.am

This file was deleted.

220 changes: 0 additions & 220 deletions std_blocks/logging/file_logger.c

This file was deleted.

0 comments on commit 702c196

Please sign in to comment.