Skip to content

Commit

Permalink
Squashed 'applications/external/' changes from e32be2d5fd..bc95043570
Browse files Browse the repository at this point in the history
bc95043570 Backup subtree cache when adding new remote
2c022b2645 Merge chess from https://github.com/xtruan/flipper-chess
f51f43b96c Keep notifications on screen
9808f011f8 Merge bulk update subtree scripts
bc2116cd85 Ensure we are on a clean branch and workdir
576c05cf11 Merge fixes and format
37951f1c2e Add ethernet from https://github.com/xMasterX/all-the-plugins
13facd9cd3 Add new remote for ethernet
153b17d30d Add new remotes to top
e516374ecc Format
f1ba0216b5 Add pc_monitor from https://github.com/xMasterX/all-the-plugins
e5315fea28 Add new remote for pc_monitor
85a815cc08 Format
50f174825a Add t5577_raw_writer from https://github.com/xMasterX/all-the-plugins
3a92abc2fb Add new remote for t5577_raw_writer
e7f3242184 Automatically add multiple subtree remotes
2ca1b7d78c Merge fixes
7ad0e6f0c5 Add key_copier from https://github.com/xMasterX/all-the-plugins
1e88ce3514 Add fmf_to_sub from https://github.com/xMasterX/all-the-plugins
44adb5baa5 Add second remotes
cbd776a271 Format
72cf7d6f16 Add fmf_to_sub from https://github.com/jamisonderek/flipper-zero-tutorials
69077096bc Add key_copier from https://github.com/zinongli/KeyCopier
96cc2da fix: update catalog:
e5ee452 fix: bump app version
8c82df3 fix: bump version, gfx update
01d5618966 Format and remove view_dispatcher_enable_queue()
22527c9319 Merge xremote from https://github.com/xMasterX/all-the-plugins
9d9d263977 Merge wiiec from https://github.com/xMasterX/all-the-plugins
9b51383a9d Merge wifi_marauder_companion from https://github.com/xMasterX/all-the-plugins
79c4bd8adc Merge wifi_deauther from https://github.com/xMasterX/all-the-plugins
ac733e990e Merge video_game_module_tool from https://github.com/xMasterX/all-the-plugins
8dbc41c152 Merge vgm_air_mouse from https://github.com/xMasterX/all-the-plugins
82165ef111 Merge usb_consumer_control from https://github.com/xMasterX/all-the-plugins
f763799ef7 Merge unitemp from https://github.com/xMasterX/all-the-plugins
4086d1495a Merge uhf_rfid from https://github.com/xMasterX/all-the-plugins
67ef4ee0c0 Merge uart_terminal from https://github.com/xMasterX/all-the-plugins
a1691fe864 Merge totp from https://github.com/xMasterX/all-the-plugins
51e73df592 Merge tone_gen from https://github.com/xMasterX/all-the-plugins
c2f4e55fe1 Merge text_viewer from https://github.com/xMasterX/all-the-plugins
dfe6960e17 Merge text2sam from https://github.com/xMasterX/all-the-plugins
58f5070432 Merge t5577_raw_writer from https://github.com/zinongli/T5577_Raw_Writer
7f215d2556 Merge t5577_multiwriter from https://github.com/xMasterX/all-the-plugins
796a91c875 Merge subghz_remote from https://github.com/DarkFlippers/SubGHz_Remote
5965197c72 Merge subghz_bruteforcer from https://github.com/DarkFlippers/flipperzero-subbrute
7424e86f39 Merge spi_mem_manager from https://github.com/xMasterX/all-the-plugins
513b3b4214 Merge signal_generator from https://github.com/xMasterX/all-the-plugins
31f9cfb31e Merge seader from https://github.com/xMasterX/all-the-plugins
9a44c4d1b6 Merge rootoflife from https://github.com/xMasterX/all-the-plugins
40e1c3bb43 Merge rolling_flaws from https://github.com/xMasterX/all-the-plugins
3504b75008 Merge quac from https://github.com/xMasterX/all-the-plugins
086d83e505 Merge protoview from https://github.com/xMasterX/all-the-plugins
a7649798c0 Merge pomodoro from https://github.com/xMasterX/all-the-plugins
e26598b02e Merge pokemon_trading from https://github.com/EstebanFuentealba/Flipper-Zero-Game-Boy-Pokemon-Trading
14df626d46 Merge pokemon_trading from https://github.com/xMasterX/all-the-plugins
212de64c8b Merge picopass from https://github.com/xMasterX/all-the-plugins
a54304c73a Merge oscilloscope from https://github.com/anfractuosity/flipperscope
3f2fa0eaa2 Merge oscilloscope from https://github.com/xMasterX/all-the-plugins
b8255d0ee8 Merge nfc_rfid_detector from https://github.com/xMasterX/all-the-plugins
72e61b1dff Merge nfc_playlist from https://github.com/acegoal07/FlipperZero_NFC_Playlist
5076222dce Merge nfc_playlist from https://github.com/xMasterX/all-the-plugins
99ad8968cd Merge nfc_magic from https://github.com/xMasterX/all-the-plugins
6c751afc8b Merge multi_fuzzer from https://github.com/DarkFlippers/Multi_Fuzzer
032820355c Merge minesweeper from https://github.com/xMasterX/all-the-plugins
bb301f781e Merge mifare_nested from https://github.com/xMasterX/all-the-plugins
6d23cd54e2 Merge mifare_fuzzer from https://github.com/xMasterX/all-the-plugins
22336bb1f8 Merge mfc_editor from https://github.com/xMasterX/all-the-plugins
cf28c0cc31 Merge meal_pager from https://github.com/xMasterX/all-the-plugins
d0e278db83 Merge mass_storage from https://github.com/xMasterX/all-the-plugins
23bcc294bd Merge magspoof from https://github.com/xMasterX/all-the-plugins
a5a822cde0 Merge lightmeter from https://github.com/xMasterX/all-the-plugins
a60f432633 Merge ifttt from https://github.com/xMasterX/all-the-plugins
7ab02692ba Merge hex_viewer from https://github.com/xMasterX/all-the-plugins
a358a8e8ba Merge gpio_reader_b from https://github.com/xMasterX/all-the-plugins
dc26dcc587 Merge flipbip from https://github.com/xMasterX/all-the-plugins
019d14c657 Merge evil_portal from https://github.com/xMasterX/all-the-plugins
e4105b45b5 Merge esubghz_chat from https://github.com/xMasterX/all-the-plugins
f6ea1e18c3 Merge esp_flasher from https://github.com/xMasterX/all-the-plugins
27c6649785 Merge dtmf_dolphin from https://github.com/xMasterX/all-the-plugins
9322c53d63 Merge dap_link from https://github.com/xMasterX/all-the-plugins
f6faa6237b Merge color_guess from https://github.com/xMasterX/all-the-plugins
166f882a4a Merge cntdown_timer from https://github.com/xMasterX/all-the-plugins
47e1d44fb8 Merge chess from https://github.com/xMasterX/all-the-plugins
646003f27e Merge camera_suite from https://github.com/xMasterX/all-the-plugins
4b56b62f60 Merge caesarcipher from https://github.com/xMasterX/all-the-plugins
a668438f74 Merge barcode_gen from https://github.com/xMasterX/all-the-plugins
7017643c30 Merge avr_isp from https://github.com/xMasterX/all-the-plugins
d2279c3b85 Merge airmouse from https://github.com/xMasterX/all-the-plugins
f85d288515 fix missing include
9204ceb Merge pull request #36 from acegoal07/dev
a87831bedd Fixes for -Wundef
f2ea13cebd Fixes for -Wundef
89fc133263 Fixes for -Wundef
c381c57de7 Fixes for -Wundef
56e3d02c9e Fixes for -Wundef
2f2254edf6 Fixes for -Wundef
7e6687f72b Fixes for -Wundef
6905aebe4c Fixes for -Wundef
9dc90e6 ifdef fixes
a0f31bf5f9 remove deprecated view_dispatcher_enable_queue
693a58358e remove deprecated view_dispatcher_enable_queue
b925eb9854 remove deprecated view_dispatcher_enable_queue
0c58c1b8cd remove deprecated view_dispatcher_enable_queue
bb1573b84f remove deprecated view_dispatcher_enable_queue
b2e057c317 remove deprecated view_dispatcher_enable_queue
09b92aee53 remove deprecated view_dispatcher_enable_queue
ad15811ea5 remove deprecated view_dispatcher_enable_queue
95f937530f remove deprecated view_dispatcher_enable_queue
6126b26b19 remove deprecated view_dispatcher_enable_queue
74fe37f01c remove deprecated view_dispatcher_enable_queue
0d15180236 remove deprecated view_dispatcher_enable_queue
9b456f7ebc remove deprecated view_dispatcher_enable_queue
eb3e0cfdbc remove deprecated view_dispatcher_enable_queue
f34510dc74 remove deprecated view_dispatcher_enable_queue
814aaee3f8 remove deprecated view_dispatcher_enable_queue
f25566e984 remove deprecated view_dispatcher_enable_queue
21f2b300c8 remove deprecated view_dispatcher_enable_queue
7cc8191aaa remove deprecated view_dispatcher_enable_queue
1499c2b991 remove deprecated view_dispatcher_enable_queue
82c0a86937 remove deprecated view_dispatcher_enable_queue
834bfd01fa remove deprecated view_dispatcher_enable_queue
fda02ef65f remove deprecated view_dispatcher_enable_queue
362f4f6b55 remove deprecated view_dispatcher_enable_queue
1534997f56 remove deprecated view_dispatcher_enable_queue
6906e9ce48 remove deprecated view_dispatcher_enable_queue
61aedc7108 remove deprecated view_dispatcher_enable_queue
9414168776 remove deprecated view_dispatcher_enable_queue
2c5795bd7f remove deprecated view_dispatcher_enable_queue
bff31905b2 remove deprecated view_dispatcher_enable_queue
3c5e7f0aee remove deprecated view_dispatcher_enable_queue
95be7340ba remove deprecated view_dispatcher_enable_queue
32c6337dc4 remove deprecated view_dispatcher_enable_queue
10139df9c8 remove deprecated view_dispatcher_enable_queue
aa7b2b329e remove deprecated view_dispatcher_enable_queue
78bb8b414f remove deprecated view_dispatcher_enable_queue
c323835b8c remove deprecated view_dispatcher_enable_queue
f565e82e8c remove deprecated view_dispatcher_enable_queue
2cac868f37 remove deprecated view_dispatcher_enable_queue
c3a983bdba remove deprecated view_dispatcher_enable_queue
20401e5b62 remove deprecated view_dispatcher_enable_queue
417147138a remove deprecated view_dispatcher_enable_queue
ad6eb74efc remove deprecated view_dispatcher_enable_queue
fb4ed391cf remove deprecated view_dispatcher_enable_queue
5a2b0c932c remove deprecated view_dispatcher_enable_queue
ad1ccfbe77 remove deprecated view_dispatcher_enable_queue
6dfa2fce22 remove deprecated view_dispatcher_enable_queue
bcf8db2203 remove deprecated view_dispatcher_enable_queue
4ab5e35d39 remove deprecated view_dispatcher_enable_queue
f509ecdfa4 remove deprecated view_dispatcher_enable_queue
29096f4a1a remove deprecated view_dispatcher_enable_queue
38acf7cc85 remove deprecated view_dispatcher_enable_queue
b12e856296 remove deprecated view_dispatcher_enable_queue
7d3589d remove deprecated
35877b4 remove deprecated
36625f2565 add 2 more apps
9da76fcb1e add 2 more apps
14ef58217e add t5577 raw writer
0145a6eba8 upd esp flasher
b631376 remove deprecated
f562947275 upd seader
45395bc if defined fixes
18199fc switch stop bliking place
adb4fce added LED and write success vibration
3478751 Update changelog and readme
7608db8 Bump version
79223c2 Make sure define is present
2740da9697 Improved timing of notes
b2d282f Update nfc_playlist_scene_emulation.c
7955b1a Update README.md
324ddc5 Merge branch 'main' of https://github.com/zinongli/KeyCopier
01d7cf3 get ready for app store
0a5e541 Create CHANGELOG.md
f2bd9e0 Merge branch 'main' of https://github.com/zinongli/KeyCopier
caf43df get ready for release
284f46e Update README.md
9d5e04d elbow and clean up
57b7747 Save and Load total rework
743baec Update README.md
9057c3b Update README.md
9972536 Merge pull request #78 from derskythe/master
a51ad78 Merge pull request #11 from derskythe/fix/readme
d1f0642 Merge branch 'master' into fix/readme
d590c9d Merge pull request #10 from derskythe/fix/ci
803a047 Update subbrute_worker.c
c47a5cc Update pr-build.yaml
e2d9194 Update README.md
def1d0f Merge pull request #76 from derskythe/feat/refactor
37436c7 Create pr-build.yaml
abeb8b1 changelog: add 2.1 info
7cc7c15 application.fam: bump to 2.1
b971440 remove unused images
672d4a3 Clean up stale links
b6dba30 trade: Add ability to reset connection state
17dc0b7 patch_list: move to main codebase, rename, cleanup
fcaa48f scenes: rework scene management
509d02c README_es: Removed, unable to maintain
aca6bdf attribute: combine calculated attributes to single file
eafd365 pokerus: Separate out accessor functions from scene
2f9f536 pokemon_shiny: Split out attribute handling, does not belong in scene
5eebf2d pokemon_gender: Split out accessor functions from scene
e95af71 unown: relocated this to toplevel, not scene specific
4fae7bf scenes: move files to include folder
8a0c348 scenes: Cleanup/refactor
717f383 mass move of files
dbcea5f 更新 README.md
96fd8e8 Update README.md
3dd943f Update CHANGELOG.md
271aad4 Update README.md
14195f9 Rename CHANGLOG.md to CHANGELOG.md
18e6cd6 Update application.fam
b26d3e2 Revert "update appid"
ea77606 update appid
84c8b5b added screenshots
428cd43 Create CHANGLOG.md
a306dd9 version num
1f69277 Update Tag_1.t5577
f45ec20 Merge pull request #11 from zinongli/dev
bb0e799 Fix User Block Num bug
43a3f5d 更新 README.md
72ef61b save works fine
c2464cc74b Fix for fast notes/pauses
dbde212019 readme - backtick not allowed
776855044e Add screenshots
0872b564ba fmf_to_sub v1.0
1485b56 Update README.md
5f90b41 Update README.md
ce06869 Update README.md
0bbfa2e Merge pull request #10 from zinongli/stock_funcitons
944a788 use FlipperFormat struct for saving and loading
ec4a738 Merge pull request #35 from acegoal07/dev
8d64cd1 Update nfc_playlist_scene_emulation.c
9381730 storage_simply_mkdir added
458b1f4 deleted unused backlight setting
7d7cecb delete unused variables
0f3110e format and minor changes
2f2ec4b Merge branch 'main' of https://github.com/zinongli/T5577_Raw_Writer
4b3fe38 format
0ff31da Update and rename Build Flipper Application Package.yml to ufbt.yaml
ac48985 Create Build Flipper Application Package.yml
48825ea Update README.md
cef627b Use system icon
e479621 Merge pull request #5 from xtruan/main
f419191 ci: add ufbt build
bd387d3 更新 README.md
3e9a452 Update README.md
5a6028a Update README.md
f4ac2c8 Update .DS_Store
3422427 saving function initial implementation
13eaf99 graphic major updates and various improvements
de2f803 graphic improvements
9eae988 deleted unused asset
389553a update app icon
a00f961 Update README.md
58acfbb add instructions and introductions
fa392c4 Update README.md
b17dd99 Update README.md
75c0492 Update README.md
2bf23db updated README, improved graphics
6fd7fac feat: Some refactoring to clean-up the code
d44ca32 Update app.c
3f323a0 more debug on graphic
9558085 Update README.md
e93265e implemented MACS
8eef325 implemented changing key formats
c0cf671 roughly works as of now
c48e7b0 Initial commit
4f722fd09f add eth tester for W5500 module
450aae07dc add pc monitor app

git-subtree-dir: applications/external
git-subtree-split: bc950435708613fc7db37468022762f8083bfcfc
  • Loading branch information
RogueMaster committed Aug 19, 2024
1 parent 5b5d796 commit 41d409a
Show file tree
Hide file tree
Showing 274 changed files with 4,274 additions and 3,043 deletions.
7 changes: 2 additions & 5 deletions .utils/.check-merge.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/bin/bash
set -e

if [ "$(git rev-parse --show-prefix)" != "" ]; then
echo "Must be in root of git repo!"
exit
fi
bash .utils/.check-workdir.sh

if [ "${1}" = "" ] || [ "${2}" = "" ]; then
echo "Usage: <path> <repo url> <merge output>"
Expand All @@ -16,7 +13,7 @@ result="${3}"

if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
echo "MERGE_MSG: Merge ${path} from ${repo}"
notify-send -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
notify-send -t 0 -a Git -i git "Subtree merge failed" "Resolve current index to continue" &> /dev/null | true
while true; do
echo "Resolve current index then press Enter..."
read
Expand Down
15 changes: 15 additions & 0 deletions .utils/.check-workdir.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash
set -e

if [ "$(git rev-parse --show-prefix)" != "" ]; then
echo "Must be in root of git repo!"
exit 1
fi
if [ "$(git branch --show-current)" = "" ]; then
echo "Must be on a branch!"
exit 1
fi
if ! git diff --quiet || ! git diff --cached --quiet || ! git merge HEAD &> /dev/null; then
echo "Workdir must be clean!"
exit 1
fi
5 changes: 1 addition & 4 deletions .utils/.subtree-subdir-helper.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/bin/bash
set -e

if [ "$(git rev-parse --show-prefix)" != "" ]; then
echo "Must be in root of git repo!"
exit
fi
bash .utils/.check-workdir.sh

if [ "${1}" = "" ] || [ "${2}" = "" ] || [ "${3}" = "" ] || [ "${4}" = "" ] || [ "${5}" = "" ]; then
echo "Usage: <path> <repo url> <branch> <subdir> <action>"
Expand Down
35 changes: 29 additions & 6 deletions .utils/add-subtree.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/bin/bash
set -e

if [ "$(git rev-parse --show-prefix)" != "" ]; then
echo "Must be in root of git repo!"
exit
fi
bash .utils/.check-workdir.sh

if [ "$1" = "" ] || [ "$2" = "" ]; then
echo "Usage 1: <path> <repo url> <branch> [subdir]"
Expand All @@ -19,6 +16,17 @@ else
branch="${3}"
subdir="${4%/}"
fi
gitsubtree="${path}/.gitsubtree"

prevremotedir=""
if [ -e "${gitsubtree}" ]; then
echo "Subtree already exists, adding new remote to it."
prevremotedir="$(mktemp -d /tmp/gitsubtree-XXXXXXXX)"
# To use 2 remotes for subtree we need to remove current one, add new one, then merge
mv -T "${path}" "${prevremotedir}"
git add "${path}"
git commit -m "Add new remote for ${path}"
fi

if [ "${subdir}" = "" ]; then
subdir="/"
Expand All @@ -27,7 +35,22 @@ else
bash .utils/.subtree-subdir-helper.sh "${path}" "${repo}" "${branch}" "${subdir}" add
fi

gitsubtree="${path}/.gitsubtree"
echo "${repo} ${branch} ${subdir}" > "${gitsubtree}"
if [ "${prevremotedir}" != "" ]; then
if [ -e "${path}/.subtree-cache" ]; then
# Backup subtree cache
cp -rT "${path}/.subtree-cache" "${prevremotedir}/.subtree-cache"
fi
rm -r "${path}"
mv -T "${prevremotedir}" "${path}"
fi

# Add new remote at the top
echo "${repo} ${branch} ${subdir}" | cat - "${gitsubtree}" 2> /dev/null > "${gitsubtree}.new"
mv "${gitsubtree}.new" "${gitsubtree}"
git add "${gitsubtree}"
git commit --amend --no-edit

if [ "${prevremotedir}" != "" ]; then
prevremotedir=""
echo "Added new remote for existing subtree, you must solve conflicts manually..."
fi
16 changes: 0 additions & 16 deletions .utils/bulk-update-subtrees.sh

This file was deleted.

26 changes: 0 additions & 26 deletions .utils/update-subtree.sh

This file was deleted.

33 changes: 33 additions & 0 deletions .utils/update-subtrees.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/bash
set -e

bash .utils/.check-workdir.sh

if [ "${1}" = "" ]; then
shopt -s globstar
subtrees=(**/.gitsubtree)
else
subtrees=($*)
fi

for subtree in "${subtrees[@]}"; do
if [[ "${subtree}" != */.gitsubtree ]]; then
subtree="${subtree}/.gitsubtree"
fi
path="$(dirname "${subtree}")"
echo -e "\n\nUpdating ${path}..."
while read -u $remote repo branch subdir; do
if [ "${repo:0:1}" = "#" ]; then
continue
fi
if [ "${subdir}" = "/" ]; then
exec {capture}>&1
result="$(git subtree pull -P "${path}" "${repo}" "${branch}" -m "Merge ${path} from ${repo}" 2>&1 | tee /proc/self/fd/$capture)"
bash .utils/.check-merge.sh "${path}" "${repo}" "${result}"
else
bash .utils/.subtree-subdir-helper.sh "${path}" "${repo}" "${branch}" "${subdir}" merge
fi
done {remote}< "${subtree}"
done

notify-send -t 0 -a Git -i git "Subtree update finished" "Double check merge commits" &> /dev/null | true
18 changes: 8 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@ That's why the commit history for this repo is so huge, it contains all the comm

To make updating more manageable, we have added some scripts on top of subtrees:
- add a new app with `.utils/add-subtree.sh <path> <repo url> <branch> [subdir]`, this will pull the history and create `path/.gitsubtree` to remember the url, branch and subdir
- run `.utils/update-subtree.sh <path>` to pull updates for a subtree
- or run `.utils/bulk-update-subtrees.sh` to do it for all subtrees
- run `.utils/update-subtrees.sh <path> [path2] [pathN...]` to pull updates for some subtrees
- or run `.utils/update-subtrees.sh` with no arguments to update all subtrees

Most apps have a remote subtree URL for both the original repository, and for any forks / other sources such as [@xMasterX's pack](https://github.com/xMasterX/all-the-plugins).
Unfortunately, this process is currently manual as our helper scripts don't cover it. We instead:
- add from one remote
- delete the directory in a commit
- add from another remote
- replace the new directory with the previous one
- compare the changes between forks and keep the best of both
- add any eventual edits we have on our end
If you're an app developer wanting to add your app, or a third party who wants to include something they find useful, you don't need to bother with this cumbersome process.
This process is assisted by `.utils/add-subtree.sh`, if the specified subtree path already exists, it will:
- remove the previous subtree with a commit
- add the subtree from the new remote
- restore the previous subtree and merge the remotes
After this, you will just need to resolve the conflicts (content differences between remotes) manually to keep the best of both, and commit.
If you're an app developer wanting to add your app, or a third party who wants to include something they find useful, you don't need to bother with this process.
We will do it for you, just add from a single remote URL, or simply make an issue requesting an app to be added!
2 changes: 1 addition & 1 deletion airmouse/air_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ AirMouse* air_mouse_app_alloc() {

// View dispatcher
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);

// Submenu view
Expand Down
1 change: 0 additions & 1 deletion avr_isp/avr_isp_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ AvrIspApp* avr_isp_app_alloc() {
// View Dispatcher
app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&avr_isp_scene_handlers, app);
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
view_dispatcher_set_custom_event_callback(
Expand Down
2 changes: 1 addition & 1 deletion barcode_gen/barcode_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ int32_t barcode_main(void* p) {
app->gui = furi_record_open(RECORD_GUI);

app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);

app->main_menu = submenu_alloc();
Expand Down
2 changes: 1 addition & 1 deletion ble_spam/ble_spam.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ int32_t ble_spam(void* p) {
state->ctx.notification = furi_record_open(RECORD_NOTIFICATION);
Gui* gui = furi_record_open(RECORD_GUI);
state->ctx.view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(state->ctx.view_dispatcher);

view_dispatcher_set_event_callback_context(state->ctx.view_dispatcher, state);
view_dispatcher_set_custom_event_callback(state->ctx.view_dispatcher, custom_event_callback);
view_dispatcher_set_tick_event_callback(state->ctx.view_dispatcher, tick_event_callback, 100);
Expand Down
3 changes: 0 additions & 3 deletions caesarcipher/caesar_cipher.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ int32_t caesar_cipher_app() {
Gui* gui = furi_record_open("gui");
//gui_add_view_port(gui, view_port, GuiLayerFullscreen);

FURI_LOG_D("caesar_cipher", "Enabling view dispatcher queue");
view_dispatcher_enable_queue(caesar_state->view_dispatcher);

FURI_LOG_D("caesar_cipher", "Adding text input view to dispatcher");
view_dispatcher_add_view(
caesar_state->view_dispatcher, 0, text_input_get_view(caesar_state->text_input));
Expand Down
1 change: 0 additions & 1 deletion camera_suite/camera_suite.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ CameraSuite* camera_suite_app_alloc() {

// Scene additions
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

app->scene_manager = scene_manager_alloc(&camera_suite_scene_handlers, app);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
Expand Down
2 changes: 1 addition & 1 deletion chess/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ App(
fap_category="Games",
fap_author="Struan Clark (xtruan)",
fap_weburl="https://github.com/xtruan/flipper-chess",
fap_version=(1, 10),
fap_version=(1, 11),
fap_description="Chess for Flipper",
)
4 changes: 2 additions & 2 deletions chess/catalog/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ sourcecode:
type: git
location:
origin: https://github.com/xtruan/flipper-chess.git
commit_sha: 936a32f359f121459a6aa4b124a274062b43b26c
commit_sha: e5ee4520dfc68080b1723b03f6d8e857ec10a6b0
description: "How about a nice game of chess?"
changelog: "v1.10 - Update to support new FW"
changelog: "v1.11 - Update to support new FW"
author: "@xtruan"
screenshots:
- "./catalog/startscreen.png"
Expand Down
1 change: 0 additions & 1 deletion chess/flipchess.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ FlipChess* flipchess_app_alloc() {

//Scene additions
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

app->scene_manager = scene_manager_alloc(&flipchess_scene_handlers, app);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
Expand Down
2 changes: 1 addition & 1 deletion chess/flipchess.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "views/flipchess_startscreen.h"
#include "views/flipchess_scene_1.h"

#define FLIPCHESS_VERSION "v1.10"
#define FLIPCHESS_VERSION "v1.11"

#define TEXT_BUFFER_SIZE 96
#define TEXT_SIZE (TEXT_BUFFER_SIZE - 1)
Expand Down
Binary file modified chess/icons/FLIPR_128x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion cli_bridge/cligui_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int32_t cligui_main(void* p) {
prev_input_callback = cligui->view_dispatcher->view_port->input_callback;
view_port_input_callback_set(
cligui->view_dispatcher->view_port, input_callback_wrapper, cligui);
view_dispatcher_enable_queue(cligui->view_dispatcher);

view_dispatcher_set_event_callback_context(cligui->view_dispatcher, cligui);
view_dispatcher_set_custom_event_callback(cligui->view_dispatcher, cligui_custom_event_cb);
view_dispatcher_set_navigation_event_callback(cligui->view_dispatcher, cligui_back_event_cb);
Expand Down
1 change: 0 additions & 1 deletion cntdown_timer/app.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ CountDownTimerApp* countdown_app_new(void) {

// 2.1 setup view dispatcher
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

// 2.2 attach view dispatcher to gui
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
Expand Down
1 change: 0 additions & 1 deletion color_guess/color_guess.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ ColorGuess* color_guess_app_alloc() {

//Scene additions
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

app->scene_manager = scene_manager_alloc(&color_guess_scene_handlers, app);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
Expand Down
1 change: 0 additions & 1 deletion cross_remote/xremote.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ XRemote* xremote_app_alloc() {

//Scene additions
app->view_dispatcher = view_dispatcher_alloc();
view_dispatcher_enable_queue(app->view_dispatcher);

app->scene_manager = scene_manager_alloc(&xremote_scene_handlers, app);
view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
Expand Down
2 changes: 1 addition & 1 deletion dap_link/gui/dap_gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DapGuiApp* dap_gui_alloc() {
app->gui = furi_record_open(RECORD_GUI);
app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&dap_scene_handlers, app);
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_set_event_callback_context(app->view_dispatcher, app);

view_dispatcher_set_custom_event_callback(app->view_dispatcher, dap_gui_custom_event_callback);
Expand Down
2 changes: 1 addition & 1 deletion dtmf_dolphin/dtmf_dolphin.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static DTMFDolphinApp* app_alloc() {
app->gui = furi_record_open(RECORD_GUI);
app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&dtmf_dolphin_scene_handlers, app);
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_set_event_callback_context(app->view_dispatcher, app);

view_dispatcher_set_custom_event_callback(
Expand Down
2 changes: 1 addition & 1 deletion esp_flasher/esp_flasher_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ EspFlasherApp* esp_flasher_app_alloc() {

app->view_dispatcher = view_dispatcher_alloc();
app->scene_manager = scene_manager_alloc(&esp_flasher_scene_handlers, app);
view_dispatcher_enable_queue(app->view_dispatcher);

view_dispatcher_set_event_callback_context(app->view_dispatcher, app);

view_dispatcher_set_custom_event_callback(
Expand Down
2 changes: 0 additions & 2 deletions esubghz_chat/esubghz_chat.c
Original file line number Diff line number Diff line change
Expand Up @@ -675,8 +675,6 @@ int32_t esubghz_chat(const char* args) {
view_port_input_callback_set(
state->view_dispatcher->view_port, esubghz_hooked_input_callback, state);

view_dispatcher_enable_queue(state->view_dispatcher);

/* set callbacks for view dispatcher */
view_dispatcher_set_event_callback_context(state->view_dispatcher, state);
view_dispatcher_set_custom_event_callback(
Expand Down
Loading

0 comments on commit 41d409a

Please sign in to comment.