Revert "Added double-tap capabilities to LIS2DW"

diff --git a/movement.c b/movement.c
index e81ccb94b12ac4d082e26e112f649c8d79d86370..ec54a9ba9e663149a4bb3f363830a9094785803f 100644 (file)
--- a/movement.c
+++ b/movement.c
@@ -514,7 +514,7 @@ bool movement_enable_tap_detection_if_available(void) {
     if (movement_state.has_lis2dw) {
         // configure tap duration threshold and enable Z axis
         lis2dw_configure_tap_threshold(0, 0, 12, LIS2DW_REG_TAP_THS_Z_Z_AXIS_ENABLE);
-        lis2dw_configure_tap_duration(2, 2, 2);
+        lis2dw_configure_tap_duration(10, 2, 2);
 
         // ramp data rate up to 400 Hz and high performance mode
         lis2dw_set_low_noise_mode(true);
@@ -525,7 +525,7 @@ bool movement_enable_tap_detection_if_available(void) {
         delay_ms(3);
 
         // enable tap detection on INT1/A3.
-        lis2dw_configure_int1(LIS2DW_CTRL4_INT1_SINGLE_TAP | LIS2DW_CTRL4_INT1_DOUBLE_TAP);
+        lis2dw_configure_int1(LIS2DW_CTRL4_INT1_SINGLE_TAP | LIS2DW_CTRL4_INT1_6D);
 
         return true;
     }
@@ -539,7 +539,6 @@ bool movement_disable_tap_detection_if_available(void) {
         lis2dw_set_low_noise_mode(false);
         lis2dw_set_data_rate(movement_state.accelerometer_background_rate);
         lis2dw_set_mode(LIS2DW_MODE_LOW_POWER);
-        lis2dw_disable_double_tap();
         // ...disable Z axis (not sure if this is needed, does this save power?)...
         lis2dw_configure_tap_threshold(0, 0, 0, 0);
 

diff --git a/watch-library/shared/driver/lis2dw.c b/watch-library/shared/driver/lis2dw.c
index 1c89f244f75b356b164c9a3c25fbb0055f5e0ffd..b716f790384ea027ea2dc36e6ae8458d0fb52578 100644 (file)
--- a/watch-library/shared/driver/lis2dw.c
+++ b/watch-library/shared/driver/lis2dw.c
@@ -302,20 +302,6 @@ void lis2dw_clear_fifo(void) {
 #endif
 }
 
-void lis2dw_enable_double_tap(void) {
-#ifdef I2C_SERCOM
-    uint8_t configuration = watch_i2c_read8(LIS2DW_ADDRESS, LIS2DW_REG_WAKE_UP_THS);
-    watch_i2c_write8(LIS2DW_ADDRESS, LIS2DW_REG_WAKE_UP_THS, configuration | LIS2DW_WAKE_UP_THS_ENABLE_DOUBLE_TAP);
-#endif
-}
-
-void lis2dw_disable_double_tap(void) {
-#ifdef I2C_SERCOM
-    uint8_t configuration = watch_i2c_read8(LIS2DW_ADDRESS, LIS2DW_REG_WAKE_UP_THS);
-    watch_i2c_write8(LIS2DW_ADDRESS, LIS2DW_REG_WAKE_UP_THS, configuration & ~LIS2DW_WAKE_UP_THS_ENABLE_DOUBLE_TAP);
-#endif
-}
-
 void lis2dw_enable_sleep(void) {
 #ifdef I2C_SERCOM
     uint8_t configuration = watch_i2c_read8(LIS2DW_ADDRESS, LIS2DW_REG_WAKE_UP_THS);

diff --git a/watch-library/shared/driver/lis2dw.h b/watch-library/shared/driver/lis2dw.h
index 3b017c6543e108a96ca795b9e53efd90b2454e8b..57ff05b2ab75ed4ea9392d504b77052a26c06e97 100644 (file)
--- a/watch-library/shared/driver/lis2dw.h
+++ b/watch-library/shared/driver/lis2dw.h
@@ -343,10 +343,6 @@ bool lis2dw_read_fifo(lis2dw_fifo_t *fifo_data);
 
 void lis2dw_clear_fifo(void);
 
-void lis2dw_enable_double_tap(void);
-
-void lis2dw_disable_double_tap(void);
-
 void lis2dw_enable_sleep(void);
 
 void lis2dw_disable_sleep(void);