xiaoxiang781216 commented on code in PR #16715:
URL: https://github.com/apache/nuttx/pull/16715#discussion_r2202317940
##########
drivers/analog/ads1115.c:
##########
@@ -47,28 +46,32 @@
* Preprocessor definitions
****************************************************************************/
-#if defined(CONFIG_ADC_ADS1115)
-
-#ifndef CONFIG_ADC_ADS1115_I2C_FREQUENCY
-#define CONFIG_ADC_ADS1115_I2C_FREQUENCY 100000
-#endif
-
#define ADS1115_NUM_CHANNELS 8
#define ADS1115_OS_SHIFT (1 << 15)
-#define ADS1115_MUX_SHIFT 12
+#define ADS1115_MUX_SHIFT (12)
#define ADS1115_MUX_MASK (7 << ADS1115_MUX_SHIFT)
-#define ADS1115_PGA_SHIFT 9
+#define ADS1115_PGA_SHIFT (9)
#define ADS1115_PGA_MASK (7 << ADS1115_PGA_SHIFT)
#define ADS1115_MODE_MASK (1 << 8)
-#define ADS1115_DR_SHIFT 5
+#define ADS1115_DR_SHIFT (5)
#define ADS1115_DR_MASK (7 << ADS1115_DR_SHIFT)
#define ADS1115_COMP_MODE_MASK (1 << 4)
#define ADS1115_COMP_POL_MASK (1 << 3)
#define ADS1115_COMP_LAT_MASK (1 << 2)
-#define ADS1115_COMP_QUE_SHIFT 0
+#define ADS1115_COMP_QUE_SHIFT (0)
#define ADS1115_COMP_QUE_MASK (3 << ADS1115_COMP_QUE_SHIFT)
+/* Helper macros for checking modes */
+
+#define ONESHOT_MODE(priv) \
+ (((priv->cmdbyte & ADS1115_MODE_MASK) == ADS1115_MODE_MASK))
+#define CHANNEL_BITS(am_channel) (am_channel << ADS1115_MUX_SHIFT)
+
+/* The conversion time is based on the data rate */
+
+#define CONVERSION_TIME (1000000 / (1 << (CONFIG_ADC_ADS1115_DR + 3)))
Review Comment:
```suggestion
#define ADS1115_CONVERSION_TIME (1000000 / (1 << (CONFIG_ADC_ADS1115_DR +
3)))
```
##########
drivers/analog/ads1115.c:
##########
@@ -47,28 +46,32 @@
* Preprocessor definitions
****************************************************************************/
-#if defined(CONFIG_ADC_ADS1115)
-
-#ifndef CONFIG_ADC_ADS1115_I2C_FREQUENCY
-#define CONFIG_ADC_ADS1115_I2C_FREQUENCY 100000
-#endif
-
#define ADS1115_NUM_CHANNELS 8
#define ADS1115_OS_SHIFT (1 << 15)
-#define ADS1115_MUX_SHIFT 12
+#define ADS1115_MUX_SHIFT (12)
#define ADS1115_MUX_MASK (7 << ADS1115_MUX_SHIFT)
-#define ADS1115_PGA_SHIFT 9
+#define ADS1115_PGA_SHIFT (9)
#define ADS1115_PGA_MASK (7 << ADS1115_PGA_SHIFT)
#define ADS1115_MODE_MASK (1 << 8)
-#define ADS1115_DR_SHIFT 5
+#define ADS1115_DR_SHIFT (5)
#define ADS1115_DR_MASK (7 << ADS1115_DR_SHIFT)
#define ADS1115_COMP_MODE_MASK (1 << 4)
#define ADS1115_COMP_POL_MASK (1 << 3)
#define ADS1115_COMP_LAT_MASK (1 << 2)
-#define ADS1115_COMP_QUE_SHIFT 0
+#define ADS1115_COMP_QUE_SHIFT (0)
#define ADS1115_COMP_QUE_MASK (3 << ADS1115_COMP_QUE_SHIFT)
+/* Helper macros for checking modes */
+
+#define ONESHOT_MODE(priv) \
Review Comment:
```suggestion
#define ADS1115_ONESHOT_MODE(priv)
\
```
##########
drivers/analog/ads1115.c:
##########
@@ -755,7 +781,7 @@ static int ads1115_ioctl(FAR struct adc_dev_s *dev, int cmd,
break;
default:
- ret = -ENOTTY;
+ ret = -EINVAL;
Review Comment:
need return -ENOTTY for unsupported ioctl
##########
drivers/analog/ads1115.c:
##########
@@ -47,28 +46,32 @@
* Preprocessor definitions
****************************************************************************/
-#if defined(CONFIG_ADC_ADS1115)
-
-#ifndef CONFIG_ADC_ADS1115_I2C_FREQUENCY
-#define CONFIG_ADC_ADS1115_I2C_FREQUENCY 100000
-#endif
-
#define ADS1115_NUM_CHANNELS 8
#define ADS1115_OS_SHIFT (1 << 15)
-#define ADS1115_MUX_SHIFT 12
+#define ADS1115_MUX_SHIFT (12)
#define ADS1115_MUX_MASK (7 << ADS1115_MUX_SHIFT)
-#define ADS1115_PGA_SHIFT 9
+#define ADS1115_PGA_SHIFT (9)
#define ADS1115_PGA_MASK (7 << ADS1115_PGA_SHIFT)
#define ADS1115_MODE_MASK (1 << 8)
-#define ADS1115_DR_SHIFT 5
+#define ADS1115_DR_SHIFT (5)
#define ADS1115_DR_MASK (7 << ADS1115_DR_SHIFT)
#define ADS1115_COMP_MODE_MASK (1 << 4)
#define ADS1115_COMP_POL_MASK (1 << 3)
#define ADS1115_COMP_LAT_MASK (1 << 2)
-#define ADS1115_COMP_QUE_SHIFT 0
+#define ADS1115_COMP_QUE_SHIFT (0)
#define ADS1115_COMP_QUE_MASK (3 << ADS1115_COMP_QUE_SHIFT)
+/* Helper macros for checking modes */
+
+#define ONESHOT_MODE(priv) \
+ (((priv->cmdbyte & ADS1115_MODE_MASK) == ADS1115_MODE_MASK))
+#define CHANNEL_BITS(am_channel) (am_channel << ADS1115_MUX_SHIFT)
Review Comment:
```suggestion
#define ADS1115_CHANNEL_BITS(am_channel) (am_channel << ADS1115_MUX_SHIFT)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
