Add isWaitingForFirstNotification

Author: asukiaaa

examples/connect/connect.ino

@@ -16,22 +16,26 @@ void setup() {
 void loop() {
   xboxController.onLoop();
   if (xboxController.isConnected()) {
-    Serial.println("Address: " + xboxController.buildDeviceAddressStr());
-    Serial.print(xboxController.xboxNotif.toString());
-    unsigned long receivedAt = xboxController.getReceiveNotificationAt();
-    uint16_t joystickMax = XboxControllerNotificationParser::maxJoy;
-    Serial.print("joyLHori rate: ");
-    Serial.println((float)xboxController.xboxNotif.joyLHori / joystickMax);
-    Serial.print("joyLVert rate: ");
-    Serial.println((float)xboxController.xboxNotif.joyLVert / joystickMax);
-    Serial.println("battery " + String(xboxController.battery) + "%");
-    Serial.println("received at " + String(receivedAt));
+    if (xboxController.isWaitingForFirstNotification()) {
+      Serial.println("waiting for first notification");
+    } else {
+      Serial.println("Address: " + xboxController.buildDeviceAddressStr());
+      Serial.print(xboxController.xboxNotif.toString());
+      unsigned long receivedAt = xboxController.getReceiveNotificationAt();
+      uint16_t joystickMax = XboxControllerNotificationParser::maxJoy;
+      Serial.print("joyLHori rate: ");
+      Serial.println((float)xboxController.xboxNotif.joyLHori / joystickMax);
+      Serial.print("joyLVert rate: ");
+      Serial.println((float)xboxController.xboxNotif.joyLVert / joystickMax);
+      Serial.println("battery " + String(xboxController.battery) + "%");
+      Serial.println("received at " + String(receivedAt));
+    }
   } else {
-    Serial.print("not connected");
+    Serial.println("not connected");
     if (xboxController.getCountFailedConnection() > 2) {
       ESP.restart();
     }
   }
-  Serial.println(" at " + String(millis()));
+  Serial.println("at " + String(millis()));
   delay(500);
 }

src/XboxSeriesXControllerESP32_asukiaaa.hpp

@@ -27,7 +27,7 @@ String controllerManufacturerDataSearching = "0600030080";
 
 enum class ConnectionState : uint8_t {
   Connected = 0,
-  WaitingFirstNotification = 1,
+  WaitingForFirstNotification = 1,
   Found = 2,
   Scanning = 3,
 };
@@ -43,7 +43,7 @@ class ClientCallbacks : public NimBLEClientCallbacks {
 #ifdef XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL
     XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println("Connected");
 #endif
-    *pConnectionState = ConnectionState::WaitingFirstNotification;
+    *pConnectionState = ConnectionState::WaitingForFirstNotification;
     // pClient->updateConnParams(120,120,0,60);
   };
 
@@ -209,8 +209,11 @@ class Core {
   const size_t notifByteLen = XboxControllerNotificationParser::expectedDataLen;
   uint8_t notifByteArr[XboxControllerNotificationParser::expectedDataLen];
 
+  bool isWaitingForFirstNotification() {
+    return connectionState == ConnectionState::WaitingForFirstNotification;
+  }
   bool isConnected() {
-    return connectionState == ConnectionState::WaitingFirstNotification ||
+    return connectionState == ConnectionState::WaitingForFirstNotification ||
            connectionState == ConnectionState::Connected;
   }
   unsigned long getReceiveNotificationAt() { return receivedNotificationAt; }
@@ -376,23 +379,34 @@ class Core {
       charaPrintId(pChara);
       XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println(" canNotify ");
 #endif
-      // Serial.println("can notify");
       if (pChara->subscribe(
               true,
               std::bind(&Core::notifyCB, this, std::placeholders::_1,
                         std::placeholders::_2, std::placeholders::_3,
                         std::placeholders::_4),
               true)) {
-        // Serial.println("set notifyCb");
+#ifdef XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL
+        XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println(
+            "succeeded in subscribing");
+#endif
       } else {
-        // Serial.println("failed to subscribe");
+#ifdef XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL
+        XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println("failed subscribing");
+#endif
       }
     }
   }
 
   void notifyCB(NimBLERemoteCharacteristic* pRemoteCharacteristic,
                 uint8_t* pData, size_t length, bool isNotify) {
     auto sUuid = pRemoteCharacteristic->getRemoteService()->getUUID();
+    if (connectionState != ConnectionState::Connected) {
+#ifdef XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL
+      XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println(
+          "Received first notification");
+#endif
+      connectionState = ConnectionState::Connected;
+    }
     if (sUuid.equals(uuidServiceHid)) {
 #ifdef XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL
       static bool isPrinting = false;
@@ -417,7 +431,6 @@ class Core {
       }
       XBOX_SERIES_X_CONTROLLER_DEBUG_SERIAL.println("");
 #endif
-      connectionState = ConnectionState::Connected;
       xboxNotif.update(pData, length);
       memcpy(notifByteArr, pData,
              length < notifByteLen ? length : notifByteLen);