diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c
index 5e92c9b30..5f5f3ee5d 100644
--- a/src/httpserver/http_fns.c
+++ b/src/httpserver/http_fns.c
@@ -63,6 +63,7 @@ template_t g_templates[] = {
 	{ Setup_Device_BK7231N_CB2S_QiachipSmartSwitch, "[BK7231N][CB2S] QiaChip Smart Switch"},
 	{ Setup_Device_BK7231N_KS_602_TOUCH, "[BK7231N] KS 602 Touch Switch US"},
 	{ Setup_Device_Aubess_Mini_Smart_Switch_16A, "[BK7231N] Aubess Mini Smart Switch 16A"},
+	{ Setup_Device_Jinvoo_AC_TV_Box_IR_Controller, "[BK7231N] Jinvoo AC/TV Box IR Controller"},
 	// BK7231T devices
 	{ Setup_Device_BK7231T_WB2S_QiachipSmartSwitch, "[BK7231T][WB2S] QiaChip Smart Switch"},
 	{ Setup_Device_TuyaWL_SW01_16A, "WL SW01 16A"},
diff --git a/src/new_builtin_devices.c b/src/new_builtin_devices.c
index c64d5232c..3a10d539d 100644
--- a/src/new_builtin_devices.c
+++ b/src/new_builtin_devices.c
@@ -851,6 +851,29 @@ void Setup_Device_Aubess_Mini_Smart_Switch_16A() {
 	CFG_Save_SetupTimer();
 }
 
+// Jinvoo AC/TV Box IR Controller (SM-AW502S)
+// https://www.elektroda.com/rtvforum/topic3931868.html
+void Setup_Device_Jinvoo_AC_TV_Box_IR_Controller() {
+
+	// pins are:
+	// embedded button - Btn = P6
+	// IR receiver - IRRecv = P7
+	// led - WifiLED = P8
+	// IR leds - IRSend = P26
+
+	CFG_ClearPins();
+	// Embedded Button
+	PIN_SetPinRoleForPinIndex(6, IOR_Button);
+	// IR receiver
+	PIN_SetPinRoleForPinIndex(7, IOR_IRRecv);
+	// LED
+	PIN_SetPinRoleForPinIndex(8, IOR_LED_WIFI);
+	// IR LEDs
+	PIN_SetPinRoleForPinIndex(26, IOR_IRSend);
+
+	CFG_Save_SetupTimer();
+}
+
 // Zemismart Light Switch (Neutral Optional) KS_811_3
 // https://www.aliexpress.com/item/4000979779573.html
 // Has a BK7231N direct on board, but easy access to UART on back with removal of 4 screws.