Skip to content

fixed pp_od enum conflict with esp32 Arduino core #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SaintSampo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed pp_od enum conflict with esp32 Arduino core #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SparkFun_LIS331.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void LIS331::intPinMode(pp_od _pinMode)
uint8_t data;
LIS331_read(CTRL_REG3, &data, 1);
// Setting bit 6 makes int pins open drain.
if (_pinMode == OPEN_DRAIN)
if (_pinMode == OPEN_DRAIN_PIN)
{
data |= 1<<6;
}
Expand Down
2 changes: 1 addition & 1 deletion src/SparkFun_LIS331.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class LIS331
LOW_POWER_2HZ, LOW_POWER_5HZ, LOW_POWER_10HZ} power_mode;
typedef enum {DR_50HZ, DR_100HZ, DR_400HZ, DR_1000HZ} data_rate;
typedef enum {HPC_8, HPC_16, HPC_32, HPC_64} high_pass_cutoff_freq_cfg;
typedef enum {PUSH_PULL, OPEN_DRAIN} pp_od;
typedef enum {PUSH_PULL_PIN, OPEN_DRAIN_PIN} pp_od;
typedef enum {INT_SRC, INT1_2_SRC, DRDY, BOOT} int_sig_src;
typedef enum {LOW_RANGE, MED_RANGE, NO_RANGE, HIGH_RANGE} fs_range;
typedef enum {X_AXIS, Y_AXIS, Z_AXIS} int_axis;
Expand Down