zephyr: Pick up some changes found in 3.4.0 merge to private repos (#207)

* zephyr: Pick up some changes found in 3.4.0 merge to private repos

Forgot to update the release version number.
Changes in fuel gauge, SMS messages, unsolicited murata events, the
regulator, tsl2540 compile, cxd5605 interrupts and power, lis2dw12 tap
3D.

Signed-off-by: Dennis Ruffer <[email protected]>

* zephyr: Pick up some changes found in 3.4.0 merge to private repos

Found some compliance issues in the code I brought in.

Signed-off-by: Dennis Ruffer <[email protected]>

* zephyr: Pick up some changes found in 3.4.0 merge to private repos

Compliance is still not happy.

Signed-off-by: Dennis Ruffer <[email protected]>

* zephyr: Pick up some changes found in 3.4.0 merge to private repos

Try again with a rebase.

Signed-off-by: Dennis Ruffer <[email protected]>

---------

Signed-off-by: Dennis Ruffer <[email protected]>

Author: DRuffer-tmo

VERSION

@@ -2,4 +2,4 @@ VERSION_MAJOR = 3
 VERSION_MINOR = 4
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
-EXTRAVERSION = rc3
+EXTRAVERSION =

drivers/fuel_gauge/act81461/act81461.c

@@ -198,10 +198,10 @@ static int act81461_charger_get_prop(const struct device *dev, struct fuel_gauge
 	 * IDK if this is the best way to handle this, but this is our mode and
 	 * there is no stanard nor spec for this property
 	 */
-	case FUEL_GAUGE_MODE:
+	case FUEL_GAUGE_SBS_MODE:
 		rc = i2c_reg_read_byte_dt(&config->i2c, BAT_STAT_REG, &val);
 
-		prop->value.mode = val & CHG_STAT_MSK;
+		prop->value.sbs_mode = val & CHG_STAT_MSK;
 		break;
 
 	/* TODO: Support reading charge current/voltage settings */

drivers/modem/modem_shell.c

@@ -281,7 +281,8 @@ static int cmd_modem_sms_send(const struct shell *shell, size_t argc,
 
 		if (strlen(argv[3]) > (sizeof(sms.msg) - 1)) {
 			shell_fprintf(shell, SHELL_WARNING,
-					  "Specified message longer than maximum, truncating message\n");
+				      "SMS message exceeds limit (%d>%d), truncating message",
+				      strlen(argv[3]), CONFIG_MODEM_SMS_OUT_MSG_MAX_LEN);
 		}
 
 		snprintk(sms.phone, sizeof(sms.phone), "%s", argv[2]);

drivers/modem/murata-1sc.c

@@ -1021,7 +1021,7 @@ MODEM_CMD_DEFINE(on_cmd_unsol_cmt)
 #endif /* CONFIG_MODEM_SMS */
 
 /**
- * @brief Handler for unsolicited events ( SOCKETEV)
+ * @brief Handler for unsolicited events (SOCKETEV)
  */
 MODEM_CMD_DEFINE(on_cmd_unsol_SEV)
 {
@@ -1068,6 +1068,25 @@ MODEM_CMD_DEFINE(on_cmd_unsol_SEV)
 	return 0;
 }
 
+/**
+ * @brief Handler for unsolicited events (STATCM)
+ */
+MODEM_CMD_DEFINE(on_cmd_unsol_SCM)
+{
+	int event = strtol(argv[0], NULL, 10);
+
+	switch (event) {
+	case 0: /* LTE deregistered */
+		return net_if_down(mdata.net_iface);
+	case 1: /* LTE registered */
+		return net_if_up(mdata.net_iface);
+	default: /* Ignore all other events */
+		break;
+	}
+
+	return 0;
+}
+
 /**
  * @brief Handler for manufacturer
  */
@@ -2231,6 +2250,7 @@ static const struct modem_cmd response_cmds[] = {
 
 static const struct modem_cmd unsol_cmds[] = {
 	MODEM_CMD("%SOCKETEV:", on_cmd_unsol_SEV, 2U, ","),
+	MODEM_CMD("%STATCM:", on_cmd_unsol_SCM, 1U, ","),
 #if defined(CONFIG_MODEM_SMS)
 	MODEM_CMD("+CMTI:", on_cmd_unsol_sms, 2U, ","),
 #if defined(CONFIG_MODEM_SMS_CALLBACK)
@@ -4736,6 +4756,7 @@ static int murata_1sc_setup(void)
 	  SETUP_CMD("AT+CEREG?", "+CEREG:", on_cmd_get_cereg, 0U, ""),
 	  SETUP_CMD("AT+CGCONTRDP", "+CGCONTRDP:", on_cmd_get_cgcontrdp, 0U, ""),
 #endif
+	  SETUP_CMD_NOHANDLE("AT%STATCM=1"),
 #if defined(CONFIG_MODEM_DEMO_LOW_POWERMODE)
 	  SETUP_CMD_NOHANDLE("AT+CFUN=0"),
 #endif

drivers/regulator/regulator_act81461.c

@@ -1345,7 +1345,7 @@ int act81461_fault_int_msk_set(const struct device *dev, regulator_error_flags_t
 
 	if (dev->api == &api) {
 		const struct regulator_act81461_node_config *config = dev->config;
-		uint8_t reg;
+		uint8_t reg, msk;
 
 		cconfig = config->p->config;
 		switch (config->source) {
@@ -1379,7 +1379,7 @@ int act81461_fault_int_msk_set(const struct device *dev, regulator_error_flags_t
 				      REGULATOR_ERROR_OVER_CURRENT)) {
 				return -EINVAL;
 			}
-			uint8_t msk = 0;
+			msk = 0;
 
 			if (flags & REGULATOR_ERROR_OVER_VOLTAGE) {
 				msk |= OV_INT_MSK;
@@ -1409,7 +1409,7 @@ int act81461_fault_int_msk_set(const struct device *dev, regulator_error_flags_t
 			if (flags & ~REGULATOR_ERROR_OVER_CURRENT) {
 				return -EINVAL;
 			}
-			uint8_t msk = 0;
+			msk = 0;
 
 			if (flags & REGULATOR_ERROR_OVER_CURRENT) {
 				msk |= ILIM_INT_MSK;
@@ -1422,7 +1422,7 @@ int act81461_fault_int_msk_set(const struct device *dev, regulator_error_flags_t
 				      REGULATOR_ERROR_OVER_CURRENT)) {
 				return -EINVAL;
 			}
-			uint8_t msk = 0;
+			msk = 0;
 
 			if (flags & REGULATOR_ERROR_OVER_VOLTAGE) {
 				msk |= BST_OV_INT_MSK;
@@ -1439,12 +1439,14 @@ int act81461_fault_int_msk_set(const struct device *dev, regulator_error_flags_t
 			return -EINVAL;
 		}
 	} else {
+		uint8_t msk;
+
 		cconfig = dev->config;
 		if (flags & ~(REGULATOR_ERROR_OVER_TEMP | REGULATOR_ERROR_VSYS_UNDER_VOLTAGE |
 			      REGULATOR_ERROR_VBAT_LOW)) {
 			return -EINVAL;
 		}
-		uint8_t msk = 0;
+		msk = 0;
 
 		if (flags & REGULATOR_ERROR_OVER_TEMP) {
 			msk |= TWARN;

drivers/sensor/CMakeLists.txt

@@ -128,12 +128,12 @@ add_subdirectory_ifdef(CONFIG_TEMP_NRF5 nrf5)
 add_subdirectory_ifdef(CONFIG_TH02 th02)
 add_subdirectory_ifdef(CONFIG_TI_HDC ti_hdc)
 add_subdirectory_ifdef(CONFIG_TI_HDC20XX ti_hdc20xx)
-add_subdirectory_ifdef(CONFIG_TSL2540 tsl2540)
 add_subdirectory_ifdef(CONFIG_TMD2620 tmd2620)
 add_subdirectory_ifdef(CONFIG_TMP007 tmp007)
 add_subdirectory_ifdef(CONFIG_TMP108 tmp108)
 add_subdirectory_ifdef(CONFIG_TMP112 tmp112)
 add_subdirectory_ifdef(CONFIG_TMP116 tmp116)
+add_subdirectory_ifdef(CONFIG_TSL2540 tsl2540)
 add_subdirectory_ifdef(CONFIG_VCMP_IT8XXX2 ite_vcmp_it8xxx2)
 add_subdirectory_ifdef(CONFIG_VCNL4040 vcnl4040)
 add_subdirectory_ifdef(CONFIG_VEML7700 veml7700)

drivers/sensor/cxd5605/cxd5605.c

@@ -170,6 +170,12 @@ static int init(const struct device *dev)
 
 	result = gpio_pin_configure_dt(&cfg->rst_gpio, GPIO_OUTPUT_HIGH);
 
+	cxd5605_setup_interrupts(dev);
+	/* setup shim callbacks */
+	cxd5605_lib_init(dev);
+	cxd5605_register_resp_callback(dev, driver_cxd5605_resp_cb);
+	cxd5605_register_nmea_callback(dev, driver_cxd5605_nmea_cb);
+
 	return result;
 }
 
@@ -429,11 +435,6 @@ static int cxd5605_attr_set(const struct device *dev,
 	uint8_t min = 0;
 	uint8_t sec = 0;
 
-
-	const struct cxd5605_config *config = dev->config;
-	const struct gpio_dt_spec *pwr_gpio = &config->pwr_gpio;
-	const struct gpio_dt_spec *rst_gpio = &config->rst_gpio;
-
 	if (chan != SENSOR_CHAN_AMBIENT_TEMP && chan != SENSOR_CHAN_ALL) {
 		return -ENOTSUP;
 	}
@@ -459,6 +460,9 @@ static int cxd5605_attr_set(const struct device *dev,
 				__FILE__, __LINE__, result);
 			return result;
 		}
+		drv_data->op_mode = val[0].val1;
+		drv_data->pos_cycle = val[0].val2;
+		drv_data->sleep_time = val[1].val1;
 		break;
 
 	case SENSOR_ATTR_CXD5605_PULSE:
@@ -508,6 +512,7 @@ static int cxd5605_attr_set(const struct device *dev,
 				__FILE__, __LINE__, result);
 			return result;
 		}
+		drv_data->selected_sentences = val->val1;
 		break;
 
 	case SENSOR_ATTR_CXD5605_HOT_START:
@@ -580,39 +585,10 @@ static int cxd5605_attr_set(const struct device *dev,
 		}
 		break;
 
-	case SENSOR_ATTR_CXD5605_PWR_CTRL:
-		if (val->val1 == 0) {
-			result = gpio_pin_configure_dt(pwr_gpio, GPIO_OUTPUT_LOW);
-			result = gpio_pin_configure_dt(rst_gpio, GPIO_OUTPUT_LOW);
-		} else {
-			result = gpio_pin_configure_dt(pwr_gpio, GPIO_OUTPUT_HIGH);
-			result = gpio_pin_configure_dt(rst_gpio, GPIO_OUTPUT_HIGH);
-		}
-		break;
-
-	case SENSOR_ATTR_CXD5605_CALLBACK:
-		init(dev);
-		LOG_DBG("Got CXD5605_ALERT_INTERRUPTS\n");
-		cxd5605_setup_interrupts(dev);
-		/* setup shim callbacks */
-#ifdef DEBUG
-		printf("[driver] register driver callback\n");
-#endif
-		cxd5605_lib_init(dev);
-		cxd5605_register_resp_callback(dev, driver_cxd5605_resp_cb);
-		cxd5605_register_nmea_callback(dev, driver_cxd5605_nmea_cb);
-		return 0;
-
 	default:
 		return -ENOTSUP;
 	}
 
-	if (drv_data->cxd5605_cmd != SENSOR_ATTR_CXD5605_PWR_CTRL) {
-		result = cxd5605_wait_fetch(dev);
-		if (result < 0) {
-			return result;
-		}
-	}
 
 	return 0;
 }
@@ -684,6 +660,7 @@ static int cxd5605_driver_pm_action(const struct device *dev,
 {
 	const struct cxd5605_config *config = dev->config;
 	const struct gpio_dt_spec *rst_gpio = &config->rst_gpio;
+	struct cxd5605_data *drv_data = dev->data;
 
 	int result = 0;
 
@@ -699,6 +676,12 @@ static int cxd5605_driver_pm_action(const struct device *dev,
 		if (result < 0) {
 			printk("ERROR: I2C interface not working (CXD5605 driver)\n");
 		}
+		if (drv_data->pps_cb) {
+			cxd5605_pulse(dev, 1);
+		}
+		cxd5605_operating_mode(dev, drv_data->op_mode, drv_data->pos_cycle, \
+				       drv_data->sleep_time);
+		cxd5605_sentence_select(dev, drv_data->selected_sentences);
 
 	case PM_DEVICE_ACTION_SUSPEND:
 		cxd5605_sleep(dev, 0);

drivers/sensor/lis2dw12/Kconfig

@@ -60,6 +60,12 @@ config LIS2DW12_TAP
 	help
 	  Enable tap (single/double) detection
 
+config LIS2DW12_TAP_3D
+	bool "Directional Tap and Tap-Tap detection"
+	depends on LIS2DW12_TAP
+	help
+	  Enable directional tap (single/double) detection
+
 endif # LIS2DW12_TRIGGER
 
 config LIS2DW12_THRESHOLD
@@ -73,6 +79,12 @@ config LIS2DW12_THRESHOLD
 	  be bigger than the threshold. See ST AN5038 for more details about
 	  the feature.
 
+config LIS2DW12_THRESHOLD_3D
+	bool "Directional threshold trigger"
+	depends on LIS2DW12_THRESHOLD
+	help
+	  Enable directional triggers for the wakeup threshold
+
 config LIS2DW12_FREEFALL
 	bool "Free Fall detection (via interrupt)"
 	help