You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2022/06/15 19:06:11 UTC
[mynewt-core] branch master updated (c356dc815 -> 73c0725b4)
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
from c356dc815 mempool: Fix OS_MEMPOOL_SIZE when OS_MEMPOOL_GUARD is on
new c25934a97 lsm6dsl: add tilt functionality
new dd00abc21 lsm6dsl_shell: Add dump of some bankA and bankB registers
new 73c0725b4 lsm6dsl: Style check changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h | 23 +++-
hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c | 142 ++++++++++++++++++---
hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h | 29 ++++-
hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c | 57 ++++++++-
hw/sensor/include/sensor/sensor.h | 6 +
5 files changed, 231 insertions(+), 26 deletions(-)
[mynewt-core] 01/03: lsm6dsl: add tilt functionality
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit c25934a970b9648313b78a901ba0e41a567d3ec6
Author: JustineKH <ju...@juul.com>
AuthorDate: Fri Jun 10 12:39:34 2022 -0700
lsm6dsl: add tilt functionality
---
.../sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h | 15 +++
hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c | 101 +++++++++++++++++++++
hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h | 29 +++++-
hw/sensor/include/sensor/sensor.h | 6 ++
4 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h b/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
index e0c341f6c..2281144b4 100644
--- a/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
+++ b/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
@@ -107,6 +107,17 @@ struct lsm6dsl_ff_settings {
free_fall_threshold_t free_fall_ths;
};
+struct lsm6dsl_tilt_settings {
+ uint8_t en_rel_tilt;
+ uint8_t en_wrist_tilt;
+ /* Timer for latency. 1LSB = 40ms */
+ uint8_t tilt_lat;
+ /* Threshold for Tilt function 1LSB = 15.626 mg*/
+ uint8_t tilt_ths;
+ /* A_WRIST_TILT_Mask reg (z pos and neg)*/
+ uint8_t tilt_axis_mask;
+};
+
struct lsm6dsl_tap_settings {
/* Axis enabled bitmask */
uint8_t en_x: 1;
@@ -165,6 +176,9 @@ struct int_src_regs {
uint8_t tap_src;
uint8_t d6d_src;
uint8_t status_reg;
+ uint8_t func_src1;
+ uint8_t func_src2;
+ uint8_t wrist_tilt_ia;
};
struct lsm6dsl_cfg {
@@ -177,6 +191,7 @@ struct lsm6dsl_cfg {
struct lsm6dsl_orientation_settings orientation;
struct lsm6dsl_wk_settings wk;
struct lsm6dsl_ff_settings ff;
+ struct lsm6dsl_tilt_settings tilt;
/* Event notification config */
struct lsm6dsl_notif_cfg *notify_cfg;
diff --git a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
index 1de931c1c..0783ffb21 100644
--- a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
+++ b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
@@ -45,6 +45,24 @@
/* Default event notification */
static const struct lsm6dsl_notif_cfg default_notif_cfg[] = {
+ {
+ .event = SENSOR_EVENT_TYPE_TILT_POS,
+ .int_num = 0,
+ .int_mask = LSM6DSL_A_WRIST_TILT_ZPOS_MASK,
+ .int_en = LSM6DSL_INT1_TILT_MASK,
+ },
+ {
+ .event = SENSOR_EVENT_TYPE_TILT_NEG,
+ .int_num = 0,
+ .int_mask = LSM6DSL_A_WRIST_TILT_ZNEG_MASK,
+ .int_en = LSM6DSL_INT1_TILT_MASK,
+ },
+ {
+ .event = SENSOR_EVENT_TYPE_TILT_CHANGE,
+ .int_num = 0,
+ .int_mask = LSM6DSL_TILT_IA_MASK,
+ .int_en = LSM6DSL_INT1_TILT_MASK,
+ },
{
.event = SENSOR_EVENT_TYPE_SINGLE_TAP,
.int_num = 0,
@@ -91,6 +109,9 @@ STATS_SECT_START(lsm6dsl_stat_section)
STATS_SECT_ENTRY(single_tap_notify)
STATS_SECT_ENTRY(double_tap_notify)
STATS_SECT_ENTRY(free_fall_notify)
+ STATS_SECT_ENTRY(rel_tilt_notify)
+ STATS_SECT_ENTRY(abs_tilt_pos_notify)
+ STATS_SECT_ENTRY(abs_tilt_neg_notify)
STATS_SECT_ENTRY(sleep_notify)
STATS_SECT_ENTRY(orientation_notify)
STATS_SECT_ENTRY(wakeup_notify)
@@ -104,6 +125,9 @@ STATS_NAME_START(lsm6dsl_stat_section)
#if MYNEWT_VAL(LSM6DSL_NOTIF_STATS)
STATS_NAME(lsm6dsl_stat_section, single_tap_notify)
STATS_NAME(lsm6dsl_stat_section, double_tap_notify)
+ STATS_NAME(lsm6dsl_stat_section, rel_tilt_notify)
+ STATS_NAME(lsm6dsl_stat_section, abs_tilt_pos_notify)
+ STATS_NAME(lsm6dsl_stat_section, abs_tilt_neg_notify)
STATS_NAME(lsm6dsl_stat_section, free_fall_notify)
STATS_NAME(lsm6dsl_stat_section, sleep_notify)
STATS_NAME(lsm6dsl_stat_section, orientation_notify)
@@ -816,8 +840,12 @@ lsm6dsl_clear_int(struct lsm6dsl *lsm6dsl, struct int_src_regs *int_src)
* Interrupt status could have been read in single 4 byte I2C transaction, but
* if wake_up_src is read first D6D_IA bit from D6D_SRC is cleared
* and information about orientation change is lost.
+ * 3 byte read of FUNC_SRC1 will get FUNC_SRC1, FUNC_SRC2, and WRIST_TILT_IA.
*/
rc = lsm6dsl_read(lsm6dsl, LSM6DSL_D6D_SRC_REG, (uint8_t *)&int_src->d6d_src, 2);
+ if (rc == 0) {
+ rc = lsm6dsl_read(lsm6dsl, LSM6DSL_FUNC_SRC1_REG, (uint8_t *)&int_src->func_src1, 3);
+ }
if (rc == 0) {
rc = lsm6dsl_read(lsm6dsl, LSM6DSL_WAKE_UP_SRC_REG, (uint8_t *)&int_src->wake_up_src, 2);
}
@@ -998,6 +1026,51 @@ lsm6dsl_get_wake_up(struct lsm6dsl *lsm6dsl, struct lsm6dsl_wk_settings *wk)
return 0;
}
+int
+lsm6dsl_set_tilt(struct lsm6dsl *lsm6dsl,
+ const struct lsm6dsl_tilt_settings *cfg)
+{
+ int rc;
+ uint8_t en_mask;
+
+ en_mask = (cfg->en_rel_tilt * LSM6DSL_TILT_EN_MASK) | (cfg->en_wrist_tilt * LSM6DSL_WRIST_TILT_EN_MASK);
+
+ if (en_mask) {
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_CTRL10_C_REG, LSM6DSL_FUNC_EN_MASK | en_mask);
+ if (rc) {
+ return rc;
+ }
+ if (cfg->en_wrist_tilt) {
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
+ if (rc) {
+ return rc;
+ }
+
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_A_WRIST_TILT_LAT_REG, cfg->tilt_lat);
+ if (rc) {
+ goto err;
+ }
+
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_A_WRIST_TILT_THS_REG, cfg->tilt_ths);
+ if (rc) {
+ goto err;
+ }
+
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_A_WRIST_TILT_MASK_REG, cfg->tilt_axis_mask);
+
+err:
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, 0x00);
+ }
+ } else {
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_CTRL10_C_REG, en_mask);
+ if (rc) {
+ return rc;
+ }
+ }
+
+ return rc;
+}
+
static void
init_interrupt(struct lsm6dsl_int *interrupt, int pin, int active_level)
{
@@ -2158,6 +2231,15 @@ lsm6dsl_inc_notif_stats(sensor_event_type_t event)
case SENSOR_EVENT_TYPE_FREE_FALL:
STATS_INC(g_lsm6dsl_stats, free_fall_notify);
break;
+ case SENSOR_EVENT_TYPE_TILT_CHANGE:
+ STATS_INC(g_lsm6dsl_stats, rel_tilt_notify);
+ break;
+ case SENSOR_EVENT_TYPE_TILT_POS:
+ STATS_INC(g_lsm6dsl_stats, abs_tilt_pos_notify);
+ break;
+ case SENSOR_EVENT_TYPE_TILT_NEG:
+ STATS_INC(g_lsm6dsl_stats, abs_tilt_neg_notify);
+ break;
default:
break;
}
@@ -2216,6 +2298,20 @@ lsm6dsl_sensor_handle_interrupt(struct sensor *sensor)
lsm6dsl_inc_notif_stats(SENSOR_EVENT_TYPE_ORIENT_CHANGE);
}
+ rc = lsm6dsl_notify(lsm6dsl, int_src.func_src1, SENSOR_EVENT_TYPE_TILT_CHANGE);
+ if (!rc) {
+ lsm6dsl_inc_notif_stats(SENSOR_EVENT_TYPE_TILT_CHANGE);
+ }
+
+ rc = lsm6dsl_notify(lsm6dsl, int_src.wrist_tilt_ia, SENSOR_EVENT_TYPE_TILT_POS);
+ if (!rc) {
+ lsm6dsl_inc_notif_stats(SENSOR_EVENT_TYPE_TILT_POS);
+ }
+
+ rc = lsm6dsl_notify(lsm6dsl, int_src.wrist_tilt_ia, SENSOR_EVENT_TYPE_TILT_NEG);
+ if (!rc) {
+ lsm6dsl_inc_notif_stats(SENSOR_EVENT_TYPE_TILT_NEG);
+ }
return rc;
}
@@ -2514,6 +2610,11 @@ lsm6dsl_config(struct lsm6dsl *lsm6dsl, struct lsm6dsl_cfg *cfg)
goto end;
}
+ rc = lsm6dsl_set_tilt(lsm6dsl, &cfg->tilt);
+ if (rc) {
+ goto end;
+ }
+
lsm6dsl_set_latched_int(lsm6dsl, cfg->latched_int);
lsm6dsl_set_map_int2_to_int1(lsm6dsl, cfg->map_int2_to_int1);
diff --git a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h
index 5a070cc99..4a938a170 100644
--- a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h
+++ b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_priv.h
@@ -37,7 +37,7 @@ extern "C" {
#define LSM6DSL_FUNC_CFG_ACCESS_REG 0x01
#define LSM6DSL_FUNC_CFG_ACCESS_MASK 0x80
-#define LSM6DSL_SHUB_REG_ACCESS_MASK 0x40
+#define LSM6DSL_SHUB_REG_ACCESS_MASK 0x20
/*
* FIFO control register 1
@@ -650,6 +650,25 @@ extern "C" {
#define LSM6DSL_SENSORHUB17_REG 0x51
#define LSM6DSL_SENSORHUB18_REG 0x52
+/*
+ * FUNC_SRC1 register
+ */
+#define LSM6DSL_FUNC_SRC1_REG 0x53
+#define LSM6DSL_SENSORHUB_END_OP_MASK 0x01
+#define LSM6DSL_SI_END_OP_MASK 0x02
+#define LSM6DSL_HI_FAI_MASKL 0x04
+#define LSM6DSL_STEP_OVERFLOW_MASK 0x08
+#define LSM6DSL_STEP_DETECTED_MASK 0x10
+#define LSM6DSL_TILT_IA_MASK 0x20
+#define LSM6DSL_SIGN_MOTION_IA_MASK 0x40
+#define LSM6DSL_STEP_COUNT_DELTA_IA_MASK 0x80
+
+/*
+ * FUNC_SRC2 register
+ */
+#define LSM6DSL_FUNC_SRC2_REG 0x54
+#define LSM6DSL_WRIST_TILT_IA_MASK 0x01
+
/* Bank A registers */
#define LSM6DSL_SLV0_ADD_REG 0x02
#define LSM6DSL_SLV0_SUBADD_REG 0x03
@@ -690,6 +709,14 @@ extern "C" {
#define LSM6DSL_A_WRIST_TILT_THS_REG 0x54
#define LSM6DSL_A_WRIST_TILT_MASK_REG 0x59
+#define LSM6DSL_A_WRIST_TILT_IA_REG 0x55
+#define LSM6DSL_A_WRIST_TILT_XPOS_MASK 0x80
+#define LSM6DSL_A_WRIST_TILT_XNEG_MASK 0x40
+#define LSM6DSL_A_WRIST_TILT_YPOS_MASK 0x20
+#define LSM6DSL_A_WRIST_TILT_YNEG_MASK 0x10
+#define LSM6DSL_A_WRIST_TILT_ZPOS_MASK 0x08
+#define LSM6DSL_A_WRIST_TILT_ZNEG_MASK 0x04
+
#define LSM6DSL_MAX_FIFO_DEPTH 2048
/* Self Test output converted in LSB */
diff --git a/hw/sensor/include/sensor/sensor.h b/hw/sensor/include/sensor/sensor.h
index 99c3592a5..a9669e797 100644
--- a/hw/sensor/include/sensor/sensor.h
+++ b/hw/sensor/include/sensor/sensor.h
@@ -140,6 +140,12 @@ typedef enum {
SENSOR_EVENT_TYPE_ORIENT_Y_H_CHANGE = (1 << 14),
/* Orientation Change Event in the Z H direction */
SENSOR_EVENT_TYPE_ORIENT_Z_H_CHANGE = (1 << 15),
+ /* Relative tilt Change Event */
+ SENSOR_EVENT_TYPE_TILT_CHANGE = (1 << 16),
+ /* Absolute tilt Change Event in the positive direction */
+ SENSOR_EVENT_TYPE_TILT_POS = (1 << 17),
+ /* Absolute tilt Change Event in the negative direction */
+ SENSOR_EVENT_TYPE_TILT_NEG = (1 << 18),
} sensor_event_type_t;
[mynewt-core] 02/03: lsm6dsl_shell: Add dump of some bankA and bankB registers
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit dd00abc21614708e4e9fbaab6390a660326a3b65
Author: JustineKH <ju...@juul.com>
AuthorDate: Fri Jun 10 12:44:09 2022 -0700
lsm6dsl_shell: Add dump of some bankA and bankB registers
---
hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c | 53 ++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
index 2047564b3..d34123cd6 100644
--- a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
+++ b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
@@ -80,6 +80,21 @@ static const reg_name_t reg_name[] = {
{ .addr = 0x5f, .regname = "MD2_CFG" },
};
+/* Human readable register map for bankA */
+static const reg_name_t reg_name_banka[] = {
+ { .addr = 0x0f, .regname = "CONFIG_PEDO_THS_MIN" },
+ { .addr = 0x13, .regname = "SM_THS" },
+ { .addr = 0x14, .regname = "PEDO_DEB_REG" },
+ { .addr = 0x15, .regname = "STEP_COUNT_DELTA" },
+};
+
+/* Human readable register map for bankB */
+static const reg_name_t reg_name_bankb[] = {
+ { .addr = 0x50, .regname = "A_WRIST_TILT_LAT" },
+ { .addr = 0x54, .regname = "A_WRIST_TILT_THS" },
+ { .addr = 0x59, .regname = "A_WRIST_TILT_Mask" },
+};
+
static struct shell_cmd lsm6dsl_shell_cmd_struct = {
.sc_cmd = "lsm6dsl",
.sc_cmd_func = lsm6dsl_shell_cmd
@@ -172,6 +187,44 @@ lsm6dsl_shell_cmd_dump(int argc, char **argv)
reg_name[i].regname, reg_name[i].addr, value);
}
}
+
+ /* Bank A */
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK);
+ if (rc) {
+ return rc;
+ }
+ for (i = 0; i < ARRAY_SIZE(reg_name_banka); i++) {
+ rc = lsm6dsl_read(g_lsm6dsl, reg_name_banka[i].addr, &value, 1);
+ if (rc) {
+ console_printf("dump failed %d\n", rc);
+ } else if (all || value != 0){
+ console_printf("%-22s(0x%02X) = 0x%02X\n",
+ reg_name_banka[i].regname, reg_name_banka[i].addr, value);
+ }
+ }
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, 0);
+ if (rc) {
+ return rc;
+ }
+
+ /* Bank B */
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
+ if (rc) {
+ return rc;
+ }
+ for (i = 0; i < ARRAY_SIZE(reg_name_bankb); i++) {
+ rc = lsm6dsl_read(g_lsm6dsl, reg_name_bankb[i].addr, &value, 1);
+ if (rc) {
+ console_printf("dump failed %d\n", rc);
+ } else if (all || value != 0){
+ console_printf("%-22s(0x%02X) = 0x%02X\n",
+ reg_name_bankb[i].regname, reg_name_bankb[i].addr, value);
+ }
+ }
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, 0);
+ if (rc) {
+ return rc;
+ }
} else {
sreg = parse_ll_bounds(argv[2], 0x02, 0x7F, &rc);
if (rc != 0) {
[mynewt-core] 03/03: lsm6dsl: Style check changes
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 73c0725b40b84c5e6ad192dbe70014e59c0a0b03
Author: JustineKH <ju...@juul.com>
AuthorDate: Wed Jun 15 07:04:06 2022 -0700
lsm6dsl: Style check changes
---
.../sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h | 8 +--
hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c | 63 +++++++++++-----------
hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c | 12 +++--
3 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h b/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
index 2281144b4..d5b851cca 100644
--- a/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
+++ b/hw/drivers/sensors/lsm6dsl/include/lsm6dsl/lsm6dsl.h
@@ -120,10 +120,10 @@ struct lsm6dsl_tilt_settings {
struct lsm6dsl_tap_settings {
/* Axis enabled bitmask */
- uint8_t en_x: 1;
- uint8_t en_y: 1;
- uint8_t en_z: 1;
- uint8_t en_dtap: 1;
+ uint8_t en_x : 1;
+ uint8_t en_y : 1;
+ uint8_t en_z : 1;
+ uint8_t en_dtap : 1;
/* Threshold for tap recognition */
int8_t tap_ths;
diff --git a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
index 0783ffb21..68496750c 100644
--- a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
+++ b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl.c
@@ -1028,7 +1028,7 @@ lsm6dsl_get_wake_up(struct lsm6dsl *lsm6dsl, struct lsm6dsl_wk_settings *wk)
int
lsm6dsl_set_tilt(struct lsm6dsl *lsm6dsl,
- const struct lsm6dsl_tilt_settings *cfg)
+ const struct lsm6dsl_tilt_settings *cfg)
{
int rc;
uint8_t en_mask;
@@ -1041,7 +1041,8 @@ lsm6dsl_set_tilt(struct lsm6dsl *lsm6dsl,
return rc;
}
if (cfg->en_wrist_tilt) {
- rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
+ rc = lsm6dsl_write_reg(lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG,
+ LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
if (rc) {
return rc;
}
@@ -2213,35 +2214,35 @@ lsm6dsl_inc_notif_stats(sensor_event_type_t event)
{
#if MYNEWT_VAL(LSM6DSL_NOTIF_STATS)
switch (event) {
- case SENSOR_EVENT_TYPE_SINGLE_TAP:
- STATS_INC(g_lsm6dsl_stats, single_tap_notify);
- break;
- case SENSOR_EVENT_TYPE_DOUBLE_TAP:
- STATS_INC(g_lsm6dsl_stats, double_tap_notify);
- break;
- case SENSOR_EVENT_TYPE_ORIENT_CHANGE:
- STATS_INC(g_lsm6dsl_stats, orientation_notify);
- break;
- case SENSOR_EVENT_TYPE_SLEEP:
- STATS_INC(g_lsm6dsl_stats, sleep_notify);
- break;
- case SENSOR_EVENT_TYPE_WAKEUP:
- STATS_INC(g_lsm6dsl_stats, wakeup_notify);
- break;
- case SENSOR_EVENT_TYPE_FREE_FALL:
- STATS_INC(g_lsm6dsl_stats, free_fall_notify);
- break;
- case SENSOR_EVENT_TYPE_TILT_CHANGE:
- STATS_INC(g_lsm6dsl_stats, rel_tilt_notify);
- break;
- case SENSOR_EVENT_TYPE_TILT_POS:
- STATS_INC(g_lsm6dsl_stats, abs_tilt_pos_notify);
- break;
- case SENSOR_EVENT_TYPE_TILT_NEG:
- STATS_INC(g_lsm6dsl_stats, abs_tilt_neg_notify);
- break;
- default:
- break;
+ case SENSOR_EVENT_TYPE_SINGLE_TAP:
+ STATS_INC(g_lsm6dsl_stats, single_tap_notify);
+ break;
+ case SENSOR_EVENT_TYPE_DOUBLE_TAP:
+ STATS_INC(g_lsm6dsl_stats, double_tap_notify);
+ break;
+ case SENSOR_EVENT_TYPE_ORIENT_CHANGE:
+ STATS_INC(g_lsm6dsl_stats, orientation_notify);
+ break;
+ case SENSOR_EVENT_TYPE_SLEEP:
+ STATS_INC(g_lsm6dsl_stats, sleep_notify);
+ break;
+ case SENSOR_EVENT_TYPE_WAKEUP:
+ STATS_INC(g_lsm6dsl_stats, wakeup_notify);
+ break;
+ case SENSOR_EVENT_TYPE_FREE_FALL:
+ STATS_INC(g_lsm6dsl_stats, free_fall_notify);
+ break;
+ case SENSOR_EVENT_TYPE_TILT_CHANGE:
+ STATS_INC(g_lsm6dsl_stats, rel_tilt_notify);
+ break;
+ case SENSOR_EVENT_TYPE_TILT_POS:
+ STATS_INC(g_lsm6dsl_stats, abs_tilt_pos_notify);
+ break;
+ case SENSOR_EVENT_TYPE_TILT_NEG:
+ STATS_INC(g_lsm6dsl_stats, abs_tilt_neg_notify);
+ break;
+ default:
+ break;
}
#endif /* LSM6DSL_NOTIF_STATS */
}
diff --git a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
index d34123cd6..fa85cbf28 100644
--- a/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
+++ b/hw/drivers/sensors/lsm6dsl/src/lsm6dsl_shell.c
@@ -182,14 +182,15 @@ lsm6dsl_shell_cmd_dump(int argc, char **argv)
rc = lsm6dsl_read(g_lsm6dsl, reg_name[i].addr, &value, 1);
if (rc) {
console_printf("dump failed %d\n", rc);
- } else if (all || value != 0){
+ } else if (all || value != 0) {
console_printf("%-22s(0x%02X) = 0x%02X\n",
reg_name[i].regname, reg_name[i].addr, value);
}
}
/* Bank A */
- rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK);
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG,
+ LSM6DSL_FUNC_CFG_ACCESS_MASK);
if (rc) {
return rc;
}
@@ -197,7 +198,7 @@ lsm6dsl_shell_cmd_dump(int argc, char **argv)
rc = lsm6dsl_read(g_lsm6dsl, reg_name_banka[i].addr, &value, 1);
if (rc) {
console_printf("dump failed %d\n", rc);
- } else if (all || value != 0){
+ } else if (all || value != 0) {
console_printf("%-22s(0x%02X) = 0x%02X\n",
reg_name_banka[i].regname, reg_name_banka[i].addr, value);
}
@@ -208,7 +209,8 @@ lsm6dsl_shell_cmd_dump(int argc, char **argv)
}
/* Bank B */
- rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG, LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
+ rc = lsm6dsl_write_reg(g_lsm6dsl, LSM6DSL_FUNC_CFG_ACCESS_REG,
+ LSM6DSL_FUNC_CFG_ACCESS_MASK | LSM6DSL_SHUB_REG_ACCESS_MASK);
if (rc) {
return rc;
}
@@ -216,7 +218,7 @@ lsm6dsl_shell_cmd_dump(int argc, char **argv)
rc = lsm6dsl_read(g_lsm6dsl, reg_name_bankb[i].addr, &value, 1);
if (rc) {
console_printf("dump failed %d\n", rc);
- } else if (all || value != 0){
+ } else if (all || value != 0) {
console_printf("%-22s(0x%02X) = 0x%02X\n",
reg_name_bankb[i].regname, reg_name_bankb[i].addr, value);
}