Move the I2C speed config key out of the choice prompt.

Fix potential null pointer dereference in bmx280_close
Fix: Unable to parse symbol 'BMX280_STANDBY_20M' in bmx280_bits.h (Issue #5 )
2026-01-19 21:42:18 +01:00 · 2024-11-25 22:44:33 +03:00 · 2024-11-25 22:43:58 +08:00 · 2024-11-25 21:23:52 +08:00
3 changed files with 10 additions and 9 deletions
--- a/5
+++ b/5
@@ -12,13 +12,14 @@ menu "BMX280 Options"
            bool "I2C Master Driver (i2c_master.h)"
            help
                Use I2C Master Driver (i2c_master.h) for ESP-IDF >= 5.3.
+    endchoice
+    
    config BMX280_I2C_CLK_SPEED_HZ
        int "I2C Clock Speed (Hz)"
        default 100000
        range 1000 400000
        help
-                Set the I2C clock speed in Hz.
-    endchoice
+            Set the I2C clock speed in Hz. Only applies to the new I2C Master driver.
    
    choice BMX280_EXPECT_DEVICE
        prompt "Installed Sensor Model"
--- a/bmx280.c
+++ b/bmx280.c
@@ -451,7 +451,7 @@ bmx280_t* bmx280_create_master(i2c_master_bus_handle_t bus_handle)
 void bmx280_close(bmx280_t *bmx280)
 {
    #if CONFIG_USE_I2C_MASTER_DRIVER
-    if(bmx280->i2c_dev!=NULL)
+    if(bmx280 != NULL && bmx280->i2c_dev != NULL)
        i2c_master_bus_rm_device(bmx280->i2c_dev);
    #endif
    free(bmx280);
--- a/include/bmx280_bits.h
+++ b/include/bmx280_bits.h
@@ -126,7 +126,7 @@ typedef struct bmx280_config_t {
 #elif (CONFIG_BMX280_DEFAULT_STANDBY_10M)
 #define BMX280_DEFAULT_STANDBY BME280_STANDBY_10M
 #else
-#define BMX280_DEFAULT_STANDBY BMX280_STANDBY_20M
+#define BMX280_DEFAULT_STANDBY BME280_STANDBY_20M
 #endif

 #if (CONFIG_BMX280_DEFAULT_IIR_NONE)
Author	SHA1	Message	Date
H. Utku Maden	b48a6e2fa9	Move the I2C speed config key out of the choice prompt.	2024-11-25 22:44:33 +03:00
PurpleCloudX	2dc752e074	Fix potential null pointer dereference in bmx280_close	2024-11-25 22:43:58 +08:00
PurpleCloudX	744b34a9f3	Fix: Unable to parse symbol 'BMX280_STANDBY_20M' in bmx280_bits.h (Issue #5 )	2024-11-25 21:23:52 +08:00