summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2018-03-05 14:06:45 +1100
committerDamien George <damien.p.george@gmail.com>2018-03-05 14:06:45 +1100
commitd4470af239ffb536f3fbf610060ddb62789d3045 (patch)
treeba259713a09b544bb51c505abd8dd70e35ce7bfe
parentb691aa0aaeb9f55f96d9ed39f214f0a9e555c94d (diff)
esp32: Revert "esp32/machine_touchpad: Swap pins 32 and 33."
This reverts commit 5a82ba8e073f847985595a46fb2f0c12f4389bbc. Touch sensor 8 and 9 have a mismatch in some of their registers and this is now fixed in software by the ESP IDF.
-rw-r--r--ports/esp32/machine_touchpad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index ff31ccf69..96de1a2a1 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -51,8 +51,8 @@ STATIC const mtp_obj_t touchpad_obj[] = {
{{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM5},
{{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM6},
{{&machine_touchpad_type}, GPIO_NUM_27, TOUCH_PAD_NUM7},
- {{&machine_touchpad_type}, GPIO_NUM_32, TOUCH_PAD_NUM8},
- {{&machine_touchpad_type}, GPIO_NUM_33, TOUCH_PAD_NUM9},
+ {{&machine_touchpad_type}, GPIO_NUM_33, TOUCH_PAD_NUM8},
+ {{&machine_touchpad_type}, GPIO_NUM_32, TOUCH_PAD_NUM9},
};
STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,