Merge branch 'contrib/github_pr_372' into 'master'

fix: ADC button tied to GND ignored (GitHub PR) Closes AEGHB-691 See merge request ae_group/esp-iot-solution!1027
espressif · Jun 17, 2024 · f080bb1 · f080bb1
2 parents e2529ce + d2c3ce7
commit f080bb1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/components/button/CHANGELOG.md b/components/button/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ChangeLog
 
+## v3.2.1 - 2024-6-17
+
+### bugfix
+
+- Fixed ignored ADC button tied to GND.
 
 ## v3.2.0 - 2023-11-13
 

diff --git a/components/button/button_adc.c b/components/button/button_adc.c
@@ -305,7 +305,7 @@ uint8_t button_adc_get_key_level(void *button_index)
     }
 
     if (vol <= g_button.ch[ch_index].btns[index].max &&
-            vol > g_button.ch[ch_index].btns[index].min) {
+            vol >= g_button.ch[ch_index].btns[index].min) {
         return 1;
     }
     return 0;

diff --git a/components/button/idf_component.yml b/components/button/idf_component.yml
@@ -1,4 +1,4 @@
-version: "3.2.0"
+version: "3.2.1"
 description: GPIO and ADC button driver
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/button
 repository: https://github.com/espressif/esp-iot-solution.git