Merge main to dev (#49)

ReadMe.md

@@ -4,7 +4,7 @@
   <img src="https://user-images.githubusercontent.com/55334727/209031152-efbca66c-3fe0-41b5-a860-e0d7522a9279.png">
 </p>
 
-[Intro](https://github.com/ClaraCrazy/Flipper-Xtreme#What-makes-it-special) | [Animations](https://github.com/ClaraCrazy/Flipper-Xtreme#Animations) | [Changelog](https://github.com/ClaraCrazy/Flipper-Xtreme#list-of-changes) | [Known bugs](https://github.com/ClaraCrazy/Flipper-Xtreme#Known-bugs) | [Install](https://github.com/ClaraCrazy/Flipper-Xtreme#Install) | [Build](https://github.com/ClaraCrazy/Flipper-Xtreme#build-it-yourself) | [Discord](https://discord.gg/flipper-xtreme)
+[Intro](https://github.com/ClaraCrazy/Flipper-Xtreme#What-makes-it-special) | [Animations](https://github.com/ClaraCrazy/Flipper-Xtreme#Animations) | [Docs](https://github.com/ClaraCrazy/Flipper-Xtreme/tree/main/documentation) | [Changelog](https://github.com/ClaraCrazy/Flipper-Xtreme#list-of-changes) | [Known bugs](https://github.com/ClaraCrazy/Flipper-Xtreme#Known-bugs) | [Install](https://github.com/ClaraCrazy/Flipper-Xtreme#Install) | [Build](https://github.com/ClaraCrazy/Flipper-Xtreme#build-it-yourself) | [Discord](https://discord.gg/flipper-xtreme)
 -----
 
 This firmware is a complete overhaul of the Official Firmware in combination with tons of modifications from RogueMaster (He used UL code too), with changes on all graphics, `disgusting` code and more. Xtreme brings you the most for your little flipper companion.
@@ -44,7 +44,7 @@ If you dont like that, we removed the "Dummy mode" as it serves no purpose, and
 <br>
 <h2 align="center">List of changes:</h2>
 
-Note: This repo is always updated with OFW, Unleashed & Rogue. No need to mention all those here. I will only mention **MY** changes
+Note: This repo is always updated with OFW, Unleashed & Rogue. No need to mention all those here. We will only mention **our** changes that we can actually be credited for, unlike *others*
 
 ```txt
 [Added]

documentation/apps.md

@@ -0,0 +1,98 @@
+## What is this?
+
+This document lists all the included special apps that ship with Xtreme. It gives you an idea of what to expect VS other firmware options
+
+## Thank you to the authors!
+
+The Flipper and its community wouldn't be as rich as it is without your contributions and support. Thank you for all you have done.
+
+## GPIO
+- [Lightmeter](https://github.com/oleksiikutuzov/flipperzero-lightmeter)
+- [Air Mouse](https://github.com/ginkage/FlippAirMouse/)
+- [Wifi Marauder](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion)
+- [Wifi Deauther](https://github.com/Timmotools/flipperzero_esp8266_deautherv2)
+- [IFTTT Virtual Button for ESP8266 (By Ferrazzi)](https://github.com/Ferrazzi/FlipperZero_IFTTT_Virtual_Button)
+- [Flashlight (By xMasterX)](https://github.com/xMasterX/flipper-flashlight)
+- [GPIO Reader 1](https://github.com/biotinker/flipperzero-gpioreader)
+- [GPIO Reader 2](https://github.com/aureli1c/flipperzero_GPIO_read)
+- [Sentry Safe](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
+- [Distance Sensor](https://github.com/Sanqui/flipperzero-firmware/tree/59656ca5fb644e0d4484259986b86a0b963f323d/applications/hc_sr04)
+- [Temperature Sensor](https://github.com/Mywk/FlipperTemperatureSensor)
+- [i2c Tools](https://github.com/NaejEL/flipperzero-i2ctools)
+- [GPS](https://github.com/ezod/flipperzero-gps)
+- [Mouse Jacker](https://github.com/mothball187/flipperzero-nrf24/tree/main/mousejacker)
+- [Sniffer](https://github.com/mothball187/flipperzero-nrf24/tree/main/nrfsniff)
+- [Scanner](https://github.com/vad7/nrf24scan)
+- [ColecoVision Controller](https://github.com/ezod/flipperzero-rc2014-coleco)
+
+
+## Games
+- [2048](https://github.com/eugene-kirzhanov/flipper-zero-2048-game)
+- [Arkanoid](https://github.com/DarkFlippers/unleashed-firmware/tree/dev/applications/plugins/arkanoid)
+- [BlackJack](https://github.com/teeebor/flipper_games)
+- [Doom](https://github.com/p4nic4ttack/doom-flipper-zero/)
+- Multi Dice - In-house
+- [Flappy Bird](https://github.com/DroomOne/flipperzero-firmware/tree/dev/applications/flappy_bird)
+- [Game 15](https://github.com/x27/flipperzero-game15)
+- [Game of Life (Updated to work by tgxn) (By itsyourbedtime)](https://github.com/tgxn/flipperzero-firmware/blob/dev/applications/game_of_life/game_of_life.c)
+- Heap defense - Author Unknown
+- [Mandelbrot Set (By Possibly-Matt)](https://github.com/Possibly-Matt/flipperzero-firmware-wPlugins)
+- [Minesweeper](https://github.com/panki27/minesweeper)
+- [Snake](https://github.com/flipperdevices/flipperzero-firmware/tree/dev/applications/plugins/snake_game)
+- [Solitaire](https://github.com/teeebor/flipper_games)
+- [Tetris](https://github.com/jeffplang/flipperzero-firmware/tree/tetris_game/applications/tetris_game)
+- [Tic Tac Toe](https://github.com/gotnull/flipperzero-firmware-wPlugins/tree/420/applications/plugins/tictactoe_game)
+- [Tamagotchi(By GMMan)](https://github.com/GMMan/flipperzero-tamagotch-p1)
+- [Video Poker (By PixlEmly)](https://github.com/PixlEmly/flipperzero-firmware-testing/blob/420/applications/VideoPoker/poker.c)
+- [Yatzee (By emfleak)](https://github.com/emfleak/flipperzero-yatzee)
+
+
+## Misc
+- [Authenticator (TOTP / HOTP)](https://github.com/akopachov/flipper-zero_authenticator)
+- [Barcode Generator](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator)
+- [Caesar Cipher](https://github.com/panki27/caesar-cipher)
+- Calculator - In house / notIntense
+- [Counter](https://github.com/Krulknul/dolphin-counter)
+- [Hex Viewer](https://github.com/QtRoS/flipper-zero-hex-viewer)
+- [Mouse Jiggler](https://github.com/Jacob-Tate/flipperzero-firmware/blob/dev/applications/mouse_jiggler/mouse_jiggler.c)
+- [Converter](https://github.com/theisolinearchip/flipperzero_stuff/tree/main/applications/multi_converter)
+- [Vibrator](https://github.com/qqmajikpp/flipperzero-firmware-wPlugins/tree/420/applications/plugins/orgasmotron)
+- [Paint](https://github.com/n-o-T-I-n-s-a-n-e)
+- [UART Echo](https://github.com/flipperdevices/flipperzero-firmware/pull/831)
+- [USB HID Autofire](https://github.com/pbek/usb_hid_autofire)
+- [USB Keyboard & Mouse](https://github.com/huuck/FlipperZeroUSBKeyboard) / (https://github.com/DarkFlippers/unleashed-firmware)
+- [Wii EC Analyzer](https://github.com/csBlueChip/FlipperZero_WiiEC)
+
+
+## Music
+- [BPM Tapper (By panki27)](https://github.com/panki27/bpm-tapper)
+- [Metronome](https://github.com/panki27/Metronome)
+- [Morse Code](https://github.com/DarkFlippers/unleashed-firmware/pull/144)
+- Music Beeper - Author Unknown
+- [Music Player](https://github.com/flipperdevices/flipperzero-firmware/pull/1189)
+- [Ocarina](https://github.com/invalidna-me/flipperzero-ocarina)
+- [Software Automatic Mouth aka SAM](https://github.com/ctoth/SAM)
+- [Tuning Fork](https://github.com/besya/flipperzero-tuning-fork)
+- [Music Tracker](https://github.com/DrZlo13/flipper-zero-music-tracker)
+
+
+## Tools
+- [Bluetooth Remote](https://github.com/flipperdevices/flipperzero-firmware/pull/1330)
+- [Clock](https://github.com/kowalski7cc/flipperzero-firmware/tree/clock-v1) / In house
+- [Countdown Timer](https://github.com/0w0mewo/fpz_cntdown_timer)
+- [DAP Link](https://github.com/flipperdevices/flipperzero-firmware/pull/1897)
+- [DTMF](https://github.com/litui/dtmf_dolphin)
+- [Dolphin Backup & Restore](https://github.com/flipperdevices/flipperzero-firmware/pull/1384)
+- [iButton Fuzzer](https://github.com/DarkFlippers/unleashed-firmware)
+- [NFC Magic](https://github.com/flipperdevices/flipperzero-firmware/pull/1966)
+- [POCSAG Pager](https://github.com/xMasterX/flipper-pager)
+- [Password Generator](https://github.com/anakod/flipper_passgen)
+- [PicoPass](https://github.com/flipperdevices/flipperzero-firmware/pull/1366)
+- [RFID Fuzzer](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/245)
+- [Spectrum Analyzer](https://github.com/jolcese/flipperzero-firmware/tree/spectrum/applications/spectrum_analyzer)
+- [Sub-Ghz Bruteforce](https://github.com/derskythe/flipperzero-subbrute/tree/master)
+- [Sub-Ghz Playlist](https://github.com/darmiel/flipper-playlist)
+- [Protocol Visualizer](https://github.com/antirez/protoview)
+
+
+---

documentation/readme.md

@@ -0,0 +1,5 @@
+This documentation is work-in-progress.
+
+For now just read the file names and look for what you need to know. This will be updated to a nice readable document shortly!
+
+- 31.12.2022 ClaraCrazy

fbt_options.py

@@ -14,7 +14,7 @@ DEBUG = 0
 
 # Suffix to add to files when building distribution
 # If OS environment has DIST_SUFFIX set, it will be used instead
-DIST_SUFFIX = "XFW-0035_12282022"
+DIST_SUFFIX = "XFW-0036_12312022"
 
 # Coprocessor firmware
 COPRO_OB_DATA = "scripts/ob.data"

scripts/version.py

@@ -14,7 +14,7 @@ class GitVersion:
         self.gitlist = [("commit", "rev-parse --short HEAD"), ("branch", "rev-parse --abbrev-ref") , ("branch_num", "rev-list -count HEAD")]
 
     def get_version_info(self):
-        commit = branch = branch_num = "XFW-0035_12282022"
+        commit = branch = branch_num = "XFW-0036_12282022"
 
         # We dont use an `or` in commands that we expect to fail. It will serve no function.
         # We also dont try;exept an entire block of code. This is bad practise. We only try the single part that we expect to fail!