From 57fa1ba8542829747c4d3e752c043033ed26e51e Mon Sep 17 00:00:00 2001
From: Frieder Schrempf <frieder@fris.de>
Date: Mon, 22 Dec 2025 16:22:54 +0100
Subject: [PATCH] variants: Wio WM1110: Use common implementation of
 startOTAUpdate()

Signed-off-by: Frieder Schrempf <frieder@fris.de>
---
 variants/wio_wm1110/WioWM1110Board.cpp | 45 ++------------------------
 variants/wio_wm1110/WioWM1110Board.h   |  5 ++-
 2 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/variants/wio_wm1110/WioWM1110Board.cpp b/variants/wio_wm1110/WioWM1110Board.cpp
index d0ab9785..2825e554 100644
--- a/variants/wio_wm1110/WioWM1110Board.cpp
+++ b/variants/wio_wm1110/WioWM1110Board.cpp
@@ -1,24 +1,9 @@
 #ifdef WIO_WM1110
 
-#include <Arduino.h>
-#include <Wire.h>
-#include <bluefruit.h>
-
 #include "WioWM1110Board.h"
 
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
+#include <Arduino.h>
+#include <Wire.h>
 
 void WioWM1110Board::begin() {
   NRF52BoardDCDC::begin();
@@ -42,31 +27,5 @@ void WioWM1110Board::begin() {
 
   delay(10);
 }
-
-bool WioWM1110Board::startOTAUpdate(const char *id, char reply[]) {
-  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
-
-  Bluefruit.begin(1, 0);
-  Bluefruit.setTxPower(4);
-  Bluefruit.setName("WM1110_OTA");
-
-  Bluefruit.Periph.setConnectCallback(connect_callback);
-  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
-
-  bledfu.begin();
-
-  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
-  Bluefruit.Advertising.addTxPower();
-  Bluefruit.Advertising.addName();
-  Bluefruit.Advertising.restartOnDisconnect(true);
-  Bluefruit.Advertising.setInterval(32, 244);
-  Bluefruit.Advertising.setFastTimeout(30);
-  Bluefruit.Advertising.start(0);
-
-  strcpy(reply, "OK - started");
-  return true;
-}
-
 #endif
 
diff --git a/variants/wio_wm1110/WioWM1110Board.h b/variants/wio_wm1110/WioWM1110Board.h
index 697028b0..adcea877 100644
--- a/variants/wio_wm1110/WioWM1110Board.h
+++ b/variants/wio_wm1110/WioWM1110Board.h
@@ -11,8 +11,9 @@
 #endif
 #define Serial Serial1
 
-class WioWM1110Board : public NRF52BoardDCDC {
+class WioWM1110Board : public NRF52BoardDCDC, public NRF52BoardOTA {
 public:
+  WioWM1110Board() : NRF52BoardOTA("WM1110_OTA") {}
   void begin();
 
 #if defined(LED_GREEN)
@@ -37,8 +38,6 @@ public:
     return "Seeed Wio WM1110";
   }
 
-  bool startOTAUpdate(const char* id, char reply[]) override;
-
   void enableSensorPower(bool enable) {
     digitalWrite(SENSOR_POWER_PIN, enable ? HIGH : LOW);
     if (enable) {