Merge branch 'main' into mainRM

GPIO/ReadMe.md

@@ -225,6 +225,41 @@ DATA (OUT, S, yellow wire)	2-7, 10, 12-17 (to choose from)
 ```
 https://github.com/quen0n/FipperZero-DHT-Monitor
 -----
+
+## UHF RFID YRM100 ([FAP / App here](https://github.com/frux-c/uhf_rfid))
+```
+YRM100: 1 (VCC) -> FZ: 1 (5V)
+YRM100: 2 (RXD) -> FZ: 13 or 15 (these are TX pins)
+YRM100: 3 (TXD) -> FZ: 14 or 16 (these are RX pins)
+YRM100: 4 (EN)  -> FZ: 9 (3.3V)
+YRM100: 5 (GND) -> FZ: 8 or 11 or 18 (GND)
+
+Switch between UART Pins 13/14 and 15/16 setting in:
+Flipper -> GPIO -> USB-UART Bridge -> LEFT -> UART Pins
+
+Also make sure to enable 5V in Flipper -> GPIO
+```
+![Pinout](https://github.com/UberGuidoZ/Flipper/assets/57457139/522764fb-db90-4bc9-b46b-9eb0c15f5d75)
+![Schematic](https://github.com/UberGuidoZ/Flipper/assets/57457139/0d685f28-7b80-4657-8ccd-af50da553721)
+![Front](https://github.com/UberGuidoZ/Flipper/assets/57457139/9e395d8f-92a9-488d-932a-5c7647da30dd)
+![Back](https://github.com/UberGuidoZ/Flipper/assets/57457139/44bfff6f-318a-4677-98fd-3acb6b20f722)
+
+Credit: [RekordNadoev](https://github.com/RekordNadoev) / [Issue 515](https://github.com/UberGuidoZ/Flipper/issues/515)
+-----
+
+## ServoTester ([Info/App](https://mhasbini.com/blog/servo-tester-flipper-zero.html))
+```
+VCC (none, +, VCC, red wire) -> Flipper 1 (5V)
+GND (-, GND, black/brown wire) -> Flipper 8 OR 18 (GND)
+DATA (OUT, S, yellow wire) -> Flipper 2
+
+Make sure to enable 5V in Flipper -> GPIO
+```
+![Servo](https://github.com/UberGuidoZ/Flipper/assets/57457139/f9cc7ef8-f97e-4489-9c38-f4403ae681a3)
+
+Credit: [RekordNadoev](https://github.com/RekordNadoev) / [Issue 515](https://github.com/UberGuidoZ/Flipper/issues/515)
+-----
+
 # Custom PCB's
 ## Here's some repo's with designs for custom PCB's you can order or build using a prototype board.
 

Wifi_DevBoard/FZ_Marauder_Flasher/Flash-v2.6.bat

@@ -69,7 +69,7 @@ IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Ma
 esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
 echo Firmware Erased, preparing write...
 ping 127.0.0.1 -n 5 > NUL
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 SD\bootloader.bin 0x8000 SD\partitions.bin 0x10000 SD\!last_firmware!
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
 GOTO DONE
 
 :MARAUDERSD
@@ -88,7 +88,7 @@ IF [!last_firmware!]==[] echo Please get and copy the last firmware from ESP32Ma
 esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset erase_region 0x9000 0x6000
 echo Firmware Erased, preparing write...
 ping 127.0.0.1 -n 5 > NUL
-esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 Marauder\bootloader.bin 0x8000 Marauder\partitions.bin 0x10000 Marauder\!last_firmware!
+esptool.exe -p !_com! -b %BR% -c esp32s2 --before default_reset -a no_reset write_flash --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 SD\bootloader.bin 0x8000 SD\partitions.bin 0x10000 SD\!last_firmware!
 GOTO DONE
 
 :BACKUP