lis2dh: add support for interrupt latching (stays active until cleared)

diff --git a/apps/Sensor Watch Accelerometer Test/app.c b/apps/Sensor Watch Accelerometer Test/app.c
index f9483ebc04613872a28f26ec682257a4b05509b0..bea00f6fa9488d1ee1ee8d62f9f397d6ff7d4e69 100644 (file)
--- a/apps/Sensor Watch Accelerometer Test/app.c
+++ b/apps/Sensor Watch Accelerometer Test/app.c
@@ -58,7 +58,7 @@ void app_init() {
         LIS2DH_INTERRUPT_CONFIGURATION_OR |
         LIS2DH_INTERRUPT_CONFIGURATION_X_HIGH_ENABLE |
         LIS2DH_INTERRUPT_CONFIGURATION_Y_HIGH_ENABLE |
-        LIS2DH_INTERRUPT_CONFIGURATION_Z_HIGH_ENABLE, 96, 0);
+        LIS2DH_INTERRUPT_CONFIGURATION_Z_HIGH_ENABLE, 96, 0, true);
 
     watch_register_interrupt_callback(A1, cb_interrupt_1, INTERRUPT_TRIGGER_RISING);
     watch_rtc_register_tick_callback(cb_tick);

diff --git a/watch-library/driver/lis2dh.c b/watch-library/driver/lis2dh.c
index 8266905f862e35dc7418ff61ea41954e34b936a7..21087befcd9e0af443382b244cae1d257df0ca31 100644 (file)
--- a/watch-library/driver/lis2dh.c
+++ b/watch-library/driver/lis2dh.c
@@ -115,22 +115,26 @@ lis2dh_data_rate_t lis2dh_get_data_rate() {
     return watch_i2c_read8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL1) >> 4;
 }
 
-void lis2dh_configure_aoi_int1(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration) {
+void lis2dh_configure_aoi_int1(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration, bool latch) {
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL3, LIS2DH_CTRL3_VAL_I1_AOI1);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT1_CFG, configuration);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT1_THS, threshold);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT1_DUR, duration);
+    uint8_t val = watch_i2c_read8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL5) & 0xF7;
+    watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL5, val | latch ? LIS2DH_CTRL5_VAL_LIR_INT1 : 0);
 }
 
 lis2dh_interrupt_state lis2dh_get_int1_state() {
     return (lis2dh_interrupt_state) watch_i2c_read8(LIS2DH_ADDRESS, LIS2DH_REG_INT1_SRC);
 }
 
-void lis2dh_configure_aoi_int2(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration) {
+void lis2dh_configure_aoi_int2(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration, bool latch) {
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL6, LIS2DH_CTRL6_VAL_I2_INT2);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT2_CFG, configuration);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT2_THS, threshold);
     watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_INT2_DUR, duration);
+    uint8_t val = watch_i2c_read8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL5) & 0xFD;
+    watch_i2c_write8(LIS2DH_ADDRESS, LIS2DH_REG_CTRL5, val | latch ? LIS2DH_CTRL5_VAL_LIR_INT2 : 0);
 }
 
 lis2dh_interrupt_state lis2dh_get_int2_state() {

diff --git a/watch-library/driver/lis2dh.h b/watch-library/driver/lis2dh.h
index f3e7ec84697f003c3b3874491977ac86fb8c9cab..ddd42126ee81caed06e34d2adbad2cbf7e975ff1 100644 (file)
--- a/watch-library/driver/lis2dh.h
+++ b/watch-library/driver/lis2dh.h
@@ -102,11 +102,11 @@ void lis2dh_set_data_rate(lis2dh_data_rate_t dataRate);
 
 lis2dh_data_rate_t lis2dh_get_data_rate();
 
-void lis2dh_configure_aoi_int1(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration);
+void lis2dh_configure_aoi_int1(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration, bool latch);
 
 lis2dh_interrupt_state lis2dh_get_int1_state();
 
-void lis2dh_configure_aoi_int2(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration);
+void lis2dh_configure_aoi_int2(lis2dh_interrupt_configuration configuration, uint8_t threshold, uint8_t duration, bool latch);
 
 lis2dh_interrupt_state lis2dh_get_int2_state();