Merge branch 'dev' into unleashed

RogueMaster · Jul 8, 2022 · fd32501 · fd32501
2 parents a426d00 + f46ae5a
commit fd32501
Show file tree

Hide file tree

Showing 16 changed files with 1,550 additions and 1,529 deletions.
diff --git a/applications/bt/bt_hid_app/views/bt_hid_keyboard.c b/applications/bt/bt_hid_app/views/bt_hid_keyboard.c
diff --git a/applications/bt/bt_hid_app/views/bt_hid_keynote.c b/applications/bt/bt_hid_app/views/bt_hid_keynote.c
diff --git a/applications/picopass/picopass_worker.c b/applications/picopass/picopass_worker.c
@@ -198,8 +198,8 @@ ReturnCode picopass_read_card(ApplicationArea* AA1) {
     }
     memcpy(ccnr, rcRes.CCNR, sizeof(rcRes.CCNR)); // last 4 bytes left 0
 
-    diversifyKey(selRes.CSN, picopass_iclass_key, div_key);
-    opt_doReaderMAC(ccnr, div_key, mac);
+    loclass_diversifyKey(selRes.CSN, picopass_iclass_key, div_key);
+    loclass_opt_doReaderMAC(ccnr, div_key, mac);
 
     err = rfalPicoPassPollerCheck(mac, &chkRes);
     if(err != ERR_NONE) {

diff --git a/firmware/targets/f7/ble_glue/hid_service.c b/firmware/targets/f7/ble_glue/hid_service.c
@@ -104,7 +104,7 @@ void hid_svc_start() {
             if(status) {
                 FURI_LOG_E(TAG, "Failed to add report characteristic: %d", status);
             }
-            
+
             desc_uuid.Char_UUID_16 = REPORT_REFERENCE_DESCRIPTOR_UUID;
             status = aci_gatt_add_char_desc(
                 hid_svc->svc_handle,
@@ -249,7 +249,7 @@ void hid_svc_start() {
     }
 }
 
-bool hid_svc_update_report_map(uint8_t* data, uint16_t len) {
+bool hid_svc_update_report_map(const uint8_t* data, uint16_t len) {
     furi_assert(data);
     furi_assert(hid_svc);
 

diff --git a/firmware/targets/f7/ble_glue/hid_service.h b/firmware/targets/f7/ble_glue/hid_service.h
@@ -21,7 +21,7 @@ void hid_svc_stop();
 
 bool hid_svc_is_started();
 
-bool hid_svc_update_report_map(uint8_t* data, uint16_t len);
+bool hid_svc_update_report_map(const uint8_t* data, uint16_t len);
 
 bool hid_svc_update_input_report(uint8_t input_report_num, uint8_t* data, uint16_t len);