You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by vi...@apache.org on 2018/03/27 00:25:30 UTC
[mynewt-core] branch master updated: Add CLI to LIS2DW12 (#954)
This is an automated email from the ASF dual-hosted git repository.
vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new dd42f2a Add CLI to LIS2DW12 (#954)
dd42f2a is described below
commit dd42f2a74125306ca665af130393637b61390ab8
Author: matthewwarnes <36...@users.noreply.github.com>
AuthorDate: Tue Mar 27 01:25:28 2018 +0100
Add CLI to LIS2DW12 (#954)
* add support for cli to LIS2DW12 and incorporate a couple of fixes/suggestions received
* improve lis2dw12 CLI
---
.../sensors/lis2dw12/include/lis2dw12/lis2dw12.h | 4 +
hw/drivers/sensors/lis2dw12/src/lis2dw12.c | 15 +-
hw/drivers/sensors/lis2dw12/src/lis2dw12_shell.c | 364 +++++++++++++++++++++
hw/drivers/sensors/lis2dw12/syscfg.yml | 15 +
hw/sensor/creator/pkg.yml | 2 +
5 files changed, 389 insertions(+), 11 deletions(-)
diff --git a/hw/drivers/sensors/lis2dw12/include/lis2dw12/lis2dw12.h b/hw/drivers/sensors/lis2dw12/include/lis2dw12/lis2dw12.h
index d780923..25b7829 100644
--- a/hw/drivers/sensors/lis2dw12/include/lis2dw12/lis2dw12.h
+++ b/hw/drivers/sensors/lis2dw12/include/lis2dw12/lis2dw12.h
@@ -545,6 +545,10 @@ int lis2dw12_init(struct os_dev *dev, void *arg);
*/
int lis2dw12_config(struct lis2dw12 *, struct lis2dw12_cfg *);
+#if MYNEWT_VAL(LIS2DW12_CLI)
+int lis2dw12_shell_init(void);
+#endif
+
#ifdef __cplusplus
}
diff --git a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
index c977acf..eff9719 100644
--- a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
+++ b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
@@ -934,11 +934,11 @@ int lis2dw12_set_tap_cfg(struct sensor_itf *itf, struct lis2dw12_tap_settings *c
}
reg = 0;
- reg |= (cfg->latency & LIS2DW12_INT_DUR_LATENCY) << 4;
- reg |= (cfg->quiet & LIS2DW12_INT_DUR_QUIET) << 2;
+ reg |= (cfg->latency & 0xf) << 4;
+ reg |= (cfg->quiet & 0x3) << 2;
reg |= cfg->shock & LIS2DW12_INT_DUR_SHOCK;
- return 0;
+ return lis2dw12_write8(itf, LIS2DW12_REG_INT_DUR, reg);
}
/**
@@ -1951,12 +1951,7 @@ lis2dw12_config(struct lis2dw12 *lis2dw12, struct lis2dw12_cfg *cfg)
goto err;
}
- rc = lis2dw12_write8(itf, LIS2DW12_REG_CTRL_REG2, 0x40);
- if (rc) {
- goto err;
- }
-
- rc = lis2dw12_write8(itf, LIS2DW12_REG_CTRL_REG3, 0x10);
+ rc = lis2dw12_write8(itf, LIS2DW12_REG_CTRL_REG3, LIS2DW12_CTRL_REG3_LIR);
if (rc) {
goto err;
}
@@ -2047,8 +2042,6 @@ lis2dw12_config(struct lis2dw12 *lis2dw12, struct lis2dw12_cfg *cfg)
goto err;
}
lis2dw12->cfg.tap_cfg = cfg->tap_cfg;
-
- lis2dw12_write8(itf, 0x34, 0x80);
rc = sensor_set_type_mask(&(lis2dw12->sensor), cfg->mask);
if (rc) {
diff --git a/hw/drivers/sensors/lis2dw12/src/lis2dw12_shell.c b/hw/drivers/sensors/lis2dw12/src/lis2dw12_shell.c
new file mode 100644
index 0000000..c8a2f16
--- /dev/null
+++ b/hw/drivers/sensors/lis2dw12/src/lis2dw12_shell.c
@@ -0,0 +1,364 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <string.h>
+#include <errno.h>
+#include "sysinit/sysinit.h"
+#include "console/console.h"
+#include "shell/shell.h"
+#include "sensor/accel.h"
+#include "lis2dw12/lis2dw12.h"
+#include "lis2dw12_priv.h"
+#include "parse/parse.h"
+
+#if MYNEWT_VAL(LIS2DW12_CLI)
+
+#define LIS2DW12_CLI_FIRST_REGISTER 0x0D
+#define LIS2DW12_CLI_LAST_REGISTER 0x3F
+
+static int lis2dw12_shell_cmd(int argc, char **argv);
+
+static struct shell_cmd lis2dw12_shell_cmd_struct = {
+ .sc_cmd = "lis2dw12",
+ .sc_cmd_func = lis2dw12_shell_cmd
+};
+
+static struct sensor_itf g_sensor_itf = {
+ .si_type = MYNEWT_VAL(LIS2DW12_SHELL_ITF_TYPE),
+ .si_num = MYNEWT_VAL(LIS2DW12_SHELL_ITF_NUM),
+ .si_cs_pin = MYNEWT_VAL(LIS2DW12_SHELL_CSPIN),
+ .si_addr = MYNEWT_VAL(LIS2DW12_SHELL_ITF_ADDR)
+};
+
+static int
+lis2dw12_shell_err_too_many_args(char *cmd_name)
+{
+ console_printf("Error: too many arguments for command \"%s\"\n",
+ cmd_name);
+ return EINVAL;
+}
+
+static int
+lis2dw12_shell_err_too_few_args(char *cmd_name)
+{
+ console_printf("Error: too few arguments for command \"%s\"\n",
+ cmd_name);
+ return EINVAL;
+}
+
+static int
+lis2dw12_shell_err_unknown_arg(char *cmd_name)
+{
+ console_printf("Error: unknown argument \"%s\"\n",
+ cmd_name);
+ return EINVAL;
+}
+
+static int
+lis2dw12_shell_err_invalid_arg(char *cmd_name)
+{
+ console_printf("Error: invalid argument \"%s\"\n",
+ cmd_name);
+ return EINVAL;
+}
+
+static int
+lis2dw12_shell_help(void)
+{
+ console_printf("%s cmd [flags...]\n", lis2dw12_shell_cmd_struct.sc_cmd);
+ console_printf("cmd:\n");
+ console_printf("\tr [n_samples]\n");
+ console_printf("\tchipid\n");
+ console_printf("\tdump\n");
+ console_printf("\tpeek [reg]\n");
+ console_printf("\tpoke [reg value]\n");
+ console_printf("\ttest\n");
+
+ return 0;
+}
+
+static int
+lis2dw12_shell_cmd_read_chipid(int argc, char **argv)
+{
+ int rc;
+ uint8_t chipid;
+
+ rc = lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_WHO_AM_I, &chipid);
+ if (rc) {
+ goto err;
+ }
+
+ console_printf("CHIP_ID:0x%02X\n", chipid);
+
+ return 0;
+err:
+ return rc;
+}
+
+static int
+lis2dw12_shell_cmd_read(int argc, char **argv)
+{
+ uint16_t samples = 1;
+ uint16_t val;
+ int rc;
+ char tmpstr[13];
+ int16_t x,y,z;
+ float fx,fy,fz;
+
+ if (argc > 3) {
+ return lis2dw12_shell_err_too_many_args(argv[1]);
+ }
+
+ /* Check if more than one sample requested */
+ if (argc == 3) {
+ val = parse_ll_bounds(argv[2], 1, UINT16_MAX, &rc);
+ if (rc) {
+ return lis2dw12_shell_err_invalid_arg(argv[2]);
+ }
+ samples = val;
+ }
+
+ while(samples--) {
+
+ rc = lis2dw12_get_data(&g_sensor_itf, &x, &y, &z);
+ if (rc) {
+ console_printf("Read failed: %d\n", rc);
+ return rc;
+ }
+
+ lis2dw12_calc_acc_ms2(x, &fx);
+ lis2dw12_calc_acc_ms2(y, &fy);
+ lis2dw12_calc_acc_ms2(z, &fz);
+
+ console_printf("x:%s ", sensor_ftostr(fx, tmpstr, 13));
+ console_printf("y:%s ", sensor_ftostr(fy, tmpstr, 13));
+ console_printf("z:%s\n", sensor_ftostr(fz, tmpstr, 13));
+ }
+
+ return 0;
+}
+
+static int
+lis2dw12_shell_cmd_dump(int argc, char **argv)
+{
+ uint8_t val;
+
+ if (argc > 2) {
+ return lis2dw12_shell_err_too_many_args(argv[1]);
+ }
+
+ /* Dump all the register values for debug purposes */
+ val = 0;
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_TEMP_L, &val));
+ console_printf("0x%02X (OUT_TEMP_L): 0x%02X\n", LIS2DW12_REG_OUT_TEMP_L, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_TEMP_H, &val));
+ console_printf("0x%02X (OUT_TEMP_H): 0x%02X\n", LIS2DW12_REG_OUT_TEMP_H, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_WHO_AM_I, &val));
+ console_printf("0x%02X (WHO_AM_I): 0x%02X\n", LIS2DW12_REG_WHO_AM_I, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG1, &val));
+ console_printf("0x%02X (CTRL1): 0x%02X\n", LIS2DW12_REG_CTRL_REG1, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG2, &val));
+ console_printf("0x%02X (CTRL2): 0x%02X\n", LIS2DW12_REG_CTRL_REG2, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG3, &val));
+ console_printf("0x%02X (CTRL3): 0x%02X\n", LIS2DW12_REG_CTRL_REG3, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG4, &val));
+ console_printf("0x%02X (CTRL4): 0x%02X\n", LIS2DW12_REG_CTRL_REG4, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG5, &val));
+ console_printf("0x%02X (CTRL5): 0x%02X\n", LIS2DW12_REG_CTRL_REG5, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG6, &val));
+ console_printf("0x%02X (CTRL6): 0x%02X\n", LIS2DW12_REG_CTRL_REG6, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_TEMP_OUT, &val));
+ console_printf("0x%02X (TEMP_OUT): 0x%02X\n", LIS2DW12_REG_TEMP_OUT, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_STATUS_REG, &val));
+ console_printf("0x%02X (STATUS): 0x%02X\n", LIS2DW12_REG_STATUS_REG, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_X_L, &val));
+ console_printf("0x%02X (OUT_X_L): 0x%02X\n", LIS2DW12_REG_OUT_X_L, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_X_H, &val));
+ console_printf("0x%02X (OUT_X_H): 0x%02X\n", LIS2DW12_REG_OUT_X_H, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_Y_L, &val));
+ console_printf("0x%02X (OUT_Y_L): 0x%02X\n", LIS2DW12_REG_OUT_Y_L, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_Y_H, &val));
+ console_printf("0x%02X (OUT_Y_H): 0x%02X\n", LIS2DW12_REG_OUT_Y_H, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_Z_L, &val));
+ console_printf("0x%02X (OUT_Z_L): 0x%02X\n", LIS2DW12_REG_OUT_Z_L, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_OUT_Z_H, &val));
+ console_printf("0x%02X (OUT_Z_H): 0x%02X\n", LIS2DW12_REG_OUT_Z_H, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_FIFO_CTRL, &val));
+ console_printf("0x%02X (FIFO_CTRL): 0x%02X\n", LIS2DW12_REG_FIFO_CTRL, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_FIFO_SAMPLES, &val));
+ console_printf("0x%02X (FIFO_SAMPLES): 0x%02X\n", LIS2DW12_REG_FIFO_SAMPLES, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_TAP_THS_X, &val));
+ console_printf("0x%02X (TAP_THS_X): 0x%02X\n", LIS2DW12_REG_TAP_THS_X, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_TAP_THS_Y, &val));
+ console_printf("0x%02X (TAP_THS_Y): 0x%02X\n", LIS2DW12_REG_TAP_THS_Y, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_TAP_THS_Z, &val));
+ console_printf("0x%02X (TAP_THS_Z): 0x%02X\n", LIS2DW12_REG_TAP_THS_Z, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_INT_DUR, &val));
+ console_printf("0x%02X (INT_DUR): 0x%02X\n", LIS2DW12_REG_INT_DUR, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_FREEFALL, &val));
+ console_printf("0x%02X (FREEFALL): 0x%02X\n", LIS2DW12_REG_FREEFALL, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_INT_SRC, &val));
+ console_printf("0x%02X (INT_SRC): 0x%02X\n", LIS2DW12_REG_INT_SRC, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_X_OFS, &val));
+ console_printf("0x%02X (X_OFS): 0x%02X\n", LIS2DW12_REG_X_OFS, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_Y_OFS, &val));
+ console_printf("0x%02X (Y_OFS): 0x%02X\n", LIS2DW12_REG_Y_OFS, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_Z_OFS, &val));
+ console_printf("0x%02X (Z_OFS): 0x%02X\n", LIS2DW12_REG_Z_OFS, val);
+ assert(0 == lis2dw12_read8(&g_sensor_itf, LIS2DW12_REG_CTRL_REG7, &val));
+ console_printf("0x%02X (CTRL7): 0x%02X\n", LIS2DW12_REG_CTRL_REG7, val);
+
+ return 0;
+}
+
+static int
+lis2dw12_shell_cmd_peek(int argc, char **argv)
+{
+ int rc;
+ uint8_t value;
+ uint8_t reg;
+
+ if (argc > 3) {
+ return lis2dw12_shell_err_too_many_args(argv[1]);
+ } else if (argc < 3) {
+ return lis2dw12_shell_err_too_few_args(argv[1]);
+ }
+
+ reg = parse_ll_bounds(argv[2], LIS2DW12_CLI_FIRST_REGISTER, LIS2DW12_CLI_LAST_REGISTER, &rc);
+ if (rc != 0) {
+ return lis2dw12_shell_err_invalid_arg(argv[2]);
+ }
+
+ rc = lis2dw12_read8(&g_sensor_itf, reg, &value);
+ if (rc) {
+ console_printf("peek failed %d\n", rc);
+ }else{
+ console_printf("reg 0x%02X(%d) = 0x%02X\n", reg, reg, value);
+ }
+
+ return 0;
+}
+
+static int
+lis2dw12_shell_cmd_poke(int argc, char **argv)
+{
+ int rc;
+ uint8_t reg;
+ uint8_t value;
+
+ if (argc > 4) {
+ return lis2dw12_shell_err_too_many_args(argv[1]);
+ } else if (argc < 4) {
+ return lis2dw12_shell_err_too_few_args(argv[1]);
+ }
+
+ reg = parse_ll_bounds(argv[2], LIS2DW12_CLI_FIRST_REGISTER, LIS2DW12_CLI_LAST_REGISTER, &rc);
+ if (rc != 0) {
+ return lis2dw12_shell_err_invalid_arg(argv[2]);
+ }
+
+ value = parse_ll_bounds(argv[3], 0, 255, &rc);
+ if (rc != 0) {
+ return lis2dw12_shell_err_invalid_arg(argv[3]);
+ }
+
+ rc = lis2dw12_write8(&g_sensor_itf, reg, value);
+ if (rc) {
+ console_printf("poke failed %d\n", rc);
+ }else{
+ console_printf("wrote: 0x%02X(%d) to 0x%02X\n", value, value, reg);
+ }
+
+ return 0;
+}
+
+static int
+lis2dw12_shell_cmd_test(int argc, char **argv)
+{
+ int rc;
+ int result;
+
+ rc = lis2dw12_run_self_test(&g_sensor_itf, &result);
+ if (rc) {
+ goto err;
+ }
+
+ if (result) {
+ console_printf("SELF TEST: FAILED\n");
+ } else {
+ console_printf("SELF TEST: PASSED\n");
+ }
+
+ return 0;
+err:
+ return rc;
+}
+
+static int
+lis2dw12_shell_cmd(int argc, char **argv)
+{
+ if (argc == 1) {
+ return lis2dw12_shell_help();
+ }
+
+ /* Read command (get a new data sample) */
+ if (argc > 1 && strcmp(argv[1], "r") == 0) {
+ return lis2dw12_shell_cmd_read(argc, argv);
+ }
+
+ /* Chip ID */
+ if (argc > 1 && strcmp(argv[1], "chipid") == 0) {
+ return lis2dw12_shell_cmd_read_chipid(argc, argv);
+ }
+
+ /* Dump */
+ if (argc > 1 && strcmp(argv[1], "dump") == 0) {
+ return lis2dw12_shell_cmd_dump(argc, argv);
+ }
+
+ /* Peek */
+ if (argc > 1 && strcmp(argv[1], "peek") == 0) {
+ return lis2dw12_shell_cmd_peek(argc, argv);
+ }
+
+ /* Poke */
+ if (argc > 1 && strcmp(argv[1], "poke") == 0) {
+ return lis2dw12_shell_cmd_poke(argc, argv);
+ }
+
+ /* Test */
+ if (argc > 1 && strcmp(argv[1], "test") == 0) {
+ return lis2dw12_shell_cmd_test(argc, argv);
+ }
+
+ return lis2dw12_shell_err_unknown_arg(argv[1]);
+}
+
+int
+lis2dw12_shell_init(void)
+{
+ int rc;
+
+ rc = shell_cmd_register(&lis2dw12_shell_cmd_struct);
+ SYSINIT_PANIC_ASSERT(rc == 0);
+
+ return rc;
+}
+
+#endif
diff --git a/hw/drivers/sensors/lis2dw12/syscfg.yml b/hw/drivers/sensors/lis2dw12/syscfg.yml
index e37774b..fcb1429 100644
--- a/hw/drivers/sensors/lis2dw12/syscfg.yml
+++ b/hw/drivers/sensors/lis2dw12/syscfg.yml
@@ -26,3 +26,18 @@ syscfg.defs:
LIS2DW12_INT1_CFG_ACTIVE:
description: 'Set 0 for active-low, 1 for active-high'
value: 1
+ LIS2DW12_SHELL_ITF_NUM:
+ description: 'Shell interface number for the LIS2DW12'
+ value: 0
+ LIS2DW12_SHELL_ITF_TYPE:
+ description: 'Shell interface type for the LIS2DW12'
+ value: 1
+ LIS2DW12_SHELL_CSPIN:
+ description: 'CS pin for LIS2DW12'
+ value : -1
+ LIS2DW12_SHELL_ITF_ADDR:
+ description: 'Slave address for LIS2DW12'
+ value : 0x18
+ LIS2DW12_CLI:
+ description: 'Enable shell support for the LIS2DW12'
+ value: 0
diff --git a/hw/sensor/creator/pkg.yml b/hw/sensor/creator/pkg.yml
index 39d30fa..3039501 100644
--- a/hw/sensor/creator/pkg.yml
+++ b/hw/sensor/creator/pkg.yml
@@ -46,5 +46,7 @@ pkg.deps.BMP280_OFB:
- hw/drivers/sensors/bmp280
pkg.deps.BMA253_OFB:
- hw/drivers/sensors/bma253
+pkg.deps.LIS2DW12_OFB:
+ - hw/drivers/sensors/lis2dw12
pkg.init:
sensor_dev_create: 500
--
To stop receiving notification emails like this one, please contact
vipulrahane@apache.org.