Merge branch 'main' of https://github.com/UberGuidoZ/Flipper

Hardware_Troubleshooting/ReadMe.md

@@ -13,6 +13,13 @@ If your flipper is having issues, such as the common battery issue (only works w
 Issues with stripped screws appears to be common. Be careful and use a quality screwdriver and/or bits!<br>
 If you need to replace a screw, [here are the dimensions](https://user-images.githubusercontent.com/57457139/174870632-501c9aad-ded6-46b5-8618-ba4aa8efa1e4.png) of them for replacement. (Told they are Torx M1.8 x 9mm)
 
+# Adding an external antenna
+
+Following the above, when you have your Flipper apart, you'll see the little "cut out corner" by the ESP32.<br>
+Add or move this resister to add an external antenna:
+
+![Antenna](https://user-images.githubusercontent.com/57457139/208997871-a667b88b-fd31-412d-8a1e-fabb17223a96.jpg)
+
 -----
 
 ## Donation Information

NFC/Fun_Files/Dave_and_Busters.nfc

@@ -1,41 +0,0 @@
-Filetype: Flipper NFC device
-Version: 2
-# Nfc device type can be UID, Mifare Ultralight, Mifare Classic, Bank card
-Device type: Mifare Ultralight 11
-# UID, ATQA and SAK are common for all formats
-UID: 04 A6 0A F2 DD 75 84
-ATQA: 44 00
-SAK: 00
-# Mifare Ultralight specific data
-Data format version: 1
-Signature: 68 D1 8E 8A 85 F1 B7 FC 1C 07 9C 9F 8B 9F 4E 6B B7 7C 23 48 E0 69 6C 89 35 53 0F BC D8 00 27 3B
-Mifare version: 00 04 03 01 01 00 0B 03
-Counter 0: 0
-Tearing 0: BD
-Counter 1: 0
-Tearing 1: BD
-Counter 2: 0
-Tearing 2: BD
-Pages total: 20
-Pages read: 20
-Page 0: 04 A6 0A 20
-Page 1: F2 DD 75 84
-Page 2: DE 48 F0 00
-Page 3: 00 00 00 00
-Page 4: 05 8D C3 F6
-Page 5: 0B AB 31 60
-Page 6: 13 27 83 B5
-Page 7: 4E F9 44 B7
-Page 8: 00 00 00 00
-Page 9: 00 00 00 00
-Page 10: 00 00 00 00
-Page 11: 00 00 00 00
-Page 12: 00 00 00 00
-Page 13: 00 00 00 00
-Page 14: 00 00 00 00
-Page 15: 00 00 00 00
-Page 16: 00 00 00 FF
-Page 17: 00 05 00 00
-Page 18: 00 00 00 00
-Page 19: 00 00 00 00
-Failed authentication attempts: 0

NFC/mf_classic_dict/mf_classic_dict_user.nfc

@@ -1,4 +1,4 @@
-# Last update Nov 30, 2022
+# Last update Dec 20, 2022
 # -----------------------
 # MIFARE DEFAULT KEYS
 #   -- ICEMAN FORK VERSION --
@@ -2318,6 +2318,22 @@ A00003000057
 #
 # Random Hotel A key sec 0 blk 3 - Hoist Group lock
 A2CA48CA4C05
+#
 # Chelsea Harbour Hotel London by Cazagen
 485242F22BE0
 2A2C13CC242A
+#
+# Transport system Uruguay - STM
+# Shared key - sec 0 blk 3
+D144BD193063
+#
+# Data from http://www.proxmark.org/forum/viewtopic.php?pid=45659#p45659
+3515AE068CAD
+#
+# Keys Catering
+6A0D531DA1A7
+4BB29463DC29
+#
+# Keys Swim
+8627C10A7014
+453857395635

Wifi_DevBoard/ReadMe.md

@@ -30,11 +30,9 @@ Sequoia has been kind enough to create a [web flasher](https://sequoiasan.github
 
 Another deauther option can be found at [HEX0DAYS repo over here](https://github.com/HEX0DAYS/FlipperZero-PWNDTOOLS)! (Full instructions included.)
 
-# [Marauder](https://github.com/justcallmekoko/ESP32Marauder) install information<br>
+# [Marauder](https://github.com/justcallmekoko/ESP32Marauder) install information (easy flash for Windows: [HERE](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard/FZ_Marauder_Flasher))
 
-## New easy flash tool for Windows now available! [CLICK HERE](https://github.com/UberGuidoZ/Flipper/tree/main/Wifi_DevBoard/FZ_Marauder_Flasher)
+Direct from the dev WillStunForFood (aka JustCallMeKoko) on Discord - check out [his video walkthrough](https://www.youtube.com/watch?v=_YLTpNo5xa0) too!:
-
-Direct from the dev WillStunForFood on Discord - check out [his video walkthrough](https://www.youtube.com/watch?v=_YLTpNo5xa0) too!:
 
 - Plug the WiFi dev board directly into your PC
 - Upload the MarauderOTA firmware from source via Arduino IDE