nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

License changed to Apache 2.0 - part2

Browse source
This commit is contained in:
Janez 2020-01-08 18:31:31 +01:00
parent 9c2f0a1c64
commit eab1f2d54f
2 changed files with 25 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CANopen.h
View file

@ -50,8 +50,17 @@ extern "C" {
*
* CANopenNode homepage is https://github.com/CANopenNode/CANopenNode
*
* CANopenNode is distributed under the terms of the GNU General Public License
* version 2 with the classpath exception.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

54
README.md
View file

@ -109,7 +109,7 @@ Flowchart of a typical CANopenNode implementation
| from any node in the|
| CANopen network. |
-----------------------
-----------------------
| LSS client (optional) |
| |
@ -119,8 +119,8 @@ Flowchart of a typical CANopenNode implementation
| - Can request node |
| enumeration |
-----------------------
~~~
@ -224,40 +224,14 @@ For older history see http://sourceforge.net/p/canopennode/code_complete/
License
-------
CANopenNode is distributed under the terms of the GNU General Public
License version 2 with the classpath exception.
CANopenNode is free and open source software: you can redistribute
it and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation, either version 2 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
### GPL linking exception
CANopenNode can be easely used also in commercial embedded projects.
Following clarification and special
[linking exception to the GNU General Public License](https://en.wikipedia.org/wiki/GPL_linking_exception)
is included to the distribution terms of CANopenNode:
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole combination.
As a special exception, the copyright holders of this library give
you permission to link this library with independent modules to
produce an executable, regardless of the license terms of these
independent modules, and to copy and distribute the resulting
executable under terms of your choice, provided that you also meet,
for each linked independent module, the terms and conditions of the
license of that module. An independent module is a module which is
not derived from or based on this library. If you modify this
library, you may extend this exception to your version of the
library, but you are not obliged to do so. If you do not wish
to do so, delete this exception statement from your version.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.