Skip to content

Commit

Permalink
Merge pull request #176 from sparkfun/feature/move-to-open-source
Browse files Browse the repository at this point in the history
Moved to a MIT license for the repo
  • Loading branch information
gigapod authored Nov 13, 2024
2 parents 5f20268 + ab2175e commit c503870
Show file tree
Hide file tree
Showing 266 changed files with 1,035 additions and 1,036 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
#
# $id$ FLUX_SDK_PATH/CMakeLists.txt
#

Expand Down
24 changes: 22 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,25 @@ SparkFun Flux License Information

Code
--------
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.


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.
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@

SDK and Framework to simplify the development of embedded applications

## Status - In Development
## Status

## Using Flux SDK

The flux-sdk is a development framework/SDK intended for use as a component within other Firmware applications. As such, it's incorporated into other projects as an Arduino library.
The flux-sdk is a development framework/SDK intended for use as a component within other Firmware applications. As such, it's incorporated into other projects as an Arduino library.

To build firmware using Flux, see [Building with Flux](docs/build_with_flux.md)


## Framework Development
## Framework Development

Adding new capabilities to the Flux Framework

* Implementing a [Device Class](docs/device_writing.md)
* Implementing [Properties](docs/properties.md)
* Implementing [Parameters](docs/parameters.md)
* Implementing a [Device Class](docs/device_writing.md)
* Implementing [Properties](docs/properties.md)
* Implementing [Parameters](docs/parameters.md)
15 changes: 7 additions & 8 deletions examples/Example-01_Hello/Example-01_Hello.ino
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - simple output
* Flux Framework demo - simple output
*
* Note: This demo requires the generation of a SparkFun_Flux Arduino library - that is then installed
* into the Arduino libraries folder, or via the --library option in the Arduino CLI.
*
*/

Expand Down
16 changes: 8 additions & 8 deletions examples/Example-02_Params/Example-02_Params.ino
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - simple output
* Flux Framework demo - use of output parameters
*
* Note: This demo requires the generation of a SparkFun_Flux Arduino library - that is then installed
* into the Arduino libraries folder, or via the --library option in the Arduino CLI.
*
*/

Expand Down
28 changes: 8 additions & 20 deletions examples/Example-04_Logger/Example-04_Logger.ino
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - logging
* Flux Framework demo - simple logging output on a ESP32 device
*
* Note: This demo requires the generation of a SparkFun_Flux Arduino library - that is then installed
* into the Arduino libraries folder, or via the --library option in the Arduino CLI.
*
*/

// Spark framework
// Flux framework
#include <Flux.h>
#include <Flux/flxFmtCSV.h>
#include <Flux/flxFmtJSON.h>
Expand All @@ -41,12 +40,6 @@
// NTP
#include <Flux/flxNTPESP32.h>

//#define OPENLOG_ESP32
#ifdef OPENLOG_ESP32
#define EN_3V3_SW 32
#define LED_BUILTIN 25
#endif

//------------------------------------------
// Default log interval in milli secs
#define kDefaultLogInterval 6000
Expand Down Expand Up @@ -102,11 +95,6 @@ void setup()
;
Serial.println("\n---- Startup ----");

#ifdef OPENLOG_ESP32
pinMode(EN_3V3_SW, OUTPUT); // Enable Qwiic power and I2C
digitalWrite(EN_3V3_SW, HIGH);
#endif

// If not using settings, can use the following lines to test WiFi manually
// Try WiFi
// wifiConnection.SSID = "";
Expand Down
19 changes: 9 additions & 10 deletions examples/Example-06_SimpleEvent/Example-06_SimpleEvent.ino
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - Simple Events
* Flux Framework demo - simple events
*
* Note: This demo requires the generation of a SparkFun_Flux Arduino library - that is then installed
* into the Arduino libraries folder, or via the --library option in the Arduino CLI.
*
*/

Expand All @@ -22,9 +21,9 @@
#include <Flux/flxSerial.h>

/////////////////////////////////////////////////////////////////////////
// Spark Framework
// Flux Framework
/////////////////////////////////////////////////////////////////////////
// Spark Structure and Object Definition
// Flux Structure and Object Definition
//
// This app implements a "logger", which grabs data from
// connected devices and writes it to the Serial Console
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - event logging
* Flux Framework demo - event logging
*
* Note: This demo requires the generation of a SparkFun_Flux Arduino library - that is then installed
* into the Arduino libraries folder, or via the --library option in the Arduino CLI.
*
*/

// Spark framework
// Flux framework
#include <Flux.h>
#include <Flux/flxFmtCSV.h>
#include <Flux/flxLogger.h>
Expand Down
10 changes: 3 additions & 7 deletions examples/test/t_NAU7802_Logger/t_NAU7802_Logger.ino
Original file line number Diff line number Diff line change
@@ -1,13 +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
12 changes: 4 additions & 8 deletions examples/test/t_array/t_array.ino
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
/*
*---------------------------------------------------------------------------------
*
* 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
*
*---------------------------------------------------------------------------------
*/

/*
* Spark Framework demo - logging
* Flux Framework demo - logging
*
*/

Expand Down
10 changes: 3 additions & 7 deletions examples/test/t_array/test_device.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +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
10 changes: 3 additions & 7 deletions examples/test/t_array/test_device.h
Original file line number Diff line number Diff line change
@@ -1,13 +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
12 changes: 4 additions & 8 deletions examples/test/t_datalogger/sfeDataLogger.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +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 All @@ -19,7 +15,7 @@
#include "esp_sleep.h"

// TESTING
//#include <Flux/flxUtils.h>
// #include <Flux/flxUtils.h>

RTC_DATA_ATTR int boot_count = 0;

Expand Down
10 changes: 3 additions & 7 deletions examples/test/t_datalogger/sfeDataLogger.h
Original file line number Diff line number Diff line change
@@ -1,13 +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
10 changes: 3 additions & 7 deletions examples/test/t_datalogger/t_datalogger.ino
Original file line number Diff line number Diff line change
@@ -1,13 +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
10 changes: 3 additions & 7 deletions examples/test/t_editfield/t_editfield.ino
Original file line number Diff line number Diff line change
@@ -1,13 +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
*
*---------------------------------------------------------------------------------
*/

#include <string>
Expand Down
Loading

0 comments on commit c503870

Please sign in to comment.