diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c
index bccc9ea35..b3e220499 100644
--- a/src/httpserver/new_http.c
+++ b/src/httpserver/new_http.c
@@ -310,8 +310,14 @@ template_t g_templates [] = {
 
 int g_total_templates = sizeof(g_templates)/sizeof(g_templates[0]);
 
+#if PLATFORM_XR809
+const char *g_header = "<h1><a href=\"https://github.com/openshwprojects/OpenXR809/\">OpenXR809</a></h1><h3><a href=\"https://www.elektroda.com/rtvforum/viewtopic.php?p=19841301#19841301\">[Read more]</a><a href=\"https://paypal.me/openshwprojects\">[Support project]</a></h3>";
+
+#else
 const char *g_header = "<h1><a href=\"https://github.com/openshwprojects/OpenBK7231T/\">OpenBK7231</a></h1><h3><a href=\"https://www.elektroda.com/rtvforum/viewtopic.php?p=19841301#19841301\">[Read more]</a><a href=\"https://paypal.me/openshwprojects\">[Support project]</a></h3>";
 
+#endif
+
 
 void HTTP_AddBuildFooter(http_request_t *request) {
 	char upTimeStr[128];
@@ -978,10 +984,17 @@ int HTTP_ProcessPacket(http_request_t *request) {
 		poststr(request,"<form action=\"cfg_pins\">");
 		for( i = 0; i < GPIO_MAX; i++) {
 			int si, ch;
+
 			si = PIN_GetPinRoleForPinIndex(i);
 			ch = PIN_GetPinChannelForPinIndex(i);
+
+#if PLATFORM_XR809
+			poststr(request,PIN_GetPinNameAlias(i));
+			poststr(request," ");
+#else
 			sprintf(tmpA, "P%i ",i);
 			poststr(request,tmpA);
+#endif
 			sprintf(tmpA, "<select name=\"%i\">",i);
 			poststr(request,tmpA);
 			for(j = 0; j < IOR_Total_Options; j++) {
diff --git a/src/new_common.h b/src/new_common.h
index 1f84226c2..ae7a90aa7 100644
--- a/src/new_common.h
+++ b/src/new_common.h
@@ -27,6 +27,7 @@ typedef int bool;
 typedef unsigned char u8;
 typedef unsigned char uint8_t;
 typedef unsigned int uint32_t;
+typedef unsigned int UINT32;
 
 #define ASSERT
 #define os_strcpy strcpy
diff --git a/src/new_pins.c b/src/new_pins.c
index 4c9172a19..3a4210371 100644
--- a/src/new_pins.c
+++ b/src/new_pins.c
@@ -9,6 +9,8 @@
 #if WINDOWS
 
 #elif PLATFORM_XR809
+
+#include "driver/chip/hal_gpio.h"
 
 #else
 #include <gpio_pub.h>
@@ -118,8 +120,14 @@ int PIN_GetPinChannelForPinIndex(int index) {
 void RAW_SetPinValue(int index, int iVal){
 #if WINDOWS
 
-#elif PLATFORM_XR809
-
+#elif PLATFORM_XR809
+	GPIO_InitParam param;
+	int xr_port; // eg GPIO_PORT_A
+	int xr_pin; // eg. GPIO_PIN_20
+
+	PIN_XR809_GetPortPinForIndex(index, &xr_port, &xr_pin);
+
+	HAL_GPIO_WritePin(xr_port, xr_pin, iVal);
 #else
     bk_gpio_output(index, iVal);
 #endif
@@ -143,6 +151,54 @@ void button_generic_long_press_hold(int index)
 {
 	PR_NOTICE("%i key_long_press_hold\r\n", index);
 }
+
+#if PLATFORM_XR809
+typedef struct xr809pin_s {
+	const char *name;
+	int port;
+	int pin;
+} xr809pin_t;
+
+// https://developer.tuya.com/en/docs/iot/xr3-datasheet?id=K98s9168qi49g
+
+xr809pin_t g_xrPins[] = {
+	{ "PA19", GPIO_PORT_A, GPIO_PIN_19 },
+	{ "PB03", GPIO_PORT_B, GPIO_PIN_3 },
+	{ "PA12", GPIO_PORT_A, GPIO_PIN_12 },
+	{ "PA14", GPIO_PORT_A, GPIO_PIN_14 },
+	{ "PA15", GPIO_PORT_A, GPIO_PIN_15 },
+	{ "PA06", GPIO_PORT_A, GPIO_PIN_6 },
+	{ "PA07", GPIO_PORT_A, GPIO_PIN_7 },
+	{ "PA16", GPIO_PORT_A, GPIO_PIN_16 },
+	{ "PA20", GPIO_PORT_A, GPIO_PIN_20 },
+	{ "PA21", GPIO_PORT_A, GPIO_PIN_21 },
+	{ "PA22", GPIO_PORT_A, GPIO_PIN_22 },
+	{ "PB02", GPIO_PORT_B, GPIO_PIN_2 },
+	{ "PA08", GPIO_PORT_A, GPIO_PIN_8 },
+};
+int g_numXRPins = sizeof(g_xrPins) / sizeof(g_xrPins[0]);
+
+void PIN_XR809_GetPortPinForIndex(int index, int *xr_port, int *xr_pin) {
+	if(index < 0 || index >= g_numXRPins) {
+		*xr_port = 0;
+		*xr_pin = 0;
+		return;
+	}
+	*xr_port = g_xrPins[index].port;
+	*xr_pin = g_xrPins[index].pin;
+}
+
+#endif
+const char *PIN_GetPinNameAlias(int index) {
+#if PLATFORM_XR809
+	if(index < 0 || index >= g_numXRPins) {
+		return "bad_index";
+	}
+	return g_xrPins[index].name;
+#else
+	return "not_implemented_here";
+#endif
+}
 unsigned char button_generic_get_gpio_value(void *param)
 {
 #if WINDOWS
@@ -245,14 +301,26 @@ void PIN_SetPinRoleForPinIndex(int index, int role) {
 	case IOR_LED_n:
 	case IOR_Relay:
 	case IOR_Relay_n:
+	{
 #if WINDOWS
 	
-#elif PLATFORM_XR809
-
+#elif PLATFORM_XR809
+		GPIO_InitParam param;
+		int xr_port; // eg GPIO_PORT_A
+		int xr_pin; // eg. GPIO_PIN_20
+
+		PIN_XR809_GetPortPinForIndex(index, &xr_port, &xr_pin);
+
+		/*set pin driver capability*/
+		param.driving = GPIO_DRIVING_LEVEL_1;
+		param.mode = GPIOx_Pn_F1_OUTPUT;
+		param.pull = GPIO_PULL_NONE;
+		HAL_GPIO_Init(xr_port, xr_pin, &param);
 #else
 		bk_gpio_config_output(index);
 		bk_gpio_output(index, 0);
 #endif
+	}
 		break;
 	case IOR_PWM:
 		{
@@ -307,14 +375,20 @@ void Channel_OnChanged(int ch) {
 		if(g_pins.channels[i] == ch) {
 			if(g_pins.roles[i] == IOR_Relay || g_pins.roles[i] == IOR_LED) {
 				RAW_SetPinValue(i,bOn);
-				g_channelChangeCallback(ch,bOn);
+				if(g_channelChangeCallback != 0) {
+					g_channelChangeCallback(ch,bOn);
+				}
 			}
 			if(g_pins.roles[i] == IOR_Relay_n || g_pins.roles[i] == IOR_LED_n) {
 				RAW_SetPinValue(i,!bOn);
-				g_channelChangeCallback(ch,bOn);
+				if(g_channelChangeCallback != 0) {
+					g_channelChangeCallback(ch,bOn);
+				}
 			}
 			if(g_pins.roles[i] == IOR_PWM) {
-				g_channelChangeCallback(ch,iVal);
+				if(g_channelChangeCallback != 0) {
+					g_channelChangeCallback(ch,iVal);
+				}
 				int pwmIndex = PIN_GetPWMIndexForPinIndex(i);
 
 #if WINDOWS
diff --git a/src/new_pins.h b/src/new_pins.h
index 6a9a1abe8..45129ed25 100644
--- a/src/new_pins.h
+++ b/src/new_pins.h
@@ -36,6 +36,7 @@ void PIN_Init(void);
 void PIN_ClearPins();
 int PIN_GetPinRoleForPinIndex(int index);
 int PIN_GetPinChannelForPinIndex(int index);
+const char *PIN_GetPinNameAlias(int index);
 void PIN_SetPinRoleForPinIndex(int index, int role);
 void PIN_SetPinChannelForPinIndex(int index, int ch);
 void CHANNEL_Toggle(int ch);