Skip to content

Commit f478d63

Browse files
lewispg228lewispg228
committed
removing some github stashed changes text
1 parent 2913d65 commit f478d63

File tree

11 files changed

+9
-48
lines changed

11 files changed

+9
-48
lines changed

‎examples/Example_03_Gyro/Example_03_Gyro.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333

3434
#include <Wire.h>
3535

36-
<<<<<<< Updated upstream
37-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
38-
=======
3936
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
40-
>>>>>>> Stashed changes
37+
4138
BNO08x myIMU;
4239

4340
void setup() {

‎examples/Example_04_Magnetometer/Example_04_Magnetometer.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333

3434
#include <Wire.h>
3535

36-
<<<<<<< Updated upstream
37-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
38-
=======
3936
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
40-
>>>>>>> Stashed changes
37+
4138
BNO08x myIMU;
4239

4340
void setup() {

‎examples/Example_05_StepCounter/Example_05_StepCounter.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333

3434
#include <Wire.h>
3535

36-
<<<<<<< Updated upstream
37-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
38-
=======
3936
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
40-
>>>>>>> Stashed changes
37+
4138
BNO08x myIMU;
4239

4340
void setup() {

‎examples/Example_07_ActivityClassifier/Example_07_ActivityClassifier.ino

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
/*
22
Using the BNO08x IMU
33
4-
<<<<<<< Updated upstream
5-
This is a fun one! The BNO086 can guess at what activity you are doing:
6-
=======
74
This is a fun one! The BNO08x can guess at what activity you are doing:
8-
>>>>>>> Stashed changes
5+
96
In vehicle
107
On bicycle
118
On foot
@@ -46,11 +43,8 @@
4643

4744
#include <Wire.h>
4845

49-
<<<<<<< Updated upstream
50-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
51-
=======
5246
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
53-
>>>>>>> Stashed changes
47+
5448
BNO08x myIMU;
5549

5650
void setup() {

‎examples/Example_09_LinearAccelerometer/Example_09_LinearAccelerometer.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333

3434
#include <Wire.h>
3535

36-
<<<<<<< Updated upstream
37-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
38-
=======
3936
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
40-
>>>>>>> Stashed changes
37+
4138
BNO08x myIMU;
4239

4340
void setup() {

‎examples/Example_10_TimeStamp/Example_10_TimeStamp.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636

3737
#include <Wire.h>
3838

39-
<<<<<<< Updated upstream
40-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
41-
=======
4239
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
43-
>>>>>>> Stashed changes
40+
4441
BNO08x myIMU;
4542

4643
void setup() {

‎examples/Example_11_RawReadings/Example_11_RawReadings.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636

3737
#include <Wire.h>
3838

39-
<<<<<<< Updated upstream
40-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
41-
=======
4239
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
43-
>>>>>>> Stashed changes
40+
4441
BNO08x myIMU;
4542

4643
// variables to store all our incoming values

‎examples/Example_16_UncalibratedGyro/Example_16_UncalibratedGyro.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333

3434
#include <Wire.h>
3535

36-
<<<<<<< Updated upstream
37-
#include "SparkFun_BNO08x_Arduino_Library.h" // Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
38-
=======
3936
#include "SparkFun_BNO08x_Arduino_Library.h" // CTRL+Click here to get the library: http://librarymanager/All#SparkFun_BNO08x
40-
>>>>>>> Stashed changes
37+
4138
BNO08x myIMU;
4239

4340
void setup() {

‎examples/Example_17_ResetCheck/Example_17_ResetCheck.ino

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ BNO08x myIMU;
6060

6161
int cyclecount = 0;
6262

63-
<<<<<<< Updated upstream
64-
#define BNO08X_ADDR 0x4B // SparkFun BNO086 Breakout (Qwiic) defaults to 0x4B
65-
=======
6663
#define BNO08X_ADDR 0x4B // SparkFun BNO08x Breakout (Qwiic) defaults to 0x4B
67-
>>>>>>> Stashed changes
6864
//#define BNO08X_ADDR 0x4A // Alternate address if ADR jumper is closed
6965

7066
void setup() {

‎examples/Example_18_Sleep/Example_18_Sleep.ino

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ BNO08x myIMU;
6363
unsigned long lastMillis = 0; // Keep track of time
6464
bool lastPowerState = true; // Toggle between "On" and "Sleep"
6565

66-
<<<<<<< Updated upstream
67-
#define BNO08X_ADDR 0x4B // SparkFun BNO086 Breakout (Qwiic) defaults to 0x4B
68-
=======
6966
#define BNO08X_ADDR 0x4B // SparkFun BNO08x Breakout (Qwiic) defaults to 0x4B
70-
>>>>>>> Stashed changes
7167
//#define BNO08X_ADDR 0x4A // Alternate address if ADR jumper is closed
7268

7369
void setup() {

0 commit comments

Comments
 (0)