From 0853fe05ec2f419f199fbd0c1b279b4d3bb0dbe1 Mon Sep 17 00:00:00 2001 From: Manuel Bl <10954524+manuelbl@users.noreply.github.com> Date: Fri, 31 Jul 2020 21:54:09 +0200 Subject: [PATCH] Rename reset options --- Kconfig | 18 +++++++++++++----- src/hal/hal_esp32.cpp | 9 +++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Kconfig b/Kconfig index c42cca2..a9387a1 100644 --- a/Kconfig +++ b/Kconfig @@ -55,12 +55,20 @@ config TTN_SPI_FREQ help SPI frequency to communicate between ESP32 and SX127x radio chip -config TTN_RADIO_RST_KEEP_ASSERTED - bool "Keep RST pin asserted instead of floating" - default n - help - Some hardware needs RST pin to be always high for LoRa chip to function +choice TTN_RESET + prompt "Reset states" + default TTN_RESET_STATES_FLOATING + help + Reset pin can be floating for most boards and shields. + A few boards/shields require the pin to be held high for operation. +config TTN_RESET_STATES_FLOATING + bool "Toggle between low and floating" + +config TTN_RESET_STATES_ASSERTED + bool "Toggle between low and high" + +endchoice config TTN_BG_TASK_PRIO int "Background task priority" diff --git a/src/hal/hal_esp32.cpp b/src/hal/hal_esp32.cpp index ebf0496..f3b9150 100755 --- a/src/hal/hal_esp32.cpp +++ b/src/hal/hal_esp32.cpp @@ -123,18 +123,19 @@ void hal_pin_rst(u1_t val) return; if (val == 0 || val == 1) - { // drive pin + { + // drive pin gpio_set_level(ttn_hal.pinRst, val); gpio_set_direction(ttn_hal.pinRst, GPIO_MODE_OUTPUT); } else { -#ifdef CONFIG_TTN_RADIO_RST_KEEP_ASSERTED - // drive up the pin because the hardware is nonstandard +#if defined(CONFIG_TTN_RESET_STATES_ASSERTED) + // drive up the pin because the hardware is nonstandard gpio_set_level(ttn_hal.pinRst, 1); gpio_set_direction(ttn_hal.pinRst, GPIO_MODE_OUTPUT); #else - // keep pin floating + // keep pin floating gpio_set_level(ttn_hal.pinRst, val); gpio_set_direction(ttn_hal.pinRst, GPIO_MODE_INPUT); #endif