From 5c80334dbda5a09fd44104a70168fe79a1bf0fea Mon Sep 17 00:00:00 2001
From: David Hall <david@datajack.org>
Date: Mon, 3 Nov 2025 21:00:43 +0000
Subject: [PATCH 1/2] Fix manufacturer name on Seeed Xiao S3 WIO

---
 variants/xiao_s3_wio/XiaoS3WIOBoard.h | 13 +++++++++++++
 variants/xiao_s3_wio/target.cpp       |  3 ++-
 variants/xiao_s3_wio/target.h         |  3 ++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 variants/xiao_s3_wio/XiaoS3WIOBoard.h

diff --git a/variants/xiao_s3_wio/XiaoS3WIOBoard.h b/variants/xiao_s3_wio/XiaoS3WIOBoard.h
new file mode 100644
index 000000000..7ae06a359
--- /dev/null
+++ b/variants/xiao_s3_wio/XiaoS3WIOBoard.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Arduino.h>
+#include <helpers/ESP32Board.h>
+
+class XiaoS3WIOBoard : public ESP32Board {
+public:
+  XiaoS3WIOBoard() { }
+
+  const char* getManufacturerName() const override {
+    return "Xiao S3 WIO";
+  }
+};
diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp
index ed8584ff0..f7de92441 100644
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@@ -1,7 +1,8 @@
 #include <Arduino.h>
 #include "target.h"
+#include "XiaoS3WIOBoard.h"
 
-ESP32Board board;
+XiaoS3WIOBoard board;
 
 #if defined(P_LORA_SCLK)
   static SPIClass spi;
diff --git a/variants/xiao_s3_wio/target.h b/variants/xiao_s3_wio/target.h
index f184c7575..b84ab42b0 100644
--- a/variants/xiao_s3_wio/target.h
+++ b/variants/xiao_s3_wio/target.h
@@ -11,8 +11,9 @@
   #include <helpers/ui/SSD1306Display.h>
   #include <helpers/ui/MomentaryButton.h>
 #endif
+#include "XiaoS3WIOBoard.h"
 
-extern ESP32Board board;
+extern XiaoS3WIOBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
 extern SensorManager sensors;

From c3dbec41bac0730b778efd8202cd2d29466c0b9b Mon Sep 17 00:00:00 2001
From: David Hall <david@datajack.org>
Date: Mon, 3 Nov 2025 21:02:08 +0000
Subject: [PATCH 2/2] Fix manufacturer name on Seeed Xiao S3 WIO

---
 variants/xiao_s3_wio/target.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/variants/xiao_s3_wio/target.cpp b/variants/xiao_s3_wio/target.cpp
index f7de92441..41f25da6a 100644
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@@ -1,6 +1,5 @@
 #include <Arduino.h>
 #include "target.h"
-#include "XiaoS3WIOBoard.h"
 
 XiaoS3WIOBoard board;