Skip to content

Commit e87189b

Browse files
authored
Merge pull request #456 from Lauszus/license
Fixed license header in Viewer
2 parents ea1d2f0 + 3e7b5e1 commit e87189b

File tree

2 files changed

+33
-5
lines changed

2 files changed

+33
-5
lines changed

can/viewer.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
# coding: utf-8
22
#
3-
# Copyright (C) 2018 Kristian Sloth Lauszus. All rights reserved.
3+
# Copyright (C) 2018 Kristian Sloth Lauszus.
4+
#
5+
# This program is free software; you can redistribute it and/or
6+
# modify it under the terms of the GNU Lesser General Public
7+
# License as published by the Free Software Foundation; either
8+
# version 3 of the License, or (at your option) any later version.
9+
#
10+
# This program is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
# Lesser General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU Lesser General Public License
16+
# along with this program; if not, write to the Free Software Foundation,
17+
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
418
#
519
# Contact information
620
# -------------------
@@ -370,11 +384,11 @@ def parse_args(args):
370384
metavar='{<id>:<format>,<id>:<format>:<scaling1>:...:<scalingN>,file.txt}',
371385
nargs=argparse.ONE_OR_MORE, default='')
372386

373-
optional.add_argument('-f', '--filter', help='R|Comma separated CAN filters for the given CAN interface:'
387+
optional.add_argument('-f', '--filter', help='R|Space separated CAN filters for the given CAN interface:'
374388
'\n <can_id>:<can_mask> (matches when <received_can_id> & mask == can_id & mask)'
375389
'\n <can_id>~<can_mask> (matches when <received_can_id> & mask != can_id & mask)'
376-
'\nFx to show only frames with ID 0x100 to 0x103:'
377-
'\n python -m can.viewer -f 100:7FC'
390+
'\nFx to show only frames with ID 0x100 to 0x103 and 0x200 to 0x20F:'
391+
'\n python -m can.viewer -f 100:7FC 200:7F0'
378392
'\nNote that the ID and mask are alway interpreted as hex values',
379393
metavar='{<can_id>:<can_mask>,<can_id>~<can_mask>}', nargs=argparse.ONE_OR_MORE, default='')
380394

test/test_viewer.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
#!/usr/bin/python
22
# coding: utf-8
33
#
4-
# Copyright (C) 2018 Kristian Sloth Lauszus. All rights reserved.
4+
# Copyright (C) 2018 Kristian Sloth Lauszus.
5+
#
6+
# This program is free software; you can redistribute it and/or
7+
# modify it under the terms of the GNU Lesser General Public
8+
# License as published by the Free Software Foundation; either
9+
# version 3 of the License, or (at your option) any later version.
10+
#
11+
# This program is distributed in the hope that it will be useful,
12+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14+
# Lesser General Public License for more details.
15+
#
16+
# You should have received a copy of the GNU Lesser General Public License
17+
# along with this program; if not, write to the Free Software Foundation,
18+
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
519
#
620
# Contact information
721
# -------------------

0 commit comments

Comments
 (0)