From e5616d71606eeaad74191c5318d41240a37a5860 Mon Sep 17 00:00:00 2001
From: Ferdinand Silva <ferdinandsilva@ferdinandsilva.com>
Date: Thu, 27 Jan 2022 19:08:51 +0800
Subject: [PATCH 1/3] added GPIO input support

---
 components/nofrendo-esp32/Kconfig.projbuild |  53 ++++++++-
 components/nofrendo-esp32/psxcontroller.c   | 120 +++++++++++++++++++-
 components/nofrendo-esp32/psxcontroller.h   |   1 +
 sdkconfig                                   |  15 +++
 sdkconfig.old                               |  16 ++-
 5 files changed, 199 insertions(+), 6 deletions(-)

diff --git a/components/nofrendo-esp32/Kconfig.projbuild b/components/nofrendo-esp32/Kconfig.projbuild
index 743a74b..fb3fed0 100644
--- a/components/nofrendo-esp32/Kconfig.projbuild
+++ b/components/nofrendo-esp32/Kconfig.projbuild
@@ -141,10 +141,61 @@ config SOUND_ENA
 
 config HW_PSX_ENA
 	bool "Enable PSX controller input"
-	default y
+	default n
 	help
 		If you connect a PSX/PS2 controller to the following GPIOs, you can control the NES.
 
+config HW_GPIO_ENA
+	bool "Enable GPIO controller input"
+	default n
+
+config HW_GPIO_UP
+	int "Up Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 3
+
+config HW_GPIO_DOWN
+	int "Down Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 1
+
+config HW_GPIO_RIGHT
+	int "Right Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 16
+
+config HW_GPIO_LEFT
+	int "Left Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 17
+
+config HW_GPIO_A
+	int "A Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 5
+
+config HW_GPIO_B
+	int "B Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 2
+
+config HW_GPIO_SELECT
+	int "Select Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 37
+
+config HW_GPIO_START
+	int "Start Control"
+	depends on HW_GPIO_ENA
+	range 1 39
+	default 38
 
 config HW_PSX_CLK
 	int "PSX controller CLK GPIO pin"
diff --git a/components/nofrendo-esp32/psxcontroller.c b/components/nofrendo-esp32/psxcontroller.c
index 457aea4..7aabc27 100644
--- a/components/nofrendo-esp32/psxcontroller.c
+++ b/components/nofrendo-esp32/psxcontroller.c
@@ -25,15 +25,30 @@
 #include "sdkconfig.h"
 #include "i2c_keyboard.h"
 
+#define DELAY() asm("nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;")
+
+void initGPIO(int gpioNo){
+	gpio_set_direction(gpioNo, GPIO_MODE_INPUT);
+	gpio_pulldown_en(gpioNo);
+}
+
+#if CONFIG_HW_PSX_ENA || CONFIG_HW_GPIO_ENA
+
+#ifndef CONFIG_HW_GPIO_ENA
+
 #define PSX_CLK CONFIG_HW_PSX_CLK
 #define PSX_DAT CONFIG_HW_PSX_DAT
 #define PSX_ATT CONFIG_HW_PSX_ATT
 #define PSX_CMD CONFIG_HW_PSX_CMD
 
-#define DELAY() asm("nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;")
+#else
 
+#define PSX_CLK 14
+#define PSX_DAT 27
+#define PSX_ATT 16
+#define PSX_CMD 2
 
-#if CONFIG_HW_PSX_ENA
+#endif
 
 /* Sends and receives a byte from/to the PSX controller using SPI */
 static int psxSendRecv(int send) {
@@ -75,22 +90,117 @@ static void psxDone() {
 	GPIO_REG_WRITE(GPIO_OUT_W1TS_REG, (1<<PSX_ATT));
 }
 
+#define PSX_SELECT 1
+#define PSX_START (1 << 3)
+#define PSX_UP (1 << 4)
+#define PSX_RIGHT (1 << 5)
+#define PSX_DOWN (1 << 6)
+#define PSX_LEFT (1 << 7)
+#define PSX_L2 (1 << 8)
+#define PSX_R2 (1 << 9)
+#define PSX_L1 (1 << 10)
+#define PSX_R1 (1 << 11)
+#define PSX_TRIANGLE (1 << 12)
+#define PSX_CIRCLE (1 << 13)
+#define PSX_X (1 << 14)
+#define PSX_SQUARE (1 << 15)
+#define A_BUTTON PSX_CIRCLE
+#define B_BUTTON PSX_X
+#define TURBO_A_BUTTON PSX_TRIANGLE
+#define TURBO_B_BUTTON PSX_SQUARE
+#define MENU_BUTTON PSX_L1
+#define POWER_BUTTON PSX_R1
+
+#define bit_joypad1_select 0
+#define bit_joypad1_start  3
+#define bit_joypad1_up     4
+#define bit_joypad1_right  5
+#define bit_joypad1_down   6
+#define bit_joypad1_left   7
+#define bit_soft_reset     12
+#define bit_joypad1_a      13
+#define bit_joypad1_b      14
+#define bit_hard_reset     15
 
 int psxReadInput() {
+	int b2b1 = 65535;
+#ifndef CONFIG_HW_GPIO_ENA
 	int b1, b2;
-
 	psxSendRecv(0x01); //wake up
 	psxSendRecv(0x42); //get data
 	psxSendRecv(0xff); //should return 0x5a
 	b1=psxSendRecv(0xff); //buttons byte 1
 	b2=psxSendRecv(0xff); //buttons byte 2
 	psxDone();
-	return (b2<<8)|b1;
+	b2b1 = (b2<<8)|b1;
+#else
+	uint16_t retval = 0;
+	if (gpio_get_level(CONFIG_HW_GPIO_UP) == 1) {
+		retval |=  1<<bit_joypad1_up;
+	} else {
+		retval &= ~(1<<bit_joypad1_up);
+	}
 
+	if (gpio_get_level(CONFIG_HW_GPIO_DOWN) == 1) {
+		retval |=  1<<bit_joypad1_down;
+	} else {
+		retval &= ~(1<<bit_joypad1_down);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_RIGHT) == 1) {
+		retval |=  1<<bit_joypad1_right;
+	} else {
+		retval &= ~(1<<bit_joypad1_right);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_LEFT) == 1) {
+		retval |=  1<<bit_joypad1_left;
+	} else {
+		retval &= ~(1<<bit_joypad1_left);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_SELECT) == 1) {
+		retval |=  1<<bit_joypad1_select;
+	} else {
+		retval &= ~(1<<bit_joypad1_select);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_START) == 1) {
+		retval |=  1<<bit_joypad1_start;
+	} else {
+		retval &= ~(1<<bit_joypad1_start);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_B) == 1) {
+		retval |=  1<<bit_joypad1_b;
+	} else {
+		retval &= ~(1<<bit_joypad1_b);
+	}
+
+	if (gpio_get_level(CONFIG_HW_GPIO_A) == 1) {
+		retval |=  1<<bit_joypad1_a;
+	} else {
+		retval &= ~(1<<bit_joypad1_a);
+	}
+
+	b2b1 = (int)retval;
+		
+#endif
+	return b2b1;
 }
 
 
 void psxcontrollerInit() {
+#if CONFIG_HW_GPIO_ENA
+	initGPIO(CONFIG_HW_GPIO_START);
+	initGPIO(CONFIG_HW_GPIO_SELECT);
+	initGPIO(CONFIG_HW_GPIO_UP);
+	initGPIO(CONFIG_HW_GPIO_DOWN);
+	initGPIO(CONFIG_HW_GPIO_LEFT);
+	initGPIO(CONFIG_HW_GPIO_RIGHT);
+	initGPIO(CONFIG_HW_GPIO_B);
+	initGPIO(CONFIG_HW_GPIO_A);
+#else
 	volatile int delay;
 	int t;
 	gpio_config_t gpioconf[2]={
@@ -127,6 +237,8 @@ void psxcontrollerInit() {
 	} else {
 		printf("PSX controller type 0x%X\n", t);
 	}
+#endif
+
 }
 
 
diff --git a/components/nofrendo-esp32/psxcontroller.h b/components/nofrendo-esp32/psxcontroller.h
index 9a3d256..fa00f96 100644
--- a/components/nofrendo-esp32/psxcontroller.h
+++ b/components/nofrendo-esp32/psxcontroller.h
@@ -3,5 +3,6 @@
 
 int psxReadInput();
 void psxcontrollerInit();
+void initGPIO(int gpioNo);
 
 #endif
\ No newline at end of file
diff --git a/sdkconfig b/sdkconfig
index 395ff78..74eb6cb 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -116,6 +116,15 @@ CONFIG_HW_LCD_RESET_GPIO=33
 CONFIG_HW_LCD_BL_GPIO=32
 CONFIG_SOUND_ENA=y
 CONFIG_HW_PSX_ENA=
+CONFIG_HW_GPIO_ENA=y
+CONFIG_HW_GPIO_UP=3
+CONFIG_HW_GPIO_DOWN=1
+CONFIG_HW_GPIO_RIGHT=37
+CONFIG_HW_GPIO_LEFT=39
+CONFIG_HW_GPIO_A=21
+CONFIG_HW_GPIO_B=2
+CONFIG_HW_GPIO_SELECT=17
+CONFIG_HW_GPIO_START=38
 
 #
 # Partition Table
@@ -200,6 +209,12 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
diff --git a/sdkconfig.old b/sdkconfig.old
index f7996d9..a1b8e5c 100644
--- a/sdkconfig.old
+++ b/sdkconfig.old
@@ -28,7 +28,6 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
 CONFIG_LOG_BOOTLOADER_LEVEL=2
-CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
@@ -117,6 +116,15 @@ CONFIG_HW_LCD_RESET_GPIO=33
 CONFIG_HW_LCD_BL_GPIO=32
 CONFIG_SOUND_ENA=y
 CONFIG_HW_PSX_ENA=
+CONFIG_HW_GPIO_ENA=y
+CONFIG_HW_GPIO_UP=3
+CONFIG_HW_GPIO_DOWN=1
+CONFIG_HW_GPIO_RIGHT=39
+CONFIG_HW_GPIO_LEFT=37
+CONFIG_HW_GPIO_A=21
+CONFIG_HW_GPIO_B=2
+CONFIG_HW_GPIO_SELECT=17
+CONFIG_HW_GPIO_START=38
 
 #
 # Partition Table
@@ -201,6 +209,12 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y

From 13e3116a3a6fe5edc5b2b52fca339bd5d16051d9 Mon Sep 17 00:00:00 2001
From: Ferdinand Silva <ferdinandsilva@ferdinandsilva.com>
Date: Fri, 28 Jan 2022 15:17:15 +0800
Subject: [PATCH 2/3] code cleanup

---
 components/nofrendo-esp32/psxcontroller.c | 55 +++++------------------
 1 file changed, 10 insertions(+), 45 deletions(-)

diff --git a/components/nofrendo-esp32/psxcontroller.c b/components/nofrendo-esp32/psxcontroller.c
index 7aabc27..77bcc6d 100644
--- a/components/nofrendo-esp32/psxcontroller.c
+++ b/components/nofrendo-esp32/psxcontroller.c
@@ -26,6 +26,16 @@
 #include "i2c_keyboard.h"
 
 #define DELAY() asm("nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;nop; nop; nop; nop;")
+#define bit_joypad1_select 0
+#define bit_joypad1_start  3
+#define bit_joypad1_up     4
+#define bit_joypad1_right  5
+#define bit_joypad1_down   6
+#define bit_joypad1_left   7
+#define bit_soft_reset     12
+#define bit_joypad1_a      13
+#define bit_joypad1_b      14
+#define bit_hard_reset     15
 
 void initGPIO(int gpioNo){
 	gpio_set_direction(gpioNo, GPIO_MODE_INPUT);
@@ -90,38 +100,6 @@ static void psxDone() {
 	GPIO_REG_WRITE(GPIO_OUT_W1TS_REG, (1<<PSX_ATT));
 }
 
-#define PSX_SELECT 1
-#define PSX_START (1 << 3)
-#define PSX_UP (1 << 4)
-#define PSX_RIGHT (1 << 5)
-#define PSX_DOWN (1 << 6)
-#define PSX_LEFT (1 << 7)
-#define PSX_L2 (1 << 8)
-#define PSX_R2 (1 << 9)
-#define PSX_L1 (1 << 10)
-#define PSX_R1 (1 << 11)
-#define PSX_TRIANGLE (1 << 12)
-#define PSX_CIRCLE (1 << 13)
-#define PSX_X (1 << 14)
-#define PSX_SQUARE (1 << 15)
-#define A_BUTTON PSX_CIRCLE
-#define B_BUTTON PSX_X
-#define TURBO_A_BUTTON PSX_TRIANGLE
-#define TURBO_B_BUTTON PSX_SQUARE
-#define MENU_BUTTON PSX_L1
-#define POWER_BUTTON PSX_R1
-
-#define bit_joypad1_select 0
-#define bit_joypad1_start  3
-#define bit_joypad1_up     4
-#define bit_joypad1_right  5
-#define bit_joypad1_down   6
-#define bit_joypad1_left   7
-#define bit_soft_reset     12
-#define bit_joypad1_a      13
-#define bit_joypad1_b      14
-#define bit_hard_reset     15
-
 int psxReadInput() {
 	int b2b1 = 65535;
 #ifndef CONFIG_HW_GPIO_ENA
@@ -243,19 +221,6 @@ void psxcontrollerInit() {
 
 
 #else
-
-
-#define bit_joypad1_select 0
-#define bit_joypad1_start  3
-#define bit_joypad1_up     4
-#define bit_joypad1_right  5
-#define bit_joypad1_down   6
-#define bit_joypad1_left   7
-#define bit_soft_reset     12
-#define bit_joypad1_a      13
-#define bit_joypad1_b      14
-#define bit_hard_reset     15
-
 // #define KEY_A_PIN      35
 // #define KEY_B_PIN      36
 // #define KEY_UP_PIN     13

From 0ddf3ca7420f291a310fcaae5d51b51f4c6e85e2 Mon Sep 17 00:00:00 2001
From: Ferdinand Silva <ferdinandsilva@ferdinandsilva.com>
Date: Mon, 7 Feb 2022 13:46:12 +0800
Subject: [PATCH 3/3] fix bug

---
 components/nofrendo-esp32/psxcontroller.c | 59 ++++++-----------------
 sdkconfig                                 | 16 +++---
 sdkconfig.old                             | 16 +++---
 3 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/components/nofrendo-esp32/psxcontroller.c b/components/nofrendo-esp32/psxcontroller.c
index 77bcc6d..97d9dfe 100644
--- a/components/nofrendo-esp32/psxcontroller.c
+++ b/components/nofrendo-esp32/psxcontroller.c
@@ -112,56 +112,29 @@ int psxReadInput() {
 	psxDone();
 	b2b1 = (b2<<8)|b1;
 #else
-	uint16_t retval = 0;
-	if (gpio_get_level(CONFIG_HW_GPIO_UP) == 1) {
-		retval |=  1<<bit_joypad1_up;
-	} else {
-		retval &= ~(1<<bit_joypad1_up);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_UP) == 1)
+		b2b1 -=  1<<bit_joypad1_up;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_DOWN) == 1) {
-		retval |=  1<<bit_joypad1_down;
-	} else {
-		retval &= ~(1<<bit_joypad1_down);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_DOWN) == 1)
+		b2b1 -=  1<<bit_joypad1_down;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_RIGHT) == 1) {
-		retval |=  1<<bit_joypad1_right;
-	} else {
-		retval &= ~(1<<bit_joypad1_right);
-	}
-
-	if (gpio_get_level(CONFIG_HW_GPIO_LEFT) == 1) {
-		retval |=  1<<bit_joypad1_left;
-	} else {
-		retval &= ~(1<<bit_joypad1_left);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_RIGHT) == 1)
+		b2b1 -=  1<<bit_joypad1_right;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_SELECT) == 1) {
-		retval |=  1<<bit_joypad1_select;
-	} else {
-		retval &= ~(1<<bit_joypad1_select);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_LEFT) == 1)
+		b2b1 -=  1<<bit_joypad1_left;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_START) == 1) {
-		retval |=  1<<bit_joypad1_start;
-	} else {
-		retval &= ~(1<<bit_joypad1_start);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_SELECT) == 1)
+		b2b1 -=  1<<bit_joypad1_select;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_B) == 1) {
-		retval |=  1<<bit_joypad1_b;
-	} else {
-		retval &= ~(1<<bit_joypad1_b);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_START) == 1) 
+		b2b1 -=  1<<bit_joypad1_start;
 
-	if (gpio_get_level(CONFIG_HW_GPIO_A) == 1) {
-		retval |=  1<<bit_joypad1_a;
-	} else {
-		retval &= ~(1<<bit_joypad1_a);
-	}
+	if (gpio_get_level(CONFIG_HW_GPIO_B) == 1)
+		b2b1 -=  1<<bit_joypad1_b;
 
-	b2b1 = (int)retval;
+	if (gpio_get_level(CONFIG_HW_GPIO_A) == 1)
+		b2b1 -=  1<<bit_joypad1_a;
 		
 #endif
 	return b2b1;
diff --git a/sdkconfig b/sdkconfig
index 74eb6cb..2eecf58 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -117,14 +117,14 @@ CONFIG_HW_LCD_BL_GPIO=32
 CONFIG_SOUND_ENA=y
 CONFIG_HW_PSX_ENA=
 CONFIG_HW_GPIO_ENA=y
-CONFIG_HW_GPIO_UP=3
-CONFIG_HW_GPIO_DOWN=1
-CONFIG_HW_GPIO_RIGHT=37
-CONFIG_HW_GPIO_LEFT=39
-CONFIG_HW_GPIO_A=21
-CONFIG_HW_GPIO_B=2
-CONFIG_HW_GPIO_SELECT=17
-CONFIG_HW_GPIO_START=38
+CONFIG_HW_GPIO_UP=2
+CONFIG_HW_GPIO_DOWN=22
+CONFIG_HW_GPIO_RIGHT=5
+CONFIG_HW_GPIO_LEFT=21
+CONFIG_HW_GPIO_A=16
+CONFIG_HW_GPIO_B=17
+CONFIG_HW_GPIO_SELECT=39
+CONFIG_HW_GPIO_START=37
 
 #
 # Partition Table
diff --git a/sdkconfig.old b/sdkconfig.old
index a1b8e5c..2eecf58 100644
--- a/sdkconfig.old
+++ b/sdkconfig.old
@@ -117,14 +117,14 @@ CONFIG_HW_LCD_BL_GPIO=32
 CONFIG_SOUND_ENA=y
 CONFIG_HW_PSX_ENA=
 CONFIG_HW_GPIO_ENA=y
-CONFIG_HW_GPIO_UP=3
-CONFIG_HW_GPIO_DOWN=1
-CONFIG_HW_GPIO_RIGHT=39
-CONFIG_HW_GPIO_LEFT=37
-CONFIG_HW_GPIO_A=21
-CONFIG_HW_GPIO_B=2
-CONFIG_HW_GPIO_SELECT=17
-CONFIG_HW_GPIO_START=38
+CONFIG_HW_GPIO_UP=2
+CONFIG_HW_GPIO_DOWN=22
+CONFIG_HW_GPIO_RIGHT=5
+CONFIG_HW_GPIO_LEFT=21
+CONFIG_HW_GPIO_A=16
+CONFIG_HW_GPIO_B=17
+CONFIG_HW_GPIO_SELECT=39
+CONFIG_HW_GPIO_START=37
 
 #
 # Partition Table