Migrated to libs v2 format

mhaack · Jan 30, 2017 · b29bbe7 · b29bbe7
1 parent 219ea69
commit b29bbe7
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 31 deletions.
diff --git a/firmware/examples/CSV_Output/CSV_Output.ino → examples/CSV_Output/CSV_Output.ino b/firmware/examples/CSV_Output/CSV_Output.ino → examples/CSV_Output/CSV_Output.ino
@@ -18,7 +18,7 @@ or concerns with licensing, please contact [email protected].
 Distributed as-is; no warranty is given.
 ******************************************************************************/
 
-#include "SparkFunBME280/SparkFunBME280.h"
+#include "SparkFunBME280.h"
 
 //Global sensor object
 BME280 mySensor;

diff --git a/...ples/I2C_DeltaAltitude/CircularBuffer.cpp → ...ples/I2C_DeltaAltitude/CircularBuffer.cpp b/...ples/I2C_DeltaAltitude/CircularBuffer.cpp → ...ples/I2C_DeltaAltitude/CircularBuffer.cpp
diff --git a/...amples/I2C_DeltaAltitude/CircularBuffer.h → examples/I2C_DeltaAltitude/CircularBuffer.h b/...amples/I2C_DeltaAltitude/CircularBuffer.h → examples/I2C_DeltaAltitude/CircularBuffer.h
diff --git a/...s/I2C_DeltaAltitude/I2C_DeltaAltitude.ino → ...s/I2C_DeltaAltitude/I2C_DeltaAltitude.ino b/...s/I2C_DeltaAltitude/I2C_DeltaAltitude.ino → ...s/I2C_DeltaAltitude/I2C_DeltaAltitude.ino
@@ -36,7 +36,7 @@ or concerns with licensing, please contact [email protected].
 Distributed as-is; no warranty is given.
 ******************************************************************************/
 
-#include "SparkFunBME280/SparkFunBME280.h"
+#include "SparkFunBME280.h"
 #include "CircularBuffer.h"
 
 //Global sensor object

diff --git a/...mples/I2C_ReadAllData/I2C_ReadAllData.ino → examples/I2C_ReadAllData/I2C_ReadAllData.ino b/...mples/I2C_ReadAllData/I2C_ReadAllData.ino → examples/I2C_ReadAllData/I2C_ReadAllData.ino
@@ -18,7 +18,7 @@ or concerns with licensing, please contact [email protected].
 Distributed as-is; no warranty is given.
 ******************************************************************************/
 
-#include "SparkFunBME280/SparkFunBME280.h"
+#include "SparkFunBME280.h"
 
 //Global sensor object
 BME280 mySensor;

diff --git a/...I_Multisensor/I2C_and_SPI_Multisensor.ino → ...I_Multisensor/I2C_and_SPI_Multisensor.ino b/...I_Multisensor/I2C_and_SPI_Multisensor.ino → ...I_Multisensor/I2C_and_SPI_Multisensor.ino
@@ -21,7 +21,7 @@ or concerns with licensing, please contact [email protected].
 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
@@ -1,9 +1,8 @@
-name=SparkFun BME280
+name=SparkFunBME280
 version=1.1.0
-author=Marshall Taylor
-maintainer=SparkFun Electronics <sparkfun.com>
+author=Marshall Taylor <sparkfun.com>
+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=*
+url=https://github.com/mhaack/SparkFun_BME280
diff --git a/spark.json b/spark.json
diff --git a/firmware/SparkFunBME280.cpp → src/SparkFunBME280.cpp b/firmware/SparkFunBME280.cpp → 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 <math.h>
 
-#include "Wire.h"
-#include "SPI.h"
-
 //****************************************************************************//
 //
 //  Settings and configuration

diff --git a/firmware/SparkFunBME280.h → src/SparkFunBME280.h b/firmware/SparkFunBME280.h → src/SparkFunBME280.h