Skip to content

Commit 3547a47

Browse files
gigapodgigapod
committed
formatting cleanup
1 parent ba2a674 commit 3547a47

File tree

11 files changed

+575
-540
lines changed

11 files changed

+575
-540
lines changed

‎examples/Example-01_Basic/Example-01_Basic.ino‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,48 +31,50 @@ SparkFun_TMF882X myTMF882X;
3131

3232
static struct tmf882x_msg_meas_results myResults;
3333

34-
void setup(){
34+
void setup()
35+
{
3536

36-
delay(1000);
37-
Serial.begin(115200);
38-
Serial.println("");
37+
delay(1000);
38+
Serial.begin(115200);
39+
Serial.println("");
3940

40-
Serial.println("In setup");
41-
Serial.println("==============================");
41+
Serial.println("In setup");
42+
Serial.println("==============================");
4243

43-
// Initialize the TMF882X device
44-
if(!myTMF882X.begin())
45-
{
46-
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
47-
while(1);
48-
}else
49-
Serial.println("TMF882X started.");
44+
// Initialize the TMF882X device
45+
if(!myTMF882X.begin())
46+
{
47+
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
48+
while(1);
49+
}else
50+
Serial.println("TMF882X started.");
5051

51-
// The device is now ready for operations
52+
// The device is now ready for operations
5253
}
5354

5455
void loop()
5556
{
56-
delay(2000);
57+
delay(2000);
5758

5859
// get a Measurement
5960
if(myTMF882X.startMeasuring(myResults))
6061
{
61-
// print out results
62-
Serial.println("Measurement:");
63-
Serial.print(" Result Number: "); Serial.print(myResults.result_num);
64-
Serial.print(" Number of Results: "); Serial.println(myResults.num_results);
65-
66-
for (int i = 0; i < myResults.num_results; ++i) {
67-
Serial.print(" conf: "); Serial.print(myResults.results[i].confidence);
68-
Serial.print(" distance mm: "); Serial.print(myResults.results[i].distance_mm);
69-
Serial.print(" channel: "); Serial.print(myResults.results[i].channel);
70-
Serial.print(" sub_capture: "); Serial.println(myResults.results[i].sub_capture);
71-
72-
}
73-
Serial.print(" photon: "); Serial.print(myResults.photon_count);
74-
Serial.print(" ref photon: "); Serial.print(myResults.ref_photon_count);
75-
Serial.print(" ALS: "); Serial.println(myResults.ambient_light); Serial.println();
62+
// print out results
63+
Serial.println("Measurement:");
64+
Serial.print(" Result Number: "); Serial.print(myResults.result_num);
65+
Serial.print(" Number of Results: "); Serial.println(myResults.num_results);
66+
67+
for (int i = 0; i < myResults.num_results; ++i)
68+
{
69+
Serial.print(" conf: "); Serial.print(myResults.results[i].confidence);
70+
Serial.print(" distance mm: "); Serial.print(myResults.results[i].distance_mm);
71+
Serial.print(" channel: "); Serial.print(myResults.results[i].channel);
72+
Serial.print(" sub_capture: "); Serial.println(myResults.results[i].sub_capture);
73+
74+
}
75+
Serial.print(" photon: "); Serial.print(myResults.photon_count);
76+
Serial.print(" ref photon: "); Serial.print(myResults.ref_photon_count);
77+
Serial.print(" ALS: "); Serial.println(myResults.ambient_light); Serial.println();
7678

7779
}
7880

‎examples/Example-02_Callback/Example-02_Callback.ino‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,70 +41,73 @@ int nSample =0; // used to count how the number of measurements taken.
4141
// Define our measurement callback function. The Library calls this when a
4242
// measurment is taken.
4343

44-
void onMeasurementCallback(struct tmf882x_msg_meas_results *myResults){
44+
void onMeasurementCallback(struct tmf882x_msg_meas_results *myResults)
45+
{
4546

46-
nSample++;
47+
nSample++;
4748

48-
Serial.print("Sample Number: ");
49-
Serial.println(nSample);
49+
Serial.print("Sample Number: ");
50+
Serial.println(nSample);
5051

51-
// print out results
52+
// print out results
5253
Serial.println("Measurement:");
5354
Serial.print("Result Number: "); Serial.print(myResults->result_num);
54-
Serial.print(" Number of Results: "); Serial.println(myResults->num_results);
55+
Serial.print(" Number of Results: "); Serial.println(myResults->num_results);
5556

56-
for(uint32_t i = 0; i < myResults->num_results; ++i) {
57-
Serial.print(" conf: "); Serial.print(myResults->results[i].confidence);
58-
Serial.print(" distance mm: "); Serial.print(myResults->results[i].distance_mm);
59-
Serial.print(" channel: "); Serial.print(myResults->results[i].channel);
60-
Serial.print(" sub_capture: "); Serial.println(myResults->results[i].sub_capture);
57+
for(uint32_t i = 0; i < myResults->num_results; ++i)
58+
{
59+
Serial.print(" conf: "); Serial.print(myResults->results[i].confidence);
60+
Serial.print(" distance mm: "); Serial.print(myResults->results[i].distance_mm);
61+
Serial.print(" channel: "); Serial.print(myResults->results[i].channel);
62+
Serial.print(" sub_capture: "); Serial.println(myResults->results[i].sub_capture);
6163

62-
}
63-
Serial.print(" photon: "); Serial.print(myResults->photon_count);
64-
Serial.print(" ref photon: "); Serial.print(myResults->ref_photon_count);
65-
Serial.print(" ALS: "); Serial.println(myResults->ambient_light); Serial.println();
64+
}
65+
Serial.print(" photon: "); Serial.print(myResults->photon_count);
66+
Serial.print(" ref photon: "); Serial.print(myResults->ref_photon_count);
67+
Serial.print(" ALS: "); Serial.println(myResults->ambient_light); Serial.println();
6668

6769
}
6870

69-
void setup(){
71+
void setup()
72+
{
7073

71-
delay(500);
72-
Serial.begin(115200);
73-
Serial.println("");
74+
delay(500);
75+
Serial.begin(115200);
76+
Serial.println("");
7477

7578

76-
if(!myTMF882X.begin())
77-
{
78-
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
79-
while(1);
80-
}
79+
if(!myTMF882X.begin())
80+
{
81+
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
82+
while(1);
83+
}
8184

82-
// set our callback function in the library.
83-
myTMF882X.setMeasurementHandler(onMeasurementCallback);
85+
// set our callback function in the library.
86+
myTMF882X.setMeasurementHandler(onMeasurementCallback);
8487

85-
// Set our delay between samples in the processing loop - 1 second - note it's in ms
86-
myTMF882X.setSampleDelay(1000);
88+
// Set our delay between samples in the processing loop - 1 second - note it's in ms
89+
myTMF882X.setSampleDelay(1000);
8790
}
8891

8992
void loop()
9093
{
91-
delay(2000);
92-
93-
// get a measurment
94-
// Have the sensor take NUMBER_OF_SAMPLES_TO_TAKE measurements.
95-
//
96-
// As measurements are taken, the results are sent to the above function,
97-
// "onMeasurementCallback()"
98-
99-
Serial.println("---------------------------------------------------------");
100-
Serial.print("Taking ");
101-
Serial.print(NUMBER_OF_SAMPLES_TO_TAKE);
102-
Serial.println(" data samples.");
103-
Serial.println();
104-
105-
nSample=0;
106-
myTMF882X.startMeasuring(NUMBER_OF_SAMPLES_TO_TAKE);
107-
108-
Serial.println("---------------------------------------------------------\n\n");
94+
delay(2000);
95+
96+
// get a measurment
97+
// Have the sensor take NUMBER_OF_SAMPLES_TO_TAKE measurements.
98+
//
99+
// As measurements are taken, the results are sent to the above function,
100+
// "onMeasurementCallback()"
101+
102+
Serial.println("---------------------------------------------------------");
103+
Serial.print("Taking ");
104+
Serial.print(NUMBER_OF_SAMPLES_TO_TAKE);
105+
Serial.println(" data samples.");
106+
Serial.println();
107+
108+
nSample=0;
109+
myTMF882X.startMeasuring(NUMBER_OF_SAMPLES_TO_TAKE);
110+
111+
Serial.println("---------------------------------------------------------\n\n");
109112

110113
}

‎examples/Example-03_Stop/Example-03_Stop.ino‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,78 +41,82 @@ int nSample =0;
4141
// Define our measurement callback function. The Library calls this when a
4242
// measurment is taken.
4343

44-
void onMeasurementCallback(struct tmf882x_msg_meas_results *myResults){
44+
void onMeasurementCallback(struct tmf882x_msg_meas_results *myResults)
45+
{
4546

46-
nSample++;
47-
Serial.print("Sample Number: ");
48-
Serial.println(nSample);
47+
nSample++;
48+
Serial.print("Sample Number: ");
49+
Serial.println(nSample);
4950

50-
// print out results
51+
// print out results
5152
Serial.println("Measurement:");
5253
Serial.print("Result Number: "); Serial.print(myResults->result_num);
53-
Serial.print(" Number of Results: "); Serial.println(myResults->num_results);
54-
55-
for(uint32_t i = 0; i < myResults->num_results; ++i) {
56-
Serial.print(" conf: "); Serial.print(myResults->results[i].confidence);
57-
Serial.print(" distance mm: "); Serial.print(myResults->results[i].distance_mm);
58-
Serial.print(" channel: "); Serial.print(myResults->results[i].channel);
59-
Serial.print(" sub_capture: "); Serial.println(myResults->results[i].sub_capture);
60-
61-
}
62-
Serial.print(" photon: "); Serial.print(myResults->photon_count);
63-
Serial.print(" ref photon: "); Serial.print(myResults->ref_photon_count);
64-
Serial.print(" ALS: "); Serial.println(myResults->ambient_light); Serial.println();
65-
66-
// If we are at our limit, stop taking measurments
67-
68-
if(nSample == NUMBER_OF_SAMPLES_TO_TAKE)
69-
{
70-
myTMF882X.stopMeasuring();
71-
72-
Serial.println();
73-
Serial.println("-----------------------------------------------");
74-
Serial.println("Measurement Goal Hit - stopping measurements.");
75-
Serial.println("-----------------------------------------------");
76-
Serial.println();
77-
}
54+
Serial.print(" Number of Results: "); Serial.println(myResults->num_results);
55+
56+
for(uint32_t i = 0; i < myResults->num_results; ++i)
57+
{
58+
Serial.print(" conf: "); Serial.print(myResults->results[i].confidence);
59+
Serial.print(" distance mm: "); Serial.print(myResults->results[i].distance_mm);
60+
Serial.print(" channel: "); Serial.print(myResults->results[i].channel);
61+
Serial.print(" sub_capture: "); Serial.println(myResults->results[i].sub_capture);
62+
63+
}
64+
Serial.print(" photon: "); Serial.print(myResults->photon_count);
65+
Serial.print(" ref photon: "); Serial.print(myResults->ref_photon_count);
66+
Serial.print(" ALS: "); Serial.println(myResults->ambient_light); Serial.println();
67+
68+
// If we are at our limit, stop taking measurments
69+
70+
if(nSample == NUMBER_OF_SAMPLES_TO_TAKE)
71+
{
72+
myTMF882X.stopMeasuring();
73+
74+
Serial.println();
75+
Serial.println("-----------------------------------------------");
76+
Serial.println("Measurement Goal Hit - stopping measurements.");
77+
Serial.println("-----------------------------------------------");
78+
Serial.println();
79+
}
7880
}
7981

80-
void setup(){
82+
void setup()
83+
{
8184

82-
delay(500);
83-
Serial.begin(115200);
84-
Serial.println("");
85+
delay(500);
86+
Serial.begin(115200);
87+
Serial.println("");
8588

8689

87-
if(!myTMF882X.begin()){
88-
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
89-
while(1);
90-
}
90+
if(!myTMF882X.begin())
91+
{
92+
Serial.println("Error - The TMF882X failed to initialize - is the board connected?");
93+
while(1);
94+
}
9195

92-
// set our call back function
93-
myTMF882X.setMeasurementHandler(onMeasurementCallback);
96+
// set our call back function
97+
myTMF882X.setMeasurementHandler(onMeasurementCallback);
9498

95-
// Set our delay between samples - 1 second - note it's in ms
96-
myTMF882X.setSampleDelay(1000);
99+
// Set our delay between samples - 1 second - note it's in ms
100+
myTMF882X.setSampleDelay(1000);
97101
}
98102

99103
void loop()
100104
{
101-
delay(2000);
105+
delay(2000);
102106

103-
Serial.println("---------------------------------------------------------");
104-
Serial.print("Taking ");
105-
Serial.print(NUMBER_OF_SAMPLES_TO_TAKE);
106-
Serial.println(" data samples.");
107-
Serial.println();
107+
Serial.println("---------------------------------------------------------");
108+
Serial.print("Taking ");
109+
Serial.print(NUMBER_OF_SAMPLES_TO_TAKE);
110+
Serial.println(" data samples.");
111+
Serial.println();
108112

109-
nSample=0;
113+
nSample=0;
110114

111-
// Start taking samples. Note - no stop condition is specified. This is handled
112-
// in the measurement callback function above.
115+
// Start taking samples. Note - no stop condition is specified. This is handled
116+
// in the measurement callback function above.
113117

114-
myTMF882X.startMeasuring();
115-
116-
Serial.println("---------------------------------------------------------\n\n");
118+
myTMF882X.startMeasuring();
119+
120+
Serial.println("---------------------------------------------------------\n\n");
117121

118122
}

0 commit comments

Comments
 (0)