You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/11/26 03:59:02 UTC
[nuttx] branch master updated (a0ded9d0d4 -> 83a4b45dd4)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from a0ded9d0d4 fs_epoll: [bug fix] epoll node use-after-free in epoll extend list
new 9cdb865c9c boards/esp32-wrover-kit: Add Lua Interpreter defconfig
new 83a4b45dd4 boards/esp32-wrover-kit: Fix GPIO conflicts
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../configs/{mmcsdspi => lua}/defconfig | 12 ++++++++-
.../xtensa/esp32/esp32-wrover-kit/include/board.h | 30 +++++++++++++++++++---
.../esp32/esp32-wrover-kit/src/esp32_userleds.c | 21 +++++++++++++++
3 files changed, 58 insertions(+), 5 deletions(-)
copy boards/xtensa/esp32/esp32-wrover-kit/configs/{mmcsdspi => lua}/defconfig (87%)
[nuttx] 02/02: boards/esp32-wrover-kit: Fix GPIO conflicts
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 83a4b45dd4c7f9e510812062df708429c4ae8628
Author: SuGliger <rp...@gmail.com>
AuthorDate: Fri Nov 25 15:04:17 2022 -0300
boards/esp32-wrover-kit: Fix GPIO conflicts
---
.../xtensa/esp32/esp32-wrover-kit/include/board.h | 30 +++++++++++++++++++---
.../esp32/esp32-wrover-kit/src/esp32_userleds.c | 21 +++++++++++++++
2 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
index bfcdf4b461..3b0449a05a 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
+++ b/boards/xtensa/esp32/esp32-wrover-kit/include/board.h
@@ -53,11 +53,10 @@
#define BOARD_LED1 0
#define BOARD_LED2 1
#define BOARD_LED3 2
-#define BOARD_NLEDS 3
-#define BOARD_LED_RED BOARD_LED1
-#define BOARD_LED_GREEN BOARD_LED2
-#define BOARD_LED_BLUE BOARD_LED3
+#define BOARD_LED_RED BOARD_LED1 /* GPIO 0 */
+#define BOARD_LED_GREEN BOARD_LED2 /* GPIO 2 */
+#define BOARD_LED_BLUE BOARD_LED3 /* GPIO 4 */
/* LED bits for use with autoleds */
@@ -65,6 +64,29 @@
#define BOARD_LED2_BIT (1 << BOARD_LED2)
#define BOARD_LED3_BIT (1 << BOARD_LED3)
+/* GPIO 2 is used by MMCSD driver as MISO, therefore, it can't be used as
+ * USER LED
+ */
+#ifdef CONFIG_MMCSD
+
+/* GPIO 0 is used by BUTTONS, it can't be used as USER LED */
+#ifdef CONFIG_INPUT_BUTTONS
+# define BOARD_NLEDS 1
+#else
+# define BOARD_NLEDS 2
+#endif
+
+#else /* MMCSD */
+
+/* GPIO 0 is used by BUTTONS, it can't be used as USER LED */
+#ifdef CONFIG_INPUT_BUTTONS
+# define BOARD_NLEDS 2
+#else
+# define BOARD_NLEDS 3
+#endif
+
+#endif
+
/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the 3 LEDs on
* board the ESP-WROVER-KIT. The following definitions describe how
* NuttX controls the LEDs:
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_userleds.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_userleds.c
index d0b9c58974..ad2fab5ed8 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_userleds.c
+++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_userleds.c
@@ -42,7 +42,28 @@
static const uint32_t g_ledcfg[BOARD_NLEDS] =
{
+ /* GPIO 2 is used by MMCSD driver as MISO, therefore, it can't be used as
+ * USER LED
+ */
+#ifdef CONFIG_MMCSD
+
+ /* GPIO 0 is used by BUTTONS, it can't be used as USER LED */
+#ifdef CONFIG_INPUT_BUTTONS
+ GPIO_LED3
+#else
+ GPIO_LED1, GPIO_LED3
+#endif
+
+#else /* MMCSD */
+
+ /* GPIO 0 is used by BUTTONS, it can't be used as USER LED */
+#ifdef CONFIG_INPUT_BUTTONS
+ GPIO_LED2, GPIO_LED3
+#else
GPIO_LED1, GPIO_LED2, GPIO_LED3
+#endif
+
+#endif
};
/****************************************************************************
[nuttx] 01/02: boards/esp32-wrover-kit: Add Lua Interpreter defconfig
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 9cdb865c9cbc6805ed97144b42e4be799f6701b6
Author: SuGliger <rp...@gmail.com>
AuthorDate: Fri Nov 25 15:00:30 2022 -0300
boards/esp32-wrover-kit: Add Lua Interpreter defconfig
---
.../esp32/esp32-wrover-kit/configs/lua/defconfig | 78 ++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/lua/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/lua/defconfig
new file mode 100644
index 0000000000..8dd4386252
--- /dev/null
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/lua/defconfig
@@ -0,0 +1,78 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_LEDS is not set
+# CONFIG_ESP32_SPI2_DMA is not set
+# CONFIG_MMCSD_HAVE_CARDDETECT is not set
+# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set
+# CONFIG_MMCSD_MMCSUPPORT is not set
+# CONFIG_NSH_ARGCAT is not set
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+# CONFIG_NSH_CMDPARMS is not set
+# CONFIG_SPI_EXCHANGE is not set
+CONFIG_ARCH="xtensa"
+CONFIG_ARCH_BOARD="esp32-wrover-kit"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_ESP32_WROVERKIT=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP="esp32"
+CONFIG_ARCH_CHIP_ESP32=y
+CONFIG_ARCH_CHIP_ESP32WROVER=y
+CONFIG_ARCH_IRQBUTTONS=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_XTENSA=y
+CONFIG_BOARD_LOOPSPERMSEC=16717
+CONFIG_BUILTIN=y
+CONFIG_DEBUG_ERROR=y
+CONFIG_DEBUG_FEATURES=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_MEMCARD=y
+CONFIG_DEBUG_MEMCARD_ERROR=y
+CONFIG_DEBUG_MEMCARD_INFO=y
+CONFIG_DEBUG_MEMCARD_WARN=y
+CONFIG_DEBUG_WARN=y
+CONFIG_ESP32_SPI2=y
+CONFIG_ESP32_SPI2_CSPIN=13
+CONFIG_ESP32_SPI2_MISOPIN=2
+CONFIG_ESP32_SPI2_MOSIPIN=15
+CONFIG_ESP32_UART0=y
+CONFIG_EXAMPLES_BUTTONS=y
+CONFIG_EXAMPLES_LEDS=y
+CONFIG_EXAMPLES_LUA_MODULE=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_IDLETHREAD_STACKSIZE=3072
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_INPUT=y
+CONFIG_INPUT_BUTTONS=y
+CONFIG_INPUT_BUTTONS_LOWER=y
+CONFIG_INTELHEX_BINARY=y
+CONFIG_INTERPRETERS_LUA=y
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPICLOCK=4000000
+CONFIG_MM_REGIONS=3
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_MMCSDSPIPORTNO=2
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=114688
+CONFIG_RAM_START=0x20000000
+CONFIG_RR_INTERVAL=200
+CONFIG_START_DAY=6
+CONFIG_START_MONTH=12
+CONFIG_START_YEAR=2011
+CONFIG_SYSTEM_NSH=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_USERLED=y
+CONFIG_USERLED_LOWER=y