Merge branch 'dev' into jackdoan/nfc-desfire-bug

flipperdevices · Apr 25, 2022 · 5d18f27 · 5d18f27
2 parents c30bb75 + ff8eb87
commit 5d18f27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/firmware/targets/f7/furi_hal/furi_hal_usb_hid.c b/firmware/targets/f7/furi_hal/furi_hal_usb_hid.c
@@ -9,6 +9,7 @@
 #include "hid_usage_desktop.h"
 #include "hid_usage_button.h"
 #include "hid_usage_keyboard.h"
+#include "hid_usage_consumer.h"
 #include "hid_usage_led.h"
 
 #define HID_EP_IN 0x81
@@ -18,8 +19,7 @@
 #define HID_KB_MAX_KEYS 6
 #define HID_CONSUMER_MAX_KEYS 2
 
-#define HID_PAGE_CONSUMER 0x0C
-#define HID_CONSUMER_CONTROL 0x01
+#define HID_INTERVAL 2
 
 #define HID_VID_DEFAULT 0x046D
 #define HID_PID_DEFAULT 0xC529
@@ -190,7 +190,7 @@ static const struct HidConfigDescriptor hid_cfg_desc = {
                     .bEndpointAddress = HID_EP_IN,
                     .bmAttributes = USB_EPTYPE_INTERRUPT,
                     .wMaxPacketSize = HID_EP_SZ,
-                    .bInterval = 10,
+                    .bInterval = HID_INTERVAL,
                 },
             .hid_ep_out =
                 {
@@ -199,7 +199,7 @@ static const struct HidConfigDescriptor hid_cfg_desc = {
                     .bEndpointAddress = HID_EP_OUT,
                     .bmAttributes = USB_EPTYPE_INTERRUPT,
                     .wMaxPacketSize = HID_EP_SZ,
-                    .bInterval = 10,
+                    .bInterval = HID_INTERVAL,
                 },
         },
 };

diff --git a/lib/subghz/protocols/princeton.c b/lib/subghz/protocols/princeton.c
@@ -17,7 +17,7 @@
 static const SubGhzBlockConst subghz_protocol_princeton_const = {
     .te_short = 400,
     .te_long = 1200,
-    .te_delta = 250,
+    .te_delta = 300,
     .min_count_bit_for_found = 24,
 };