4.0.2

Author: ricardoquesada

bluepad32_files/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinoespressif32bluepad32",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Arduino Wiring-based Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs with Bluepad32",
   "keywords": [
     "framework",

components/bluepad32/include/uni_hid_device.h

@@ -11,6 +11,7 @@
 
 #include "bt/uni_bt_conn.h"
 #include "controller/uni_controller.h"
+#include "controller/uni_controller_type.h"
 #include "parser/uni_hid_parser.h"
 #include "uni_circular_buffer.h"
 
@@ -60,7 +61,7 @@ struct uni_hid_device_s {
     // TODO: Create a union of gamepad/mouse/keyboard structs
     // At the moment "mouse" reuses gamepad struct, but it is a hack.
     // Gamepad
-    uint16_t controller_type;                     // type of controller. E.g: DualShock4, Switch, etc.
+    uni_controller_type_t controller_type;        // type of controller. E.g: DualShock4, Switch, etc.
     uni_controller_subtype_t controller_subtype;  // sub-type of controller attached, used for Wii mostly
     uni_controller_t controller;                  // Data
 

components/bluepad32/include/uni_version.h

@@ -5,7 +5,7 @@
 #ifndef UNI_VERSION_H
 #define UNI_VERSION_H
 
-#define UNI_VERSION "4.0.1"
+#define UNI_VERSION "4.0.2"
 
 extern const char* uni_version;
 

components/bluepad32/parser/uni_hid_parser_ds5.c

@@ -465,7 +465,7 @@ void uni_hid_parser_ds5_parse_feature_report(uni_hid_device_t* d, const uint8_t*
             ins->use_vibration2 = (d->product_id == DS5_EDGE_PID || ins->update_version >= DS5_FEATURE_VERSION(2, 21));
 
             uni_hid_parser_ds5_device_dump(d);
-            logi("DS5: Firmware build date: %s, %s\n", date_z, time_z);
+            logi("\tDS5: Firmware build date: %s, %s\n", date_z, time_z);
 
             ds5_request_calibration_report(d);
             break;
@@ -725,7 +725,7 @@ void uni_hid_parser_ds5_play_dual_rumble(struct uni_hid_device_s* d,
 
 void uni_hid_parser_ds5_device_dump(uni_hid_device_t* d) {
     ds5_instance_t* ins = get_ds5_instance(d);
-    logi("DS5: FW version: %#x, HW version: %#x, update version: %#x, use vibration2: %d\n", ins->fw_version,
+    logi("\tDS5: FW version: %#x, HW version: %#x, update version: %#x, use vibration2: %d\n", ins->fw_version,
          ins->hw_version, ins->update_version, ins->use_vibration2);
 }
 

components/bluepad32/parser/uni_hid_parser_xboxone.c

@@ -580,6 +580,9 @@ static void xboxone_play_quad_rumble_now(struct uni_hid_device_s* d,
     mask |= (weak_magnitude != 0) ? XBOXONE_FF_WEAK : 0;
     mask |= (strong_magnitude != 0) ? XBOXONE_FF_STRONG : 0;
 
+    logd("xbox rumble: duration=%d, left=%d, right=%d, weak=%d, strong=%d, mask=%#x\n", duration_ms, left_trigger,
+         right_trigger, weak_magnitude, strong_magnitude, mask);
+
     // Magnitude is 0..100 so scale the 8-bit input here
 
     struct xboxone_ff_report ff = {

components/bluepad32/platform/uni_platform_unijoysticle.c

@@ -1686,8 +1686,9 @@ static void try_swap_ports(uni_hid_device_t* d) {
     //  - swapping between physical+virtual
     //  - two gamepads while both are pressing the "system" or "select" button at the same time.
     uni_platform_unijoysticle_instance_t* d2_ins = uni_platform_unijoysticle_get_instance(d2);
-    if (d2->controller_type == UNI_CONTROLLER_CLASS_GAMEPAD &&  // Is it a gamepad ?
-        d2_ins->seat != GAMEPAD_SEAT_NONE &&                    // ... and does it have a seat ?
+
+    if (d2->controller.klass == UNI_CONTROLLER_CLASS_GAMEPAD &&  // Is it a gamepad ?
+        d2_ins->seat != GAMEPAD_SEAT_NONE &&                     // ... and does it have a seat ?
         ((d2->controller.gamepad.misc_buttons & (MISC_BUTTON_SYSTEM | MISC_BUTTON_SELECT)) ==
          0)  // ...without pressing "swap" ?
     ) {

components/bluepad32/uni_hid_device.c

@@ -559,7 +559,8 @@ void uni_hid_device_guess_controller_type_from_pid_vid(uni_hid_device_t* d) {
     uni_controller_type_t type = uni_guess_controller_type(d->vendor_id, d->product_id);
 
     // If it fails, try to guess it from COD
-    if (type == CONTROLLER_TYPE_Unknown) {
+    if (type == CONTROLLER_TYPE_Unknown || type == CONTROLLER_TYPE_UnknownNonSteamController ||
+        type == CONTROLLER_TYPE_UnknownSteamController) {
         logi("Device (vendor_id=0x%04x, product_id=0x%04x) not found in DB.\n", d->vendor_id, d->product_id);
         if (uni_hid_device_is_mouse(d)) {
             type = CONTROLLER_TYPE_GenericMouse;