diff --git a/lis3dh.c b/lis3dh.c index 8ee185a..a27d220 100644 --- a/lis3dh.c +++ b/lis3dh.c @@ -67,20 +67,20 @@ int lis3dh_init(lis3dh_t *lis3dh) { lis3dh->cfg.filter.ia1 = 0; lis3dh->cfg.filter.ia2 = 0; - lis3dh->cfg.pin1.click = 0; - lis3dh->cfg.pin1.ia1 = 0; - lis3dh->cfg.pin1.ia2 = 0; - lis3dh->cfg.pin1.drdy_zyxda = 0; - lis3dh->cfg.pin1.drdy_321 = 0; - lis3dh->cfg.pin1.wtm = 0; - lis3dh->cfg.pin1.overrun = 0; + lis3dh->cfg.int1.click = 0; + lis3dh->cfg.int1.ia1 = 0; + lis3dh->cfg.int1.ia2 = 0; + lis3dh->cfg.int1.drdy_zyxda = 0; + lis3dh->cfg.int1.drdy_321 = 0; + lis3dh->cfg.int1.wtm = 0; + lis3dh->cfg.int1.overrun = 0; - lis3dh->cfg.pin2.click = 0; - lis3dh->cfg.pin2.ia1 = 0; - lis3dh->cfg.pin2.ia2 = 0; - lis3dh->cfg.pin2.boot = 0; - lis3dh->cfg.pin2.act = 0; - lis3dh->cfg.pin2.polarity = 0; + lis3dh->cfg.int2.click = 0; + lis3dh->cfg.int2.ia1 = 0; + lis3dh->cfg.int2.ia2 = 0; + lis3dh->cfg.int2.boot = 0; + lis3dh->cfg.int2.act = 0; + lis3dh->cfg.int2.polarity = 0; err |= lis3dh_reset(lis3dh); @@ -103,21 +103,21 @@ int lis3dh_configure(lis3dh_t *lis3dh) { ctrl_reg6 = 0; fifo_ctrl_reg = 0; - /* set pin interrupt settings */ - ctrl_reg3 |= (lis3dh->cfg.pin1.click & 1) << 7; - ctrl_reg3 |= (lis3dh->cfg.pin1.ia1 & 1) << 6; - ctrl_reg3 |= (lis3dh->cfg.pin1.ia2 & 1) << 5; - ctrl_reg3 |= (lis3dh->cfg.pin1.drdy_zyxda & 1) << 4; - ctrl_reg3 |= (lis3dh->cfg.pin1.drdy_321 & 1) << 3; - ctrl_reg3 |= (lis3dh->cfg.pin1.wtm & 1) << 2; - ctrl_reg3 |= (lis3dh->cfg.pin1.overrun & 1) << 1; + /* set interrupt registers */ + ctrl_reg3 |= (lis3dh->cfg.int1.click & 1) << 7; + ctrl_reg3 |= (lis3dh->cfg.int1.ia1 & 1) << 6; + ctrl_reg3 |= (lis3dh->cfg.int1.ia2 & 1) << 5; + ctrl_reg3 |= (lis3dh->cfg.int1.drdy_zyxda & 1) << 4; + ctrl_reg3 |= (lis3dh->cfg.int1.drdy_321 & 1) << 3; + ctrl_reg3 |= (lis3dh->cfg.int1.wtm & 1) << 2; + ctrl_reg3 |= (lis3dh->cfg.int1.overrun & 1) << 1; - ctrl_reg6 |= (lis3dh->cfg.pin2.click & 1) << 7; - ctrl_reg6 |= (lis3dh->cfg.pin2.ia1 & 1) << 6; - ctrl_reg6 |= (lis3dh->cfg.pin2.ia2 & 1) << 5; - ctrl_reg6 |= (lis3dh->cfg.pin2.boot & 1) << 4; - ctrl_reg6 |= (lis3dh->cfg.pin2.act & 1) << 3; - ctrl_reg6 |= (lis3dh->cfg.pin2.polarity & 1) << 1; + ctrl_reg6 |= (lis3dh->cfg.int2.click & 1) << 7; + ctrl_reg6 |= (lis3dh->cfg.int2.ia1 & 1) << 6; + ctrl_reg6 |= (lis3dh->cfg.int2.ia2 & 1) << 5; + ctrl_reg6 |= (lis3dh->cfg.int2.boot & 1) << 4; + ctrl_reg6 |= (lis3dh->cfg.int2.act & 1) << 3; + ctrl_reg6 |= (lis3dh->cfg.int2.polarity & 1) << 1; /* set enable FIFO */ if (lis3dh->cfg.fifo.mode != 0xFF) { diff --git a/lis3dh.h b/lis3dh.h index 309d47d..d93b97c 100644 --- a/lis3dh.h +++ b/lis3dh.h @@ -63,7 +63,7 @@ struct lis3dh_device { int (*deinit)(void); }; -struct lis3dh_pin2_config { +struct lis3dh_int2_config { uint8_t click; /* CLICK interrupt */ uint8_t ia1; /* IA1 interrupt */ uint8_t ia2; /* IA2 interrupt */ @@ -72,7 +72,7 @@ struct lis3dh_pin2_config { uint8_t polarity; /* INT1 & INT2 polarity. 0 active high, 1 active low */ }; -struct lis3dh_pin1_config { +struct lis3dh_int1_config { uint8_t click; /* CLICK interrupt */ uint8_t ia1; /* IA1 interrupt */ uint8_t ia2; /* IA2 interrupt */ @@ -103,8 +103,8 @@ struct lis3dh_config { uint8_t mode; /* LPen and HR */ struct lis3dh_fifo_config fifo; struct lis3dh_filter_config filter; - struct lis3dh_pin1_config pin1; - struct lis3dh_pin2_config pin2; + struct lis3dh_int1_config int1; + struct lis3dh_int2_config int2; }; struct lis3dh_acceleration { diff --git a/main.c b/main.c index 7a0da58..acacf9d 100644 --- a/main.c +++ b/main.c @@ -52,7 +52,7 @@ int main() { lis.cfg.rate = LIS3DH_ODR_100_HZ; lis.cfg.fifo.mode = LIS3DH_FIFO_MODE_STREAM; lis.cfg.fifo.trig = LIS3DH_FIFO_TRIG_INT1; - lis.cfg.pin1.overrun = 1; + lis.cfg.int1.overrun = 1; /* write device config */