lupyuen commented on code in PR #14590:
URL: https://github.com/apache/nuttx/pull/14590#discussion_r1830400065
##########
arch/xtensa/src/common/espressif/Kconfig:
##########
@@ -89,6 +105,7 @@ config ESPRESSIF_TEMP_THREAD_STACKSIZE
endmenu # ESPRESSIF_TEMP
+<<<<<<< HEAD
Review Comment:
Could you fix this merge?
##########
arch/xtensa/src/common/espressif/Kconfig:
##########
@@ -103,6 +120,50 @@ config ESPRESSIF_I2C_BITBANG_SDAPIN
range 0 21
endmenu # I2C bitbang configuration
+=======
+menu "SPI bitbang configuration"
+ depends on ESPRESSIF_SPI_BITBANG
+
+config ESPRESSIF_SPI_BITBANG_CSPIN
+ int "SPI Bitbang CS Pin"
+ default 0
+ range 0 21
+
+config ESPRESSIF_SPI_BITBANG_CLKPIN
+ int "SPI Bitbang CLK Pin"
+ default 1
+ range 0 21
+
+config ESPRESSIF_SPI_BITBANG_MOSIPIN
+ int "SPI Bitbang MOSI Pin"
+ default 2
+ range 0 21
+
+config ESPRESSIF_SPI_BITBANG_MISOPIN
+ int "SPI Bitbang MISO Pin"
+ default 3
+ range 0 21
+
+choice ESPRESSIF_SPI_BITBANG_MODE
+ prompt "SPI Bitbang mode"
+ default ESPRESSIF_SPI_BITBANG_MODE0
+
+config ESPRESSIF_SPI_BITBANG_MODE0
+ bool "SPI MODE0"
+
+config ESPRESSIF_SPI_BITBANG_MODE1
+ bool "SPI MODE1"
+
+config ESPRESSIF_SPI_BITBANG_MODE2
+ bool "SPI MODE2"
+
+config ESPRESSIF_SPI_BITBANG_MODE3
+ bool "SPI MODE3"
+
+endchoice # ESPRESSIF_SPI_BITBANG_MODE
+
+endmenu # SPI bitbang configuration
+>>>>>>> esp32[s2|s3]: Add SPI bitbang support
Review Comment:
And this merge too thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
