Cleaned library

Author: AndyEngland521

examples/Example1_BasicReadings/Example1_BasicReadings.ino

@@ -0,0 +1,88 @@
+/*
+  This is a library written for the AS726X Spectral Sensor (Visible or IR) with I2C firmware
+  specially loaded. SparkFun sells these at its website: www.sparkfun.com
+
+  Written by Nathan Seidle & Andrew England @ SparkFun Electronics, July 12th, 2017
+
+  https://github.com/sparkfun/Qwiic_Spectral_Sensor_AS726X
+
+  Do you like this library? Help support SparkFun. Buy a board!
+
+  Development environment specifics:
+  Arduino IDE 1.8.1
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+  ---AVAILABLE FUNCTIONS---
+  AS726X(TwoWire &wirePort = Wire, byte gain = 3, byte measurementMode = 3);
+  void takeMeasurements();
+  void takeMeasurementsWithBulb();
+  void printMeasurements();
+  byte getTemperature();
+  float getTemperatureF();
+  void setMeasurementMode(byte mode);
+  boolean dataAvailable();
+  void enableIndicator();
+  void disableIndicator();
+  void setIndicatorCurrent(byte current);
+  void enableBulb();
+  void disableBulb();
+  void setBulbCurrent(byte current);
+  void softReset();
+  void setGain(byte gain);
+  void setIntegrationTime(byte integrationValue);
+  void enableInterrupt();
+  void disableInterrupt();
+
+  //Get the various color readings
+  int getViolet();
+  int getBlue();
+  int getGreen();
+  int getYellow();
+  int getOrange();
+  int getRed();
+
+  //Get the various NIR readings
+  int getR();
+  int getS();
+  int getT();
+  int getU();
+  int getV();
+  int getW();
+
+  //Returns the various calibration data
+  float getCalibratedViolet();
+  float getCalibratedBlue();
+  float getCalibratedGreen();
+  float getCalibratedYellow();
+  float getCalibratedOrange();
+  float getCalibratedRed();
+
+  float getCalibratedR();
+  float getCalibratedS();
+  float getCalibratedT();
+  float getCalibratedU();
+  float getCalibratedV();
+  float getCalibratedW();
+*/
+
+#include "AS726X.h"
+
+AS726X sensor;
+
+void setup() {
+  sensor.begin();
+
+}
+
+void loop() {
+  sensor.takeMeasurements();
+  sensor.printMeasurements();//Prints out all measurements (calibrated)
+}

examples/AS726X_Example/AS726X_Example.ino renamed to examples/Example2_SensorSettings/Example2_SensorSettings.ino

@@ -1,4 +1,4 @@
-  /* 
+/*
   This is a library written for the AS726X Spectral Sensor (Visible or IR) with I2C firmware
   specially loaded. SparkFun sells these at its website: www.sparkfun.com
 
@@ -19,12 +19,13 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  
+
   ---AVAILABLE FUNCTIONS---
   AS726X(TwoWire &wirePort = Wire, byte gain = 3, byte measurementMode = 3);
   void takeMeasurements();
   void takeMeasurementsWithBulb();
   void printMeasurements();
+  void printUncalibratedMeasurements();
   byte getTemperature();
   float getTemperatureF();
   void setMeasurementMode(byte mode);
@@ -41,7 +42,7 @@
   void enableInterrupt();
   void disableInterrupt();
 
-  
+
   //Get the various color readings
   int getViolet();
   int getBlue();
@@ -73,14 +74,15 @@
   float getCalibratedV();
   float getCalibratedW();
 */
-
 #include "AS726X.h"
+AS726X sensor;
+byte GAIN = 0;
+byte MEASUREMENT_MODE = 0;
 
 void setup() {
-}
-AS726X sensor;
-  /*//You can also create an instance that runs on a different port (For instance, if you are using a teensy). The Gain and Measurement mode can also be changed. 
-  //Uncomment the below code and comment the above declaration of 'sensor' to customize these settings.
+  sensor.begin(Wire, GAIN, MEASUREMENT_MODE);
+/*//You can also create an instance that runs on a different port (For instance, if you are using a teensy). The Gain and Measurement mode can also be changed.
+  //Uncomment the below code and comment the above call of "sensor.begin()" to customize these settings.
   byte GAIN = 3;
   //Sets the gain
   //Sets the gain value
@@ -94,12 +96,12 @@ AS726X sensor;
   //Mode 1: Continuous reading of GYOR (7262) / RTUX (7263)
   //Mode 2: Continuous reading of all channels (power-on default)
   //Mode 3: One-shot reading of all channels
-  AS726X sensor(Wire, GAIN, MEASUREMENT_MODE);
+  sensor.begin(Wire, GAIN, MEASUREMENT_MODE);
   //New declaration of sensor with different values
-  */
-  
+*/
+}
+
 void loop() {
   sensor.takeMeasurements();
-  //sensor.takeMeasurementsWithBulb(); //Uncomment to illuminate the onboard Bulb for taking measurements
-  sensor.printMeasurements();//Prints out all measurements
+  sensor.printMeasurements();//Prints out all measurements (calibrated)
 }

src/AS726X.cpp

@@ -1,8 +1,14 @@
 #include "AS726X.h"
+#include "Arduino.h"
 //Sets up the sensor for constant read
 //Returns the sensor version (AS7262 or AS7263)
 
-AS726X::AS726X(TwoWire &wirePort, byte gain, byte measurementMode)
+AS726X::AS726X()
+{
+	
+}
+
+void AS726X::begin(TwoWire &wirePort, byte gain, byte measurementMode)
 {
 	_i2cPort = &wirePort;
 	_i2cPort->begin();
@@ -139,6 +145,50 @@ void AS726X::printMeasurements()
 	Serial.println();
 }
 
+void AS726X::printUncalibratedMeasurements()
+{
+	float tempF = getTemperatureF();
+
+	if (_sensorVersion == SENSORTYPE_AS7262)
+	{
+		//Visible readings
+		Serial.print(" Reading: V[");
+		Serial.print(getViolet(), 2);
+		Serial.print("] B[");
+		Serial.print(getBlue(), 2);
+		Serial.print("] G[");
+		Serial.print(getGreen(), 2);
+		Serial.print("] Y[");
+		Serial.print(getYellow(), 2);
+		Serial.print("] O[");
+		Serial.print(getOrange(), 2);
+		Serial.print("] R[");
+		Serial.print(getRed(), 2);
+	}
+	else if (_sensorVersion == SENSORTYPE_AS7263)
+	{
+		//Near IR readings
+		Serial.print(" Reading: R[");
+		Serial.print(getR(), 2);
+		Serial.print("] S[");
+		Serial.print(getS(), 2);
+		Serial.print("] T[");
+		Serial.print(getT(), 2);
+		Serial.print("] U[");
+		Serial.print(getU(), 2);
+		Serial.print("] V[");
+		Serial.print(getV(), 2);
+		Serial.print("] W[");
+		Serial.print(getW(), 2);
+	}
+
+	Serial.print("] tempF[");
+	Serial.print(tempF, 1);
+	Serial.print("]");
+
+	Serial.println();
+}
+
 //Tells IC to take measurements and polls for data ready flag
 void AS726X::takeMeasurements()
 {

src/AS726X.h

@@ -11,10 +11,12 @@
 #include "Wire.h"
 class AS726X {
 public:
-	AS726X(TwoWire &wirePort = Wire, byte gain = 3, byte measurementMode = 3);
+	AS726X();
+	void begin(TwoWire &wirePort = Wire, byte gain = 3, byte measurementMode = 3);
 	void takeMeasurements();
 	void takeMeasurementsWithBulb();
 	void printMeasurements();
+	void printUncalibratedMeasurements();
 	byte getTemperature();
 	float getTemperatureF();
 	void setMeasurementMode(byte mode);
@@ -119,10 +121,12 @@ class AS726X {
 #define AS72XX_SLAVE_TX_VALID 0x02
 #define AS72XX_SLAVE_RX_VALID 0x01
 
+#define SENSORTYPE_AS7262 0x3E
+#define SENSORTYPE_AS7263 0x3F
 
 #define POLLING_DELAY 5 //Amount of ms to wait between checking for virtual register changes
 
 	byte _sensorVersion = 0;
 };
 
-#endif
+#endif