Skip to content

Commit

Permalink
Merge pull request #57 from sparkfun/develop
Browse files Browse the repository at this point in the history
Move license changes to main
  • Loading branch information
gigapod authored Nov 13, 2024
2 parents 3b87387 + 8b28a24 commit 7b94d42
Show file tree
Hide file tree
Showing 33 changed files with 143 additions and 144 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
cmake_minimum_required(VERSION 3.13)

# set project name - setting language to NONE disables the default compiler checks
Expand Down
27 changes: 27 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
SparkFun Data Logger License Information
============================

Code
--------

MIT License

Copyright (c) 2022-24 SparkFun Electronics

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
5 changes: 5 additions & 0 deletions flux_sdk_import.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
# ##################################################################################################
# include/import file for the flux-sdk cmake system
# ##################################################################################################
Expand Down
6 changes: 5 additions & 1 deletion fuse_id/dl_build_conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/usr/bin/env python

#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
import os
import sys
import datetime
Expand Down
9 changes: 4 additions & 5 deletions fuse_id/dl_fuseid.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

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

Expand Down
6 changes: 5 additions & 1 deletion fuse_id/sfe_dl_fuseid/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@


#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
# just import the entry point method

from .dl_fuseid import dl_fuseid
Expand Down
9 changes: 4 additions & 5 deletions fuse_id/sfe_dl_fuseid/_dl_fuseid_.conf
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#--------------------------------------------------------------------------------
#
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
# This software includes information which is proprietary to and a
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
# to anyone outside of this organization. Reproduction by any means
# whatsoever is prohibited without express written permission.
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
#--------------------------------------------------------------------------------

Expand Down
10 changes: 5 additions & 5 deletions fuse_id/sfe_dl_fuseid/dl_fuseid.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
#
#---------------------------------------------------------------------------------
#
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
# This software includes information which is proprietary to and a
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
# to anyone outside of this organization. Reproduction by any means
# whatsoever is prohibited without express written permission.
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
#
#---------------------------------------------------------------------------------
#
Expand Down
10 changes: 5 additions & 5 deletions fuse_id/sfe_dl_fuseid/dl_log.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#--------------------------------------------------------------------------------
#
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
# This software includes information which is proprietary to and a
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
# to anyone outside of this organization. Reproduction by any means
# whatsoever is prohibited without express written permission.
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
#
#--------------------------------------------------------------------------------

Expand Down
10 changes: 5 additions & 5 deletions fuse_id/sfe_dl_fuseid/dl_prefs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

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

Expand Down
10 changes: 5 additions & 5 deletions fuse_id/sfe_dl_fuseid/dl_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

#--------------------------------------------------------------------------------
#
# Copyright (c) 2022-2023, SparkFun Electronics Inc. All rights reserved.
# This software includes information which is proprietary to and a
# trade secret of SparkFun Electronics Inc. It is not to be disclosed
# to anyone outside of this organization. Reproduction by any means
# whatsoever is prohibited without express written permission.
#
# Copyright (c) 2022-2024, SparkFun Electronics Inc.
#
# SPDX-License-Identifier: MIT
#
#
#--------------------------------------------------------------------------------
VERSION = "0.5.0"
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLBoard.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLButton.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLButton.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLCommands.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLDisplay.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLGrBattery.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLGrWiFi.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLGraphx.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLLed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLLed.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLMode.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLMode.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLSystemOp.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLVersion.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
8 changes: 3 additions & 5 deletions sfeDataLoggerIoT/sfeDLWebServer.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/*
*---------------------------------------------------------------------------------
*
* Copyright (c) 2022-2024, SparkFun Electronics Inc. All rights reserved.
* This software includes information which is proprietary to and a
* trade secret of SparkFun Electronics Inc. It is not to be disclosed
* to anyone outside of this organization. Reproduction by any means
* whatsoever is prohibited without express written permission.
* Copyright (c) 2022-2024, SparkFun Electronics Inc.
*
* SPDX-License-Identifier: MIT
*
*---------------------------------------------------------------------------------
*/
Expand Down
Loading

0 comments on commit 7b94d42

Please sign in to comment.