Skip to content

Commit 9cf1ad8

Browse files
SFE-BrudnerdSFE-Brudnerd
committed
Rework examples for updated library.
1 parent 9c199ec commit 9cf1ad8

File tree

4 files changed

+75
-76
lines changed

4 files changed

+75
-76
lines changed

‎examples/Example01_Basic_OneShot/Example01_Basic_OneShot.ino

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -22,65 +22,58 @@
2222
https://www.sparkfun.com/products/23518 - Qwiic Mini
2323
*/
2424

25-
#include "SparkFun_AS7331.h"
25+
#include <Arduino.h>
26+
#include <Wire.h>
27+
#include <SparkFun_AS7331.h>
2628

27-
void setup() {
28-
29-
}
30-
31-
void loop() {
32-
33-
}
29+
SfeAS7331ArdI2C myUVSensor;
3430

35-
// SfeAS7331ArdI2C myUVSensor;
36-
37-
// int8_t result = SFE_BUS_OK;
38-
39-
// void setup() {
40-
// Serial.begin(115200);
41-
// while(!Serial){delay(100);};
42-
// Serial.println("UV LED Example.");
31+
void setup() {
32+
Serial.begin(115200);
33+
while(!Serial){delay(100);};
34+
Serial.println("AS7331 UV A/B/C Command (One-shot) mode Example.");
4335

44-
// // Initialize sensor and run default setup.
45-
// if(myUVSensor.begin() == false) {
46-
// Serial.println("Sensor failed to begin. Please check your wiring!");
47-
// Serial.println("Spinning...");
48-
// while(1);
49-
// }
36+
Wire.begin();
5037

51-
// Serial.println("Sensor began.");
38+
// Initialize sensor and run default setup.
39+
if(myUVSensor.begin() == false) {
40+
Serial.println("Sensor failed to begin. Please check your wiring!");
41+
Serial.println("Spinning...");
42+
while(1);
43+
}
5244

53-
// // Set measurement mode and change device operating mode to measure.
54-
// if(myUVSensor.startMeasurement(MEAS_MODE_CMD) == false) {
55-
// Serial.println("Sensor did not get set properly.");
56-
// Serial.println("Spinning...");
57-
// while(1);
58-
// }
45+
Serial.println("Sensor began.");
5946

60-
// Serial.println("Set mode to command.");
47+
// Set measurement mode and change device operating mode to measure.
48+
if(myUVSensor.prepareMeasurement(MEAS_MODE_CMD) == false) {
49+
Serial.println("Sensor did not get set properly.");
50+
Serial.println("Spinning...");
51+
while(1);
52+
}
6153

62-
// }
54+
Serial.println("Set mode to command.");
55+
}
6356

64-
// void loop() {
57+
void loop() {
6558

66-
// // Send a start measurement command.
67-
// if(SFE_BUS_OK != myUVSensor.setStartStateMode(START_STATE_ENABLED))
68-
// Serial.println("Error starting reading!");
59+
// Send a start measurement command.
60+
if(kSTkErrOk != myUVSensor.setStartState(true))
61+
Serial.println("Error starting reading!");
6962

70-
// // Wait for a bit longer than the conversion time.
71-
// delay(2+(1 << myUVSensor.getConfigConversionTime()));
63+
// Wait for a bit longer than the conversion time.
64+
delay(2+(1 << myUVSensor.getConversionTime()));
7265

73-
// // Read UV values.
74-
// if(SFE_BUS_OK != myUVSensor.readAllUV())
75-
// Serial.println("Error reading UV.");
66+
// Read UV values.
67+
if(kSTkErrOk != myUVSensor.readAllUV())
68+
Serial.println("Error reading UV.");
7669

77-
// Serial.print("UVA:");
78-
// Serial.print(myUVSensor.measures.uva);
79-
// Serial.print(" UVB:");
80-
// Serial.print(myUVSensor.measures.uvb);
81-
// Serial.print(" UVC:");
82-
// Serial.println(myUVSensor.measures.uvc);
70+
Serial.print("UVA:");
71+
Serial.print(myUVSensor.getUVA());
72+
Serial.print(" UVB:");
73+
Serial.print(myUVSensor.getUVB());
74+
Serial.print(" UVC:");
75+
Serial.println(myUVSensor.getUVC());
8376

84-
// delay(2000);
77+
delay(2000);
8578

86-
// };
79+
}

‎examples/Example02_CONT_Mode/Example02_CONT_Mode.ino

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
https://www.sparkfun.com/products/23518 - Qwiic Mini
2424
*/
2525

26-
#include "SparkFun_AS7331.h"
26+
#include <Arduino.h>
27+
#include <Wire.h>
28+
#include <SparkFun_AS7331.h>
2729

2830
SfeAS7331ArdI2C myUVSensor;
2931

30-
int8_t result = SFE_BUS_OK;
31-
3232
const uint8_t interruptPin = 26;
3333
volatile bool newDataReady = false;
3434

@@ -37,6 +37,8 @@ void setup() {
3737
while(!Serial){delay(100);};
3838
Serial.println("AS7331 UV A/B/C Continuous mode example.");
3939

40+
Wire.begin();
41+
4042
// Configure Interrupt.
4143
pinMode(interruptPin, INPUT);
4244
attachInterrupt(digitalPinToInterrupt(interruptPin), dataReadyInterrupt, RISING);
@@ -51,14 +53,14 @@ void setup() {
5153
Serial.println("Sensor began.");
5254

5355
// Set break time to 900us (112 * 8us) to account for the time it takes to poll data.
54-
if(SFE_BUS_OK != myUVSensor.setBreakTime(112)) {
56+
if(kSTkErrOk != myUVSensor.setBreakTime(112)) {
5557
Serial.println("Sensor did not set break time properly.");
5658
Serial.println("Spinning...");
5759
while(1);
5860
}
5961

6062
// Set measurement mode and change device operating mode to measure.
61-
if(myUVSensor.startMeasurement(MEAS_MODE_CONT) == false) {
63+
if(myUVSensor.prepareMeasurement(MEAS_MODE_CONT) == false) {
6264
Serial.println("Sensor did not get set properly.");
6365
Serial.println("Spinning...");
6466
while(1);
@@ -67,7 +69,7 @@ void setup() {
6769
Serial.println("Set mode to continuous. Starting measurement...");
6870

6971
// Begin measurement.
70-
if(SFE_BUS_OK != myUVSensor.setStartStateMode(START_STATE_ENABLED))
72+
if(kSTkErrOk != myUVSensor.setStartState(true))
7173
Serial.println("Error starting reading!");
7274

7375
}
@@ -78,15 +80,15 @@ void loop() {
7880
if(newDataReady) {
7981
newDataReady = false;
8082

81-
if(SFE_BUS_OK != myUVSensor.readAllUV())
83+
if(kSTkErrOk != myUVSensor.readAllUV())
8284
Serial.println("Error reading UV.");
8385

8486
Serial.print("UVA:");
85-
Serial.print(myUVSensor.measures.uva);
87+
Serial.print(myUVSensor.getUVA());
8688
Serial.print(" UVB:");
87-
Serial.print(myUVSensor.measures.uvb);
89+
Serial.print(myUVSensor.getUVB());
8890
Serial.print(" UVC:");
89-
Serial.println(myUVSensor.measures.uvc);
91+
Serial.println(myUVSensor.getUVC());
9092
}
9193

9294
}

‎examples/Example03_SYNS_Mode/Example03_SYNS_Mode.ino

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
https://www.sparkfun.com/products/23518 - Qwiic Mini
2525
*/
2626

27-
#include "SparkFun_AS7331.h"
27+
#include <Arduino.h>
28+
#include <Wire.h>
29+
#include <SparkFun_AS7331.h>
2830

2931
SfeAS7331ArdI2C myUVSensor;
3032

31-
int8_t result = SFE_BUS_OK;
32-
3333
const uint8_t synPin = 27;
3434

3535
const uint8_t interruptPin = 26;
@@ -40,6 +40,8 @@ void setup() {
4040
while(!Serial){delay(100);};
4141
Serial.println("AS7331 UV A/B/C Synchronous Start mode example.");
4242

43+
Wire.begin();
44+
4345
// Configure SYN pin.
4446
pinMode(synPin, OUTPUT);
4547
digitalWrite(synPin, HIGH); // Active low, so start high.
@@ -58,7 +60,7 @@ void setup() {
5860
Serial.println("Sensor began.");
5961

6062
// Set measurement mode and change device operating mode to measure.
61-
if(myUVSensor.startMeasurement(MEAS_MODE_SYNS) == false) {
63+
if(myUVSensor.prepareMeasurement(MEAS_MODE_SYNS) == false) {
6264
Serial.println("Sensor did not get set properly.");
6365
Serial.println("Spinning...");
6466
while(1);
@@ -67,7 +69,7 @@ void setup() {
6769
Serial.println("Set mode to synchronous start (SYNS). Starting measurement...");
6870

6971
// Set device to be ready to measure.
70-
if(SFE_BUS_OK != myUVSensor.setStartStateMode(START_STATE_ENABLED))
72+
if(kSTkErrOk != myUVSensor.setStartState(true))
7173
Serial.println("Error starting reading!");
7274

7375
// Send start toggle.
@@ -83,7 +85,7 @@ void loop() {
8385
if(newDataReady) {
8486
newDataReady = false;
8587

86-
if(SFE_BUS_OK != myUVSensor.readAllUV())
88+
if(kSTkErrOk != myUVSensor.readAllUV())
8789
Serial.println("Error reading UV.");
8890

8991
// Start next measurement
@@ -92,11 +94,11 @@ void loop() {
9294
digitalWrite(synPin, HIGH);
9395

9496
Serial.print("UVA:");
95-
Serial.print(myUVSensor.measures.uva);
97+
Serial.print(myUVSensor.getUVA());
9698
Serial.print(" UVB:");
97-
Serial.print(myUVSensor.measures.uvb);
99+
Serial.print(myUVSensor.getUVB());
98100
Serial.print(" UVC:");
99-
Serial.println(myUVSensor.measures.uvc);
101+
Serial.println(myUVSensor.getUVC());
100102
}
101103

102104
}

‎examples/Example04_SYND_Mode/Example04_SYND_Mode.ino

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,21 @@
2424
https://www.sparkfun.com/products/23518 - Qwiic Mini
2525
*/
2626

27-
#include "SparkFun_AS7331.h"
27+
#include <Arduino.h>
28+
#include <Wire.h>
29+
#include <SparkFun_AS7331.h>
2830

2931
SfeAS7331ArdI2C myUVSensor;
3032

31-
int8_t result = SFE_BUS_OK;
32-
3333
const uint8_t synPin = 27;
3434

3535
void setup() {
3636
Serial.begin(115200);
3737
while(!Serial){delay(100);};
3838
Serial.println("AS7331 UV A/B/C Synchronous Start and End (SYND) mode example.");
3939

40+
Wire.begin();
41+
4042
// Configure SYN pin.
4143
pinMode(synPin, OUTPUT);
4244
digitalWrite(synPin, HIGH); // Active low, so start high.
@@ -51,7 +53,7 @@ void setup() {
5153
Serial.println("Sensor began.");
5254

5355
// Set measurement mode and change device operating mode to measure.
54-
if(myUVSensor.startMeasurement(MEAS_MODE_SYND) == false) {
56+
if(myUVSensor.prepareMeasurement(MEAS_MODE_SYND) == false) {
5557
Serial.println("Sensor did not get set properly.");
5658
Serial.println("Spinning...");
5759
while(1);
@@ -60,7 +62,7 @@ void setup() {
6062
Serial.println("Set mode to synchronous start/end (SYND). Starting measurement...");
6163

6264
// Set device to be ready to measure.
63-
if(SFE_BUS_OK != myUVSensor.setStartStateMode(START_STATE_ENABLED))
65+
if(kSTkErrOk != myUVSensor.setStartState(true))
6466
Serial.println("Error starting reading!");
6567

6668
// Send start toggle.
@@ -79,15 +81,15 @@ void loop() {
7981
delay(1);
8082
digitalWrite(synPin, HIGH);
8183

82-
if(SFE_BUS_OK != myUVSensor.readAllUV())
84+
if(kSTkErrOk != myUVSensor.readAllUV())
8385
Serial.println("Error reading UV.");
8486

8587
Serial.print("UVA:");
86-
Serial.print(myUVSensor.measures.uva);
88+
Serial.print(myUVSensor.getUVA());
8789
Serial.print(" UVB:");
88-
Serial.print(myUVSensor.measures.uvb);
90+
Serial.print(myUVSensor.getUVB());
8991
Serial.print(" UVC:");
90-
Serial.println(myUVSensor.measures.uvc);
92+
Serial.println(myUVSensor.getUVC());
9193

9294
// Start next measurement.
9395
digitalWrite(synPin, LOW);

0 commit comments

Comments
 (0)