Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xMasterX committed May 2, 2023
2 parents 98bf353 + 311cbf7 commit 4b74d13
Show file tree
Hide file tree
Showing 56 changed files with 1,158 additions and 155 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ko_fi: masterx
custom:
[
"https://boosty.to/mmxdev",
Expand Down
32 changes: 9 additions & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
### New changes
* Power + BLE: DeepSleep + required ble stack upgrade added back, all known issues was fixed in OFW, no issues was found during our tests
* Desktop: Allow locking without pin using Up menu on desktop (Short click on `Lock` = Without PIN / Long = With PIN)
* RFID: Add confirmation message before running `Clear T5577 Password`
* RFID: Add more user friendly RAW emulation via UI [(by Dan Caprita)](https://forum.flipperzero.one/t/electra-intercom/6368/43)
* SubGHz: Fixed `Frequency Analyzer` issues, fixed `Read` mode issues
* SubGHz: Fix NFC crash when using external CC1101 radio module
* SubGHz: Fix multiple external CC1101 radio module issues, (int callbacks, SPI handlers init/reinit)
* SubGHz: Using scene manager function in add manually (by @gid9798 | PR #437)
* Plugins: ESP32: WiFi Marauder - add icon for log files in logs browser
* Plugins: Update **ESP32: WiFi Marauder companion** plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion) merged [PR by @tcpassos](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion/pull/11)
* NFC: Temp fix for Detect reader not collecting nonces
* Desktop: Temp fix for old backlight bug when locking by holding up arrow
* IR: Add Sharp and Vizio to Universal TV remote
* BLE Info: Show version instead of branch
* Plugins: Add new game - Bomberduck (by @leo-need-more-coffee | PR #450)
* Plugins: Fix `SWD Probe` plugin GPIO pins state reset on exit
* Plugins: Bluetooth Remote - new UI (by @krolchonok | PR #447)
* Plugins: Update **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
* Plugins: Fix RFID Fuzzer and iButton Fuzzer crashes
* Plugins: iButton Fuzzer default keys update (by @team-orangeBlue)
* Infrared: Updated infrared assets (by @amec0e | PR #441)
* Docs: Update **How To Install** images (by @krolchonok | PR #436)
* OFW PR 2620: NFC: Fix reading Mifare Classic cards with unusual access conditions and fix emulation of unknown keys (by Astrrra)
* OFW PR 2616: Picopass: remove spaces in CSN (by bettse)
* OFW PR 2604: WS: add protocol "Wendox W6726" (by Skorpionm)
* OFW PR 2607: BadUSB: command parser fix (by nminaylov)
* OFW: Keep HSI16 working in stop mode.
* OFW: FuriHal: use proper divider for core2 when transition to sleep, remove extra stop mode transition checks, cleanup code. Furi: proper assert and check messages.
* OFW: Don't reboot on crash in debug builds
* OFW: cubewb: downgraded to v1.15.0
* Docs: Update HowToInstall (by @krolchonok | PR #443)
* OFW PR 2627: Add HID mouse auto-clicker (by @rwl4)

#### [🎲 Download latest extra apps pack](https://github.com/xMasterX/all-the-plugins/archive/refs/heads/main.zip)

Expand All @@ -31,7 +18,6 @@

## Please support development of the project
* **Boosty** (patreon alternative): https://boosty.to/mmxdev
* Ko-Fi: https://ko-fi.com/masterx
* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
Expand Down
3 changes: 2 additions & 1 deletion ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ The amount of work done on this project is huge and we need your support, no mat
Also, regarding our releases, every build has and always will be free and open-source. There will be no paywall releases or closed-source apps within the firmware. As long as I am working on this project it will never happen.
You can support us by using links or addresses below:
* **Boosty** (patreon alternative): https://boosty.to/mmxdev
* Ko-Fi: https://ko-fi.com/masterx
* cloudtips (only RU payments accepted): https://pay.cloudtips.ru/p/7b3e9d65
* YooMoney (only RU payments accepted): https://yoomoney.ru/fundraise/XA49mgQLPA0.221209
* USDT(TRC20): `TSXcitMSnWXUFqiUfEXrTVpVewXy2cYhrs`
Expand Down Expand Up @@ -162,6 +161,7 @@ You can support us by using links or addresses below:
- **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main)
- **ProtoView** [(by antirez)](https://github.com/antirez/protoview)
- **SWD Probe** [(by g3gg0)](https://github.com/g3gg0/flipper-swd_probe)
- IR Scope [(by kallanreed)](https://github.com/DarkFlippers/unleashed-firmware/pull/407)

Games:
- DOOM (fixed) [(by p4nic4ttack)](https://github.com/p4nic4ttack/doom-flipper-zero/)
Expand All @@ -176,6 +176,7 @@ Games:
- Solitaire [(by teeebor)](https://github.com/teeebor/flipper_games)
- BlackJack [(by teeebor)](https://github.com/teeebor/flipper_games)
- 2048 game [(by eugene-kirzhanov)](https://github.com/eugene-kirzhanov/flipper-zero-2048-game)
- Bomberduck [(by leo-need-more-coffee)](https://github.com/leo-need-more-coffee/flipperzero-bomberduck)


# Instructions
Expand Down
22 changes: 22 additions & 0 deletions applications/external/bomberduck/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
MIT License

Copyright (c) 2023 лень

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2 changes: 2 additions & 0 deletions applications/external/bomberduck/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# flipperzero-bomberduck
Bomberman clone on flipper zero!
14 changes: 14 additions & 0 deletions applications/external/bomberduck/application.fam
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
App(
appid="bomberduck",
name="Bomberduck",
apptype=FlipperAppType.EXTERNAL,
entry_point="bomberduck_app",
requires=[
"gui",
],
stack_size=1 * 1024,
order=90,
fap_icon="bomb.png",
fap_category="Games",
fap_icon_assets="assets",
)
Binary file added applications/external/bomberduck/assets/bomb0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added applications/external/bomberduck/assets/bomb1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added applications/external/bomberduck/assets/bomb2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added applications/external/bomberduck/assets/box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added applications/external/bomberduck/assets/end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added applications/external/bomberduck/bomb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4b74d13

Please sign in to comment.