From b29bbe78a002dceffa59aa89c6931bc6a532b877 Mon Sep 17 00:00:00 2001 From: Markus Haack Date: Mon, 30 Jan 2017 19:12:48 +0100 Subject: [PATCH] Migrated to libs v2 format --- .../CSV_Output/CSV_Output.ino | 2 +- .../I2C_DeltaAltitude/CircularBuffer.cpp | 0 .../I2C_DeltaAltitude/CircularBuffer.h | 0 .../I2C_DeltaAltitude/I2C_DeltaAltitude.ino | 2 +- .../I2C_ReadAllData/I2C_ReadAllData.ino | 2 +- .../I2C_and_SPI_Multisensor.ino | 2 +- library.properties | 11 +++++----- spark.json | 7 ------- {firmware => src}/SparkFunBME280.cpp | 20 ++++++------------- {firmware => src}/SparkFunBME280.h | 0 10 files changed, 15 insertions(+), 31 deletions(-) rename {firmware/examples => examples}/CSV_Output/CSV_Output.ino (98%) rename {firmware/examples => examples}/I2C_DeltaAltitude/CircularBuffer.cpp (100%) rename {firmware/examples => examples}/I2C_DeltaAltitude/CircularBuffer.h (100%) rename {firmware/examples => examples}/I2C_DeltaAltitude/I2C_DeltaAltitude.ino (99%) rename {firmware/examples => examples}/I2C_ReadAllData/I2C_ReadAllData.ino (99%) rename {firmware/examples => examples}/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino (99%) delete mode 100644 spark.json rename {firmware => src}/SparkFunBME280.cpp (97%) rename {firmware => src}/SparkFunBME280.h (100%) diff --git a/firmware/examples/CSV_Output/CSV_Output.ino b/examples/CSV_Output/CSV_Output.ino similarity index 98% rename from firmware/examples/CSV_Output/CSV_Output.ino rename to examples/CSV_Output/CSV_Output.ino index fb23c74..0b38811 100644 --- a/firmware/examples/CSV_Output/CSV_Output.ino +++ b/examples/CSV_Output/CSV_Output.ino @@ -18,7 +18,7 @@ or concerns with licensing, please contact techsupport@sparkfun.com. Distributed as-is; no warranty is given. ******************************************************************************/ -#include "SparkFunBME280/SparkFunBME280.h" +#include "SparkFunBME280.h" //Global sensor object BME280 mySensor; diff --git a/firmware/examples/I2C_DeltaAltitude/CircularBuffer.cpp b/examples/I2C_DeltaAltitude/CircularBuffer.cpp similarity index 100% rename from firmware/examples/I2C_DeltaAltitude/CircularBuffer.cpp rename to examples/I2C_DeltaAltitude/CircularBuffer.cpp diff --git a/firmware/examples/I2C_DeltaAltitude/CircularBuffer.h b/examples/I2C_DeltaAltitude/CircularBuffer.h similarity index 100% rename from firmware/examples/I2C_DeltaAltitude/CircularBuffer.h rename to examples/I2C_DeltaAltitude/CircularBuffer.h diff --git a/firmware/examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino b/examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino similarity index 99% rename from firmware/examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino rename to examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino index dd5601f..a0391b7 100644 --- a/firmware/examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino +++ b/examples/I2C_DeltaAltitude/I2C_DeltaAltitude.ino @@ -36,7 +36,7 @@ or concerns with licensing, please contact techsupport@sparkfun.com. Distributed as-is; no warranty is given. ******************************************************************************/ -#include "SparkFunBME280/SparkFunBME280.h" +#include "SparkFunBME280.h" #include "CircularBuffer.h" //Global sensor object diff --git a/firmware/examples/I2C_ReadAllData/I2C_ReadAllData.ino b/examples/I2C_ReadAllData/I2C_ReadAllData.ino similarity index 99% rename from firmware/examples/I2C_ReadAllData/I2C_ReadAllData.ino rename to examples/I2C_ReadAllData/I2C_ReadAllData.ino index 59571b8..7bad177 100644 --- a/firmware/examples/I2C_ReadAllData/I2C_ReadAllData.ino +++ b/examples/I2C_ReadAllData/I2C_ReadAllData.ino @@ -18,7 +18,7 @@ or concerns with licensing, please contact techsupport@sparkfun.com. Distributed as-is; no warranty is given. ******************************************************************************/ -#include "SparkFunBME280/SparkFunBME280.h" +#include "SparkFunBME280.h" //Global sensor object BME280 mySensor; diff --git a/firmware/examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino b/examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino similarity index 99% rename from firmware/examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino rename to examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino index e2a2524..9e920e6 100644 --- a/firmware/examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino +++ b/examples/I2C_and_SPI_Multisensor/I2C_and_SPI_Multisensor.ino @@ -21,7 +21,7 @@ or concerns with licensing, please contact techsupport@sparkfun.com. Distributed as-is; no warranty is given. ******************************************************************************/ -#include "SparkFunBME280/SparkFunBME280.h" +#include "SparkFunBME280.h" //Global sensor object BME280 mySensorA; diff --git a/library.properties b/library.properties index 9abfd79..ff9bbe1 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,8 @@ -name=SparkFun BME280 +name=SparkFunBME280 version=1.1.0 -author=Marshall Taylor -maintainer=SparkFun Electronics +author=Marshall Taylor +maintainer= Markus Haack (https://github.com/mhaack) +license=MIT sentence=A library to drive the Bosch BME280 Altimeter and Pressure sensor -paragraph=See code for comments. category=Sensors -url=https://github.com/sparkfun/SparkFun_BME280_Arduino_Library -architectures=* \ No newline at end of file +url=https://github.com/mhaack/SparkFun_BME280 \ No newline at end of file diff --git a/spark.json b/spark.json deleted file mode 100644 index edd65d7..0000000 --- a/spark.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "SparkFunBME280", - "version": "1.0.0", - "author": "Marshall Taylor , Markus Haack (https://github.com/mhaack)", - "license": "MIT License (MIT)", - "description": "A library to drive the Bosch BME280 Altimeter and Pressure sensor" -} diff --git a/firmware/SparkFunBME280.cpp b/src/SparkFunBME280.cpp similarity index 97% rename from firmware/SparkFunBME280.cpp rename to src/SparkFunBME280.cpp index dd6ebb8..af39dc6 100644 --- a/firmware/SparkFunBME280.cpp +++ b/src/SparkFunBME280.cpp @@ -1,17 +1,12 @@ /****************************************************************************** SparkFunBME280.cpp -BME280 Arduino and Teensy Driver -Marshall Taylor @ SparkFun Electronics -May 20, 2015 -https://github.com/sparkfun/BME280_Breakout - -Resources: -Uses Wire.h for i2c operation -Uses SPI.h for SPI operation +BME280 Particle Photon and Core Driver +Orginal by: Marshall Taylor @ SparkFun Electronics +Particle adaption by: Markus Haack (https://github.com/mhaack) +https://github.com/mhaack/SparkFun_BME280 Development environment specifics: -Arduino IDE 1.6.4 -Teensy loader 1.23 +Particle IDE or Web IDE This code is released under the [MIT License](http://opensource.org/licenses/MIT). Please review the LICENSE.md file included with this example. If you have any questions @@ -21,12 +16,9 @@ Distributed as-is; no warranty is given. //See SparkFunBME280.h for additional topology notes. #include "SparkFunBME280.h" -#include "stdint.h" +#include "application.h" #include -#include "Wire.h" -#include "SPI.h" - //****************************************************************************// // // Settings and configuration diff --git a/firmware/SparkFunBME280.h b/src/SparkFunBME280.h similarity index 100% rename from firmware/SparkFunBME280.h rename to src/SparkFunBME280.h