Skip to content

Commit 8774124

Browse files
authored
Merge pull request #27 from pu239ppy/move_defines_to_header
Enable inheritance
2 parents 72913d0 + 0bfb498 commit 8774124

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

src/LSM6DS3.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,6 @@
1919

2020
#include "LSM6DS3.h"
2121

22-
#define LSM6DS3_ADDRESS 0x6A
23-
24-
#define LSM6DS3_WHO_AM_I_REG 0X0F
25-
#define LSM6DS3_CTRL1_XL 0X10
26-
#define LSM6DS3_CTRL2_G 0X11
27-
28-
#define LSM6DS3_STATUS_REG 0X1E
29-
30-
#define LSM6DS3_CTRL6_C 0X15
31-
#define LSM6DS3_CTRL7_G 0X16
32-
#define LSM6DS3_CTRL8_XL 0X17
33-
34-
#define LSM6DS3_OUTX_L_G 0X22
35-
#define LSM6DS3_OUTX_H_G 0X23
36-
#define LSM6DS3_OUTY_L_G 0X24
37-
#define LSM6DS3_OUTY_H_G 0X25
38-
#define LSM6DS3_OUTZ_L_G 0X26
39-
#define LSM6DS3_OUTZ_H_G 0X27
40-
41-
#define LSM6DS3_OUTX_L_XL 0X28
42-
#define LSM6DS3_OUTX_H_XL 0X29
43-
#define LSM6DS3_OUTY_L_XL 0X2A
44-
#define LSM6DS3_OUTY_H_XL 0X2B
45-
#define LSM6DS3_OUTZ_L_XL 0X2C
46-
#define LSM6DS3_OUTZ_H_XL 0X2D
47-
48-
4922
LSM6DS3Class::LSM6DS3Class(TwoWire& wire, uint8_t slaveAddress) :
5023
_wire(&wire),
5124
_spi(NULL),

src/LSM6DS3.h

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,33 @@
2121
#include <Wire.h>
2222
#include <SPI.h>
2323

24+
#define LSM6DS3_ADDRESS 0x6A
25+
26+
#define LSM6DS3_WHO_AM_I_REG 0X0F
27+
#define LSM6DS3_CTRL1_XL 0X10
28+
#define LSM6DS3_CTRL2_G 0X11
29+
30+
#define LSM6DS3_STATUS_REG 0X1E
31+
32+
#define LSM6DS3_CTRL6_C 0X15
33+
#define LSM6DS3_CTRL7_G 0X16
34+
#define LSM6DS3_CTRL8_XL 0X17
35+
36+
#define LSM6DS3_OUTX_L_G 0X22
37+
#define LSM6DS3_OUTX_H_G 0X23
38+
#define LSM6DS3_OUTY_L_G 0X24
39+
#define LSM6DS3_OUTY_H_G 0X25
40+
#define LSM6DS3_OUTZ_L_G 0X26
41+
#define LSM6DS3_OUTZ_H_G 0X27
42+
43+
#define LSM6DS3_OUTX_L_XL 0X28
44+
#define LSM6DS3_OUTX_H_XL 0X29
45+
#define LSM6DS3_OUTY_L_XL 0X2A
46+
#define LSM6DS3_OUTY_H_XL 0X2B
47+
#define LSM6DS3_OUTZ_L_XL 0X2C
48+
#define LSM6DS3_OUTZ_H_XL 0X2D
49+
50+
2451

2552
class LSM6DS3Class {
2653
public:
@@ -42,7 +69,7 @@ class LSM6DS3Class {
4269
virtual int gyroscopeAvailable(); // Check for available data from gyroscope
4370

4471

45-
private:
72+
protected:
4673
int readRegister(uint8_t address);
4774
int readRegisters(uint8_t address, uint8_t* data, size_t length);
4875
int writeRegister(uint8_t address, uint8_t value);

0 commit comments

Comments
 (0)