Fix typo

eoh-jsc · Dec 23, 2024 · c7a34b3 · c7a34b3
1 parent f7c6483
commit c7a34b3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/src/BLE/ERaBLETranspArduino.hpp b/src/BLE/ERaBLETranspArduino.hpp
@@ -32,7 +32,7 @@ class ERaBLETransp
     const char* TAG = "BLETransp";
 
 public:
-    ERaBLETransp(ERaCallbacksHelper& helper,
+    ERaBLETransp(ERaCallbackSetter& setter,
                 bool base64 = false,
                 bool encrypt = true)
         : ERaEncryptBearSSL(base64)
@@ -51,7 +51,7 @@ class ERaBLETransp
         , mCharacteristicAUT(NULL)
         , mCharacteristicCTR(NULL)
     {
-        helper.setERaTransp(this);
+        setter.setERaTransp(this);
         ERaBLETransp::instance() = this;
     }
     ~ERaBLETransp()

diff --git a/src/BLE/ERaBLETranspEsp32.hpp b/src/BLE/ERaBLETranspEsp32.hpp
@@ -36,7 +36,7 @@ class ERaBLETransp
     const char* TAG = "BLETransp";
 
 public:
-    ERaBLETransp(ERaCallbacksHelper& helper,
+    ERaBLETransp(ERaCallbackSetter& setter,
                 bool base64 = false,
                 bool encrypt = true)
         : ERaEncryptMbedTLS(base64)
@@ -56,7 +56,7 @@ class ERaBLETransp
         , mCharacteristicAUT(NULL)
         , mCharacteristicCTR(NULL)
     {
-        helper.setERaTransp(this);
+        setter.setERaTransp(this);
         ERaBLETransp::instance() = this;
     }
     ~ERaBLETransp()
@@ -107,10 +107,10 @@ class ERaBLETransp
             return;
         }
 
-        if (BLEDevice::getInitialized()) {
-            BLEDevice::deinit();
+        if (!BLEDevice::getInitialized()) {
+            /* BLEDevice::deinit(); */
+            BLEDevice::init(this->getDeviceName());
         }
-        BLEDevice::init(this->getDeviceName());
 
         this->mServer = BLEDevice::createServer();
         this->mServer->setCallbacks(this);

diff --git a/src/BLE/ERaBLETranspRealtek.hpp b/src/BLE/ERaBLETranspRealtek.hpp
@@ -31,7 +31,7 @@ class ERaBLETransp
     const char* TAG = "BLETransp";
 
 public:
-    ERaBLETransp(ERaCallbacksHelper& helper,
+    ERaBLETransp(ERaCallbackSetter& setter,
                 bool base64 = false,
                 bool encrypt = true)
         : ERaEncryptMbedTLS(base64)
@@ -53,7 +53,7 @@ class ERaBLETransp
         , mScanData(NULL)
         , mBleTask(NULL)
     {
-        helper.setERaTransp(this);
+        setter.setERaTransp(this);
         ERaBLETransp::instance() = this;
     }
     ~ERaBLETransp()
@@ -106,6 +106,10 @@ class ERaBLETransp
         this->mAdvertData->clear();
         this->mAdvertData->addFlags(GAP_ADTYPE_FLAGS_LIMITED | GAP_ADTYPE_FLAGS_BREDR_NOT_SUPPORTED);
         this->mAdvertData->addCompleteName(this->getDeviceName());
+        if (this->isNewService()) {
+            this->mAdvertData->addCompleteServices(BLEUUID(this->mTranspProp->address));
+        }
+        this->mAdvertData->addCompleteServices(BLEUUID(SERVICE_UUID));
 
         if (this->mInitialized) {
             BLE.configAdvert()->setAdvData(*this->mAdvertData);
@@ -165,6 +169,8 @@ class ERaBLETransp
         BLE.init();
         BLE.configAdvert()->setAdvData(*this->mAdvertData);
         BLE.configAdvert()->setScanRspData(*this->mScanData);
+        BLE.configSecurity()->setPairable(true);
+        BLE.configSecurity()->setAuthFlags(GAP_AUTHEN_BIT_BONDING_FLAG);
         if (this->isNewService()) {
             BLE.configServer(2);
             BLE.addService(*this->mNewService);

diff --git a/src/BLE/ERaNimBLETransp.hpp b/src/BLE/ERaNimBLETransp.hpp
@@ -35,7 +35,7 @@ class ERaBLETransp
     const char* TAG = "BLETransp";
 
 public:
-    ERaBLETransp(ERaCallbacksHelper& helper,
+    ERaBLETransp(ERaCallbackSetter& setter,
                 bool base64 = false,
                 bool encrypt = true)
         : ERaEncryptMbedTLS(base64)
@@ -55,7 +55,7 @@ class ERaBLETransp
         , mCharacteristicAUT(NULL)
         , mCharacteristicCTR(NULL)
     {
-        helper.setERaTransp(this);
+        setter.setERaTransp(this);
         ERaBLETransp::instance() = this;
     }
     ~ERaBLETransp()
@@ -106,10 +106,10 @@ class ERaBLETransp
             return;
         }
 
-        if (NimBLEDevice::getInitialized()) {
-            NimBLEDevice::deinit();
+        if (!NimBLEDevice::getInitialized()) {
+            /* NimBLEDevice::deinit(); */
+            NimBLEDevice::init(this->getDeviceName());
         }
-        NimBLEDevice::init(this->getDeviceName());
 
         this->mServer = NimBLEDevice::createServer();
         this->mServer->setCallbacks(this);

diff --git a/src/BLE/ERaSerialBLETransp.hpp b/src/BLE/ERaSerialBLETransp.hpp
@@ -16,7 +16,7 @@ class ERaBLETransp
     const char* TAG = "BLETransp";
 
 public:
-    ERaBLETransp(ERaCallbacksHelper& helper,
+    ERaBLETransp(ERaCallbackSetter& setter,
                 Stream& stream)
         : mStream(stream)
         , mTranspProp(ERaBluetooth::instance())
@@ -28,7 +28,7 @@ class ERaBLETransp
         , mBleTask(NULL)
 #endif
     {
-        helper.setERaTransp(this);
+        setter.setERaTransp(this);
         ERaBLETransp::instance() = this;
     }
     ~ERaBLETransp()
@@ -69,11 +69,14 @@ class ERaBLETransp
         #if !defined(ERA_MCU_CORE)
             #define ERA_MCU_CORE            0
         #endif
+        #if !defined(ERA_BLE_TASK_SIZE)
+            #define ERA_BLE_TASK_SIZE       (1024 * 5)
+        #endif
         #if !defined(ERA_BLE_TASK_PRIORITY)
             #define ERA_BLE_TASK_PRIORITY   (configMAX_PRIORITIES - 4)
         #endif
-        this->mBleTask = ERaOs::osThreadNew(this->bleTask, "bleTask", 1024 * 5, this,
-                                            ERA_BLE_TASK_PRIORITY, ERA_MCU_CORE);
+        this->mBleTask = ERaOs::osThreadNew(this->bleTask, "bleTask", ERA_BLE_TASK_SIZE,
+                                            this, ERA_BLE_TASK_PRIORITY, ERA_MCU_CORE);
 #endif
         this->mConnected = true;
         this->mInitialized = true;
@@ -138,7 +141,7 @@ class ERaBLETransp
             }
             *begin++ = (uint8_t)c;
         }
-        return begin - buf;
+        return ((int)(begin - buf));
     }
 
     int timedRead() {