Commit Graph

6372 Commits

Author SHA1 Message Date
Willy-JL
3acfe5b215 Format 2023-02-06 14:16:03 +00:00
Willy-JL
a650da5232 Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble 2023-02-06 14:10:32 +00:00
Willy-JL
1be72a94a8 Fix build for now 2023-02-06 14:06:52 +00:00
Willy-JL
1e6e7b8669 Update symbols 2023-02-06 13:56:53 +00:00
Willy-JL
9a02a87e82 Fix worker interface bug on bad kb quit 2023-02-03 23:37:44 +00:00
Willy-JL
e97659819d Change bad bt config options names 2023-02-03 23:10:50 +00:00
Willy-JL
dceac69a37 Merge branch 'badusb-ble' of https://github.com/yocvito/Flipper-Xtreme into badusb-ble 2023-02-03 22:43:49 +00:00
Willy-JL
92c83cfb79 Fix typo 2023-02-03 22:40:29 +00:00
yocvito
08475ff579 Add bt is connected check 2023-02-03 22:40:09 +00:00
yocvito
d6a1dc2e1f Removes storing of bt peer key in internal flash for bad usb BLE
Co-authored-by: yocvito <nicolasmorel.dp@gmail.com>
2023-02-03 22:27:26 +00:00
Willy-JL
82f4a287cb Stay connected in bad kb 2023-02-03 22:19:04 +00:00
VerstreuteSeele
a67af49f54 Update FreeRTOS-Kernel 2023-02-03 22:42:37 +01:00
VerstreuteSeele
09d080c00d Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into dev 2023-02-03 22:41:55 +01:00
yocvito
dc38d57d6e Fix: vs-code and copilot mistakes (oups) 2023-02-03 21:20:44 +01:00
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
あく
52680fd14e FreeRTOS: update to 10.5.1 (#2353) 2023-02-04 04:09:20 +10: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
yocvito
bf07d1d927 Merge branch 'badusb-ble' of github.com:yocvito/Flipper-Xtreme into badusb-ble 2023-01-31 22:06:08 +01:00
yocvito
5ebed42995 moves faps_copy syntax to new fap_deploy one in fbt help message 2023-01-31 22:05:36 +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
VerstreuteSeele
bbba74b79b Update IR again, to prove a point 2023-01-31 19:07:05 +01:00
VerstreuteSeele
36eace9996 Update infrared assets 2023-01-31 16:48:15 +01:00
Clara K
f99309b9bc Merge branch 'dev' into badusb-ble 2023-01-31 11:47:34 +01:00
Clara K
2354b51d30 Update ReadMe.md 2023-01-31 11:41:42 +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
f384872449 BLE GAP: specifies Keyboard yes/no IO capability for GapPairingNone case during gap init, in case 'Just works' pairing method is not accepted by remote host 2023-01-30 22:01:38 +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
Giacomo Ferretti
01a9854f8a Documentation: add BadUSB GUI-CTRL #2347 2023-01-30 16:49:51 +07:00