[mynewt-core] branch master updated: sensor_creator: Add non-bus driver SPI config for LIS2DW12

[jerzy]

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


The following commit(s) were added to refs/heads/master by this push:
     new 265e68d  sensor_creator: Add non-bus driver SPI config for LIS2DW12
265e68d is described below

commit 265e68d948f0fc8221f620dfe9241df58d9ae965
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Fri May 28 10:12:24 2021 +0200

    sensor_creator: Add non-bus driver SPI config for LIS2DW12
    
    LIS2DW12 could be used with SPI and I2C when bus driver was used.
    SPI configuration was missing for non-bus driver usage.
    
    This also restores default I2C interface number 0 for LIS2DW12.
---
 hw/sensor/creator/src/sensor_creator.c | 12 ++++++++----
 hw/sensor/creator/syscfg.yml           |  5 ++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/hw/sensor/creator/src/sensor_creator.c 
b/hw/sensor/creator/src/sensor_creator.c
index 1010427..8394df1 100644
--- a/hw/sensor/creator/src/sensor_creator.c
+++ b/hw/sensor/creator/src/sensor_creator.c
@@ -624,11 +624,16 @@ static struct sensor_itf lis2dw12_itf = {
     }
 };
 #else
+static struct sensor_itf lis2dw12_itf = {
 #if MYNEWT_VAL(LIS2DW12_OFB_I2C_NUM) >= 0
-static struct sensor_itf i2c_0_itf_lis2dw12 = {
     .si_type = SENSOR_ITF_I2C,
     .si_num = MYNEWT_VAL(LIS2DW12_OFB_I2C_NUM),
     .si_addr = MYNEWT_VAL(LIS2DW12_OFB_ITF_ADDR),
+#elif MYNEWT_VAL(LIS2DW12_OFB_SPI_NUM) >= 0
+    .si_type = SENSOR_ITF_SPI,
+    .si_num = MYNEWT_VAL(LIS2DW12_OFB_SPI_NUM),
+    .si_cs_pin = MYNEWT_VAL(BME280_OFB_CS),
+#endif
     .si_ints = {
         { MYNEWT_VAL(LIS2DW12_OFB_INT1_PIN_HOST), 
MYNEWT_VAL(LIS2DW12_OFB_INT1_PIN_DEVICE),
           MYNEWT_VAL(LIS2DW12_OFB_INT_CFG_ACTIVE)}
@@ -636,7 +641,6 @@ static struct sensor_itf i2c_0_itf_lis2dw12 = {
 };
 #endif
 #endif
-#endif
 
 #if MYNEWT_VAL(I2C_0) && MYNEWT_VAL(LIS2DS12_OFB)
 static struct sensor_itf i2c_0_itf_lis2ds12 = {
@@ -1953,8 +1957,8 @@ sensor_dev_create(void)
     assert(rc == 0);
 #endif
 #else
-    rc = os_dev_create((struct os_dev *) &lis2dw12, "lis2dw12_0",
-      OS_DEV_INIT_PRIMARY, 0, lis2dw12_init, (void *)&i2c_0_itf_lis2dw12);
+    rc = os_dev_create((struct os_dev *)&lis2dw12, "lis2dw12_0",
+                       OS_DEV_INIT_PRIMARY, 0, lis2dw12_init, (void 
*)&lis2dw12_itf);
     assert(rc == 0);
 #endif
 #endif
diff --git a/hw/sensor/creator/syscfg.yml b/hw/sensor/creator/syscfg.yml
index e21ae10..1d4e197 100644
--- a/hw/sensor/creator/syscfg.yml
+++ b/hw/sensor/creator/syscfg.yml
@@ -194,7 +194,7 @@ syscfg.defs:
         range: 0x18,0x19
     LIS2DW12_OFB_I2C_NUM:
         description: 'I2C interface used for LIS2DW12'
-        value: -1
+        value: 0
         restrictions:
             - '(LIS2DW12_OFB == 0) ||
             ((LIS2DW12_OFB_I2C_NUM == 0) && (I2C_0 == 1)) ||
@@ -212,6 +212,9 @@ syscfg.defs:
             ((LIS2DW12_OFB_SPI_NUM == 2) && (SPI_2_MASTER == 1)) ||
             ((LIS2DW12_OFB_SPI_NUM == 3) && (SPI_3_MASTER == 1)) ||
             ((LIS2DW12_OFB_SPI_NUM == -1))'
+    LIS2DW12_OFB_CS:
+        description: 'SPI CS pin for LIS2DW12'
+        value: -1
     LIS2DW12_OFB_INT1_PIN_HOST:
         description: 'Host pin for LIS2DW12 INT1 pin'
         value: -1