Skip to content

Commit 7b94d42

Browse files
gigapodgigapod
authored
Merge pull request #57 from sparkfun/develop
Move license changes to main
2 parents 3b87387 + 8b28a24 commit 7b94d42

33 files changed

+143
-144
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#
2+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
3+
#
4+
# SPDX-License-Identifier: MIT
5+
#
16
cmake_minimum_required(VERSION 3.13)
27

38
# set project name - setting language to NONE disables the default compiler checks

‎LICENSE.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
SparkFun Data Logger License Information
2+
============================
3+
4+
Code
5+
--------
6+
7+
MIT License
8+
9+
Copyright (c) 2022-24 SparkFun Electronics
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy
12+
of this software and associated documentation files (the "Software"), to deal
13+
in the Software without restriction, including without limitation the rights
14+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
copies of the Software, and to permit persons to whom the Software is
16+
furnished to do so, subject to the following conditions:
17+
18+
The above copyright notice and this permission notice shall be included in all
19+
copies or substantial portions of the Software.
20+
21+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27+
SOFTWARE.

‎flux_sdk_import.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#
2+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
3+
#
4+
# SPDX-License-Identifier: MIT
5+
#
16
# ##################################################################################################
27
# include/import file for the flux-sdk cmake system
38
# ##################################################################################################

‎fuse_id/dl_build_conf.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env python
2-
2+
#
3+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
4+
#
5+
# SPDX-License-Identifier: MIT
6+
#
37
import os
48
import sys
59
import datetime

‎fuse_id/dl_fuseid.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
#--------------------------------------------------------------------------------
44
#
5-
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
6-
# This software includes information which is proprietary to and a
7-
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
8-
# to anyone outside of this organization. Reproduction by any means
9-
# whatsoever is prohibited without express written permission.
5+
#
6+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
7+
#
8+
# SPDX-License-Identifier: MIT
109
#
1110
#--------------------------------------------------------------------------------
1211

‎fuse_id/sfe_dl_fuseid/__init__.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11

2-
2+
#
3+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
4+
#
5+
# SPDX-License-Identifier: MIT
6+
#
37
# just import the entry point method
48

59
from .dl_fuseid import dl_fuseid

‎fuse_id/sfe_dl_fuseid/_dl_fuseid_.conf‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#--------------------------------------------------------------------------------
22
#
3-
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
4-
# This software includes information which is proprietary to and a
5-
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
6-
# to anyone outside of this organization. Reproduction by any means
7-
# whatsoever is prohibited without express written permission.
3+
#
4+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
5+
#
6+
# SPDX-License-Identifier: MIT
87
#
98
#--------------------------------------------------------------------------------
109

‎fuse_id/sfe_dl_fuseid/dl_fuseid.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#
33
#---------------------------------------------------------------------------------
44
#
5-
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
6-
# This software includes information which is proprietary to and a
7-
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
8-
# to anyone outside of this organization. Reproduction by any means
9-
# whatsoever is prohibited without express written permission.
5+
#
6+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
7+
#
8+
# SPDX-License-Identifier: MIT
9+
#
1010
#
1111
#---------------------------------------------------------------------------------
1212
#

‎fuse_id/sfe_dl_fuseid/dl_log.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#--------------------------------------------------------------------------------
22
#
3-
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
4-
# This software includes information which is proprietary to and a
5-
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
6-
# to anyone outside of this organization. Reproduction by any means
7-
# whatsoever is prohibited without express written permission.
3+
#
4+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
5+
#
6+
# SPDX-License-Identifier: MIT
7+
#
88
#
99
#--------------------------------------------------------------------------------
1010

‎fuse_id/sfe_dl_fuseid/dl_prefs.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
#--------------------------------------------------------------------------------
44
#
5-
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
6-
# This software includes information which is proprietary to and a
7-
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
8-
# to anyone outside of this organization. Reproduction by any means
9-
# whatsoever is prohibited without express written permission.
5+
#
6+
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
7+
#
8+
# SPDX-License-Identifier: MIT
9+
#
1010
#
1111
#--------------------------------------------------------------------------------
1212

0 commit comments

Comments
 (0)