Commit Graph

3328 Commits

Author SHA1 Message Date
yocvito 935aee90ef Bad-KB: allows to go back to script selection and stay connected to the client when using BLE connection mode 2023-02-03 21:06:55 +01:00
yocvito 9d15e2c043 merge previous modifs into new file 2023-02-03 19:43:11 +01:00
yocvito 6603bc119c Removes storing of bt peer key in internal flash for bad usb BLE 2023-02-03 19:39:30 +01:00
Willy-JL 72935579e6 Format 2023-02-03 17:46:32 +00:00
Willy-JL 32792e5155 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-02-03 17:44:30 +00:00
Willy-JL 8a3bd796d4 Generic bad kb comments 2023-02-03 17:44:22 +00:00
Willy-JL f3bb068fd7 Rename bad usb to bad kb 2023-02-03 17:43:59 +00:00
VerstreuteSeele 87dccfb711 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev 2023-02-03 11:43:41 +01:00
VerstreuteSeele 195aea9c37 Update storage_settings_scene_sd_info.c 2023-02-03 11:43:16 +01:00
VerstreuteSeele cb2d92ec6c Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-02-03 11:35:09 +01:00
Willy-JL 9de7306aad Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-02-03 05:07:12 +00:00
Willy-JL 64fa597e19 Fix animation load fail, size too big 2023-02-03 05:01:00 +00:00
Willy-JL 8599113135 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-02-02 21:39:00 +00:00
Willy-JL e33023463a Format 2023-02-02 21:38:45 +00:00
AloneLiberty 46fb86265c NFC: fix creating MF Classic tags from "Add Manually" menu (BCC calulation and ATQA/SAK writing) (#2342)
* NFC: fix creating MF Classic cards from "Add Manually" menu (BCC calculation and AQTA/SAK writing)
* NFC: Fix BCC/SAK/ATQA in unit_tests and SAK in nfc_generate_mf_classic

Co-authored-by: gornekich <n.gorbadey@gmail.com>
2023-02-02 22:18:39 +07:00
Willy-JL 566d8e4320 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-02-02 03:03:58 +00:00
yocvito e4c642b72c Restores bt mac @ and adv name before quitting bad usb app 2023-02-01 12:01:55 +01:00
VerstreuteSeele 651548913e format 2023-01-31 21:46:02 +01:00
VerstreuteSeele 3efa6a195a Delete orgasmotron.fap 2023-01-31 21:24:46 +01:00
Clara K f99309b9bc Merge branch 'dev' into badusb-ble 2023-01-31 11:47:34 +01:00
VerstreuteSeele 66eb191a59 Fix build | update storage_settings_scene_sd_info.c 2023-01-30 23:29:08 +01:00
VerstreuteSeele de01e37765 Update Unitemp 2023-01-30 23:22:22 +01:00
yocvito cf89c9db89 Automatically accepts PIN verif when GapPairingNone was selected, but the remote host refused the non-auth pairing and switched to numeric comparaison ethod (pin verif yes or no) 2023-01-30 21:32:55 +01:00
VerstreuteSeele 705c86a2a2 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev 2023-01-30 19:12:05 +01:00
VerstreuteSeele e640b4e7bf Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-30 18:16:02 +01:00
Willy-JL 9fa8843025 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-01-30 13:06:04 +00:00
yocvito fb1218c9a5 Removes pin verif when using BT for bad-USB 2023-01-30 13:31:24 +01:00
Willy-JL 3cd411d98a Poweroff after setting pin (Fix #118) 2023-01-30 12:14:14 +00:00
Michal Suchánek d9be815889 Print card CID in storage info (#2227) 2023-01-30 16:14:30 +07:00
Noam Drong 5db7fdf985 Add support for GUI-CTRL in bad_usb (#2315)
Co-authored-by: あく <alleteam@gmail.com>
2023-01-30 15:03:10 +07:00
Willy-JL feac699dcb Fix keyboard layouts on ble bad usb 2023-01-29 19:35:20 +00:00
VerstreuteSeele 4bf64ce16f Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-29 12:28:52 +01:00
Skorpionm e12958d408 [FL-3082] WS: add protocol LaCrosse-TX (TFA Dostmann) (#2292)
* WS:  add protocol LaCrosse-TX  (TFA Dostmann)
* WS: fix syntax
* WS: fix MSG_TYPE
* WS: fix PVS

Co-authored-by: あく <alleteam@gmail.com>
2023-01-29 18:08:26 +07:00
Willy-JL 4ec539ff99 Move all Bad BLE functionality to Bad USB 2023-01-29 03:24:42 +00:00
Willy-JL 35473ffafe Move most Bad BLE code to Bad USB 2023-01-28 06:53:55 +00:00
Clara K 854f7467fe Merge branch 'dev' into badusb-ble 2023-01-27 12:42:06 +01:00
VerstreuteSeele b15fbfd618 Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-27 12:38:44 +01:00
yocvito a6daa2a20d drop useless file and some useless line 2023-01-27 11:56:29 +01:00
Emily Trau 24a23e5dc7 debug apps: made runnable as .faps; sdk: resolved additional APIs in use by faps (#2333)
* sdk: resolve additional APIs in use by faps
* debug tools: fixed battery_test, bt_debug, display_test, rpc_debug

Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: hedger <hedger@users.noreply.github.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 16:41:55 +07:00
Giacomo Ferretti eee5c35400 NFC: add MIFARE MINI support (#2307)
* NFC: add MIFARE MINI support
* Move new value to end of enum
* nfc: added missing unit test

Co-authored-by: gornekich <n.gorbadey@gmail.com>
Co-authored-by: あく <alleteam@gmail.com>
2023-01-27 12:51:47 +07:00
VerstreuteSeele a2b797fe01 formatting 2023-01-27 02:09:42 +01:00
yocvito a88053964e Bluetooth timeout is now dynamic thanks to rssi analyzing 2023-01-26 22:54:15 +01:00
yocvito a14f5446e4 Merge branch 'v40-merge' into badusb-ble 2023-01-26 00:22:28 +01:00
yocvito d518f9fa5b Reverse mac address layout in mac changing scene (bad ble) 2023-01-25 23:44:47 +01:00
yocvito df4d512f7d Adds BLE adv name & mac changing effective 2023-01-25 19:00:41 +01:00
VerstreuteSeele c7f8b6d06c Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-01-25 13:53:28 +01:00
Sergey Gavrilov 709fa633ff ELF-loader: wait for notification to complete on app exit (#2335) 2023-01-25 12:15:01 +07:00
Willy-JL 6956d8769c Add version tag to xfw app 2023-01-25 00:45:02 +00:00
Willy-JL 43904b41a5 No shitting the bed when asset pack has no anims 2023-01-24 12:40:59 +00:00
Willy-JL 45a0a1104d Revert asset packs to OFW copium naming scheme 2023-01-24 11:44:42 +00:00