ESP32: properly negate button value, and ensure setWatch works ok

espruino · Dec 14, 2024 · 640b45e · 640b45e
1 parent e76a71b
commit 640b45e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/boards/ESP32.py b/boards/ESP32.py
@@ -98,7 +98,7 @@
 };
 devices = {
   'LED1' : { 'pin' : 'D2' },
-  'BTN1' : { 'pin' : 'D0', "inverted":1, 'pinstate' : 'IN_PULLUP' }
+  'BTN1' : { 'pin' : 'D0' }
 };
 
 # left-right, or top-bottom order
@@ -182,7 +182,7 @@ def get_pins():
   pinutils.findpin(pins, "PD25", True)["functions"]["DAC_OUT1"]=0;
   pinutils.findpin(pins, "PD26", True)["functions"]["DAC_OUT2"]=0;
 
-  pinutils.findpin(pins, "PD0", True)["functions"]["LED_1"]=0;
+  pinutils.findpin(pins, "PD0", True)["functions"]["NEGATED"]=0; # BTN1 negate
 
   pinutils.findpin(pins, "PD10", True)["functions"]["USART0_TX"]=0;
   pinutils.findpin(pins, "PD16", True)["functions"]["USART2_RX"]=0;

diff --git a/targets/esp32/jshardware.c b/targets/esp32/jshardware.c
@@ -485,8 +485,9 @@ void jshKickWatchDog() {
  */
 bool CALLED_FROM_INTERRUPT jshGetWatchedPinState(IOEventFlags eventFlag) { // can be called at interrupt time
   gpio_num_t gpioNum = pinToESP32Pin((Pin)(eventFlag-EV_EXTI0));
-  bool level = gpio_get_level(gpioNum);
-  return level;
+  bool value = gpio_get_level(gpioNum);
+  if (pinInfo[gpioNum].port & JSH_PIN_NEGATED) value=!value;
+  return value;
 }