Remove change timeout because disonnect detection is working

Author: dkt01

README.md

@@ -145,9 +145,10 @@ Add the following lines to `/boot/config.txt`
 
 ### xpadneo
 1. `sudo apt install dkms linux-headers`
-2. `git clone https://github.com/atar-axis/xpadneo.git`
-3. `cd xpadneo`
-4. `sudo ./install.sh`
+2. Reboot
+3. `git clone https://github.com/atar-axis/xpadneo.git`
+4. `cd xpadneo`
+5. `sudo ./install.sh`
 
 ## Bare Minimum To Pair XBox Series Controller
 

src/XBoxController/XBoxController.cpp

@@ -81,6 +81,11 @@ bool XBoxController::Initialize() {
     SDL_GameControllerEventState(SDL_ENABLE);
     m_pJoystick = candidateJoystick;
     return true;
+  } else if (num_axes == 7 && num_buttons == 15 && num_hats == 1) {
+    std::cout << "Connected to new XBox Series controller\n";
+    SDL_GameControllerEventState(SDL_ENABLE);
+    m_pJoystick = candidateJoystick;
+    return true;
   } else {
     std::cout << "VendorID: " << SDL_GameControllerGetVendor(m_pJoystick)
               << ", ProductID: " << SDL_GameControllerGetProduct(m_pJoystick) << '\n';
@@ -101,15 +106,21 @@ void XBoxController::Deinitialize() {
 }
 
 std::optional<XBoxController::ControllerState> XBoxController::CurrentState() {
+  SDL_JoystickUpdate();
+
   // Try getting controller if it was lost
   if (m_pJoystick == nullptr) {
     Initialize();
   }
 
   if (m_pJoystick != nullptr) {
+    if (!SDL_GameControllerGetAttached(m_pJoystick)) {
+      std::cout << "Game controller gone\n";
+      Deinitialize();
+      return std::nullopt;
+    }
     SDL_Event event;
     while (SDL_PollEvent(&event)) {
-      m_lastHeartbeat = std::chrono::steady_clock::now();
       switch (event.type) {
         case SDL_QUIT:
           Deinitialize();
@@ -121,6 +132,12 @@ std::optional<XBoxController::ControllerState> XBoxController::CurrentState() {
           std::cout << "DEVICEADDED cdevice.which = " << event.cdevice.which << std::endl;
           break;
 
+        case SDL_CONTROLLERDEVICEREMOVED:
+          std::cout << "DEVICEREMOVED" << std::endl;
+          Deinitialize();
+          return std::nullopt;
+          break;
+
         // If a controller button is pressed
         case SDL_CONTROLLERBUTTONDOWN:
           // Looking for the button that was pressed
@@ -260,10 +277,6 @@ std::optional<XBoxController::ControllerState> XBoxController::CurrentState() {
     }
 
     UpdateVibration();
-    if (std::chrono::steady_clock::now() - m_lastHeartbeat > std::chrono::milliseconds(2000)) {
-      printf("Timeout!\n");
-      return std::nullopt;
-    }
 
     return m_latestState;
   }

src/XBoxController/XBoxController.h

@@ -89,8 +89,6 @@ class XBoxController {
   SDL_GameController* m_pJoystick;
   ControllerState m_latestState;
 
-  std::chrono::steady_clock::time_point m_lastHeartbeat;
-
   ArgosLib::VibrationModel m_vibrationModel;
 
   constexpr static auto JsIntToPct = [](int jsVal) { return static_cast<double>(jsVal) / 32767.0; };