Skip to content

Commit effb80a

Browse files
committed
Licensing updates
1 parent fc2967f commit effb80a

18 files changed

+291
-143
lines changed

LICENSE

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
GNU LESSER GENERAL PUBLIC LICENSE
2-
Version 2.1, February 1999
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 2.1, February 1999
33

44
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
5-
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
66
Everyone is permitted to copy and distribute verbatim copies
77
of this license document, but changing it is not allowed.
88

99
[This is the first released version of the Lesser GPL. It also counts
1010
as the successor of the GNU Library Public License, version 2, hence
1111
the version number 2.1.]
1212

13-
Preamble
13+
Preamble
1414

1515
The licenses for most software are designed to take away your
1616
freedom to share and change it. By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow. Pay close attention to the difference between a
112112
former contains code derived from the library, whereas the latter must
113113
be combined with the library in order to run.
114114

115-
GNU LESSER GENERAL PUBLIC LICENSE
115+
GNU LESSER GENERAL PUBLIC LICENSE
116116
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
117117

118118
0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
146146
on the Library (independent of the use of the Library in a tool for
147147
writing it). Whether that is true depends on what the Library does
148148
and what the program that uses the Library does.
149-
149+
150150
1. You may copy and distribute verbatim copies of the Library's
151151
complete source code as you receive it, in any medium, provided that
152152
you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
432432
of all derivatives of our free software and of promoting the sharing
433433
and reuse of software generally.
434434

435-
NO WARRANTY
435+
NO WARRANTY
436436

437437
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
438438
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,4 +455,4 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
455455
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
456456
DAMAGES.
457457

458-
END OF TERMS AND CONDITIONS
458+
END OF TERMS AND CONDITIONS

README.md

+12
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,15 @@ The `--fix` option might be necessary if the OD-file contains internal
133133
inconsistencies. It is safe to run this option as it will not delete any active
134134
parameters. The `--drop-unused` will remove any unused *profile* and *DS-302*
135135
parameter that might be used in the file.
136+
137+
138+
## License
139+
140+
Objdictgen has been based on the python tool included in CanFestival. This
141+
original work from CanFestival is:
142+
143+
Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
144+
145+
The Python 3 port and tool improvements have been implemented under
146+
147+
Copyright (C) 2022 Svein Seldal, Laerdal Medical AS

src/objdictgen/__init__.py

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#
2+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
3+
#
4+
# This library is free software; you can redistribute it and/or
5+
# modify it under the terms of the GNU Lesser General Public
6+
# License as published by the Free Software Foundation; either
7+
# version 2.1 of the License, or (at your option) any later version.
8+
#
9+
# This library is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
# Lesser General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU Lesser General Public
15+
# License along with this library; if not, write to the Free Software
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
17+
# USA
18+
119
import os
220
import logging
321

src/objdictgen/__main__.py

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
#
2+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
3+
#
4+
# This library is free software; you can redistribute it and/or
5+
# modify it under the terms of the GNU Lesser General Public
6+
# License as published by the Free Software Foundation; either
7+
# version 2.1 of the License, or (at your option) any later version.
8+
#
9+
# This library is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12+
# Lesser General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU Lesser General Public
15+
# License along with this library; if not, write to the Free Software
16+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
17+
# USA
18+
119
from __future__ import absolute_import
220
from pprint import pformat
321
import sys

src/objdictgen/eds_utils.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of CanFestival, a library implementing CanOpen Stack.
3+
# This file is based on objdictgen from CanFestival
44
#
5-
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
67
#
7-
# See COPYING file for copyrights details.
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
812
#
9-
# This library is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU Lesser General Public
11-
# License as published by the Free Software Foundation; either
12-
# version 2.1 of the License, or (at your option) any later version.
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
1317
#
14-
# This library is distributed in the hope that it will be useful,
15-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
# Lesser General Public License for more details.
18-
#
19-
# You should have received a copy of the GNU Lesser General Public
20-
# License along with this library; if not, write to the Free Software
21-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
2222

2323
from __future__ import print_function
2424
from __future__ import absolute_import

src/objdictgen/gen_cfile.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of CanFestival, a library implementing CanOpen Stack.
3+
# This file is based on objdictgen from CanFestival
44
#
5-
# Copyright (C): Edouard TISSERANT and Francis DUPIN
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN
67
#
7-
# See COPYING file for copyrights details.
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
812
#
9-
# This library is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU Lesser General Public
11-
# License as published by the Free Software Foundation; either
12-
# version 2.1 of the License, or (at your option) any later version.
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
1317
#
14-
# This library is distributed in the hope that it will be useful,
15-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
# Lesser General Public License for more details.
18-
#
19-
# You should have received a copy of the GNU Lesser General Public
20-
# License along with this library; if not, write to the Free Software
21-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
2222

2323
from __future__ import absolute_import
2424
from builtins import range

src/objdictgen/jsonod.py

+17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
""" OD dict/json serialization and deserialization functions """
2+
#
3+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
4+
#
5+
# This library 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 2.1 of the License, or (at your option) any later version.
9+
#
10+
# This library 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
16+
# License along with this library; if not, write to the Free Software
17+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
18+
# USA
219

320
from datetime import datetime
421
import sys

src/objdictgen/maps.py

+20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
""" Object mappings """
2+
#
3+
# This file is based on objdictgen from CanFestival
4+
#
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
7+
#
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
12+
#
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
17+
#
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
222

323
#
424
# Dictionary of translation between access symbol and their signification

src/objdictgen/node.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of CanFestival, a library implementing CanOpen Stack.
3+
# This file is based on objdictgen from CanFestival
44
#
5-
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
67
#
7-
# See COPYING file for copyrights details.
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
812
#
9-
# This library is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU Lesser General Public
11-
# License as published by the Free Software Foundation; either
12-
# version 2.1 of the License, or (at your option) any later version.
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
1317
#
14-
# This library is distributed in the hope that it will be useful,
15-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
# Lesser General Public License for more details.
18-
#
19-
# You should have received a copy of the GNU Lesser General Public
20-
# License along with this library; if not, write to the Free Software
21-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
2222

2323
from __future__ import print_function
2424
from builtins import chr

src/objdictgen/nodelist.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of CanFestival, a library implementing CanOpen Stack.
3+
# This file is based on objdictgen from CanFestival
44
#
5-
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
67
#
7-
# See COPYING file for copyrights details.
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
812
#
9-
# This library is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU Lesser General Public
11-
# License as published by the Free Software Foundation; either
12-
# version 2.1 of the License, or (at your option) any later version.
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
1317
#
14-
# This library is distributed in the hope that it will be useful,
15-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
# Lesser General Public License for more details.
18-
#
19-
# You should have received a copy of the GNU Lesser General Public
20-
# License along with this library; if not, write to the Free Software
21-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
2222

2323
from __future__ import print_function
2424
from __future__ import absolute_import

src/objdictgen/nodemanager.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# -*- coding: utf-8 -*-
22
#
3-
# This file is part of CanFestival, a library implementing CanOpen Stack.
3+
# This file is based on objdictgen from CanFestival
44
#
5-
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
5+
# Copyright (C) 2022 Svein Seldal, Laerdal Medical AS
6+
# Copyright (C): Edouard TISSERANT, Francis DUPIN and Laurent BESSARD
67
#
7-
# See COPYING file for copyrights details.
8+
# This library is free software; you can redistribute it and/or
9+
# modify it under the terms of the GNU Lesser General Public
10+
# License as published by the Free Software Foundation; either
11+
# version 2.1 of the License, or (at your option) any later version.
812
#
9-
# This library is free software; you can redistribute it and/or
10-
# modify it under the terms of the GNU Lesser General Public
11-
# License as published by the Free Software Foundation; either
12-
# version 2.1 of the License, or (at your option) any later version.
13+
# This library is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
# Lesser General Public License for more details.
1317
#
14-
# This library is distributed in the hope that it will be useful,
15-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
# Lesser General Public License for more details.
18-
#
19-
# You should have received a copy of the GNU Lesser General Public
20-
# License along with this library; if not, write to the Free Software
21-
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18+
# You should have received a copy of the GNU Lesser General Public
19+
# License along with this library; if not, write to the Free Software
20+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
21+
# USA
2222

2323
from __future__ import absolute_import
2424
from builtins import object

0 commit comments

Comments
 (0)