Skip to content

Commit a9b1400

Browse files
RogueMasterRogueMaster
authored
Merge pull request #165 from RogueMaster/toUpdate
To update
2 parents 03bf54b + 129832b commit a9b1400

File tree

21 files changed

+469
-44
lines changed

21 files changed

+469
-44
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
run: |
114114
echo "${{ secrets.RSYNC_DEPLOY_KEY }}" > deploy_key;
115115
chmod 600 ./deploy_key;
116-
rsync -avzP --mkpath \
116+
rsync -avzP --delete --mkpath \
117117
-e 'ssh -p ${{ secrets.RSYNC_DEPLOY_PORT }} -i ./deploy_key' \
118118
artifacts/ ${{ secrets.RSYNC_DEPLOY_USER }}@${{ secrets.RSYNC_DEPLOY_HOST }}:"${{ secrets.RSYNC_DEPLOY_BASE_PATH }}${{steps.names.outputs.artifacts-path}}/";
119119
rm ./deploy_key;

‎.vscode/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
./c_cpp_properties.json
2+
./launch.json
3+
./settings.json
4+
./tasks.json

‎.vscode/example/c_cpp_properties.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Win32",
5+
"compilerPath": "${workspaceFolder}/toolchain/i686-windows/bin/arm-none-eabi-gcc.exe",
6+
"intelliSenseMode": "gcc-arm",
7+
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
8+
"configurationProvider": "ms-vscode.cpptools",
9+
"cStandard": "gnu17",
10+
"cppStandard": "c++17"
11+
},
12+
{
13+
"name": "Linux",
14+
"compilerPath": "${workspaceFolder}/toolchain/x86_64-linux/bin/arm-none-eabi-gcc",
15+
"intelliSenseMode": "gcc-arm",
16+
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
17+
"configurationProvider": "ms-vscode.cpptools",
18+
"cStandard": "gnu17",
19+
"cppStandard": "c++17"
20+
},
21+
{
22+
"name": "Mac",
23+
"compilerPath": "${workspaceFolder}/toolchain/x86_64-darwin/bin/arm-none-eabi-gcc",
24+
"intelliSenseMode": "gcc-arm",
25+
"compileCommands": "${workspaceFolder}/build/latest/compile_commands.json",
26+
"configurationProvider": "ms-vscode.cpptools",
27+
"cStandard": "gnu17",
28+
"cppStandard": "c++17"
29+
}
30+
],
31+
"version": 4
32+
}

‎.vscode/example/launch.json

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"inputs": [
7+
{
8+
"id": "BLACKMAGIC",
9+
"type": "command",
10+
"command": "shellCommand.execute",
11+
"args": {
12+
"command": "./fbt get_blackmagic",
13+
"description": "Get Blackmagic device",
14+
}
15+
}
16+
],
17+
"configurations": [
18+
{
19+
"name": "Attach FW (ST-Link)",
20+
"cwd": "${workspaceFolder}",
21+
"executable": "./build/latest/firmware.elf",
22+
"request": "attach",
23+
"type": "cortex-debug",
24+
"servertype": "openocd",
25+
"device": "stlink",
26+
"svdFile": "./debug/STM32WB55_CM4.svd",
27+
"rtos": "FreeRTOS",
28+
"configFiles": [
29+
"interface/stlink.cfg",
30+
"./debug/stm32wbx.cfg",
31+
],
32+
"postAttachCommands": [
33+
// "attach 1",
34+
"compare-sections",
35+
]
36+
// "showDevDebugOutput": "raw",
37+
},
38+
{
39+
"name": "Attach FW (blackmagic)",
40+
"cwd": "${workspaceFolder}",
41+
"executable": "./build/latest/firmware.elf",
42+
"request": "attach",
43+
"type": "cortex-debug",
44+
"servertype": "external",
45+
"gdbTarget": "${input:BLACKMAGIC}",
46+
"svdFile": "./debug/STM32WB55_CM4.svd",
47+
"rtos": "FreeRTOS",
48+
"postAttachCommands": [
49+
"monitor swdp_scan",
50+
"attach 1",
51+
"set confirm off",
52+
"set mem inaccessible-by-default off",
53+
"compare-sections",
54+
]
55+
// "showDevDebugOutput": "raw",
56+
},
57+
{
58+
"name": "Attach FW (JLink)",
59+
"cwd": "${workspaceFolder}",
60+
"executable": "./build/latest/firmware.elf",
61+
"request": "attach",
62+
"type": "cortex-debug",
63+
"servertype": "jlink",
64+
"interface": "swd",
65+
"device": "STM32WB55RG",
66+
"svdFile": "./debug/STM32WB55_CM4.svd",
67+
"rtos": "FreeRTOS",
68+
// "showDevDebugOutput": "raw",
69+
},
70+
{
71+
"name": "fbt debug",
72+
"type": "python",
73+
"request": "launch",
74+
"program": "./lib/scons/scripts/scons.py",
75+
"args": [
76+
"sdk"
77+
]
78+
},
79+
{
80+
"name": "python debug",
81+
"type": "python",
82+
"request": "launch",
83+
"program": "${file}",
84+
"args": []
85+
}
86+
]
87+
}

‎.vscode/example/settings.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"C_Cpp.default.cStandard": "gnu17",
3+
"C_Cpp.default.cppStandard": "c++17",
4+
"python.formatting.provider": "black",
5+
"workbench.tree.indent": 12,
6+
"cortex-debug.enableTelemetry": false,
7+
"cortex-debug.variableUseNaturalFormat": true,
8+
"cortex-debug.showRTOS": true,
9+
"cortex-debug.armToolchainPath.windows": "${workspaceFolder}/toolchain/i686-windows/bin",
10+
"cortex-debug.armToolchainPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/bin",
11+
"cortex-debug.armToolchainPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/bin",
12+
"cortex-debug.openocdPath.windows": "${workspaceFolder}/toolchain/i686-windows/openocd/bin/openocd.exe",
13+
"cortex-debug.openocdPath.linux": "${workspaceFolder}/toolchain/x86_64-linux/openocd/bin/openocd",
14+
"cortex-debug.openocdPath.osx": "${workspaceFolder}/toolchain/x86_64-darwin/openocd/bin/openocd",
15+
"editor.formatOnSave": true,
16+
"files.associations": {
17+
"*.scons": "python",
18+
"SConscript": "python",
19+
"SConstruct": "python",
20+
"*.fam": "python",
21+
}
22+
}

‎.vscode/example/tasks.json

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "[Release] Build",
8+
"group": "build",
9+
"type": "shell",
10+
"command": "./fbt COMPACT=1 DEBUG=0"
11+
},
12+
{
13+
"label": "[Debug] Build",
14+
"group": "build",
15+
"type": "shell",
16+
"command": "./fbt"
17+
},
18+
{
19+
"label": "[Release] Flash (ST-Link)",
20+
"group": "build",
21+
"type": "shell",
22+
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash"
23+
},
24+
{
25+
"label": "[Debug] Flash (ST-Link)",
26+
"group": "build",
27+
"type": "shell",
28+
"command": "./fbt FORCE=1 flash"
29+
},
30+
{
31+
"label": "[Release] Flash (blackmagic)",
32+
"group": "build",
33+
"type": "shell",
34+
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_blackmagic"
35+
},
36+
{
37+
"label": "[Debug] Flash (blackmagic)",
38+
"group": "build",
39+
"type": "shell",
40+
"command": "./fbt FORCE=1 flash_blackmagic"
41+
},
42+
{
43+
"label": "[Release] Flash (JLink)",
44+
"group": "build",
45+
"type": "shell",
46+
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 jflash"
47+
},
48+
{
49+
"label": "[Debug] Flash (JLink)",
50+
"group": "build",
51+
"type": "shell",
52+
"command": "./fbt FORCE=1 jflash"
53+
},
54+
{
55+
"label": "[Release] Build update bundle",
56+
"group": "build",
57+
"type": "shell",
58+
"command": "./fbt update_package COMPACT=1 DEBUG=0"
59+
},
60+
{
61+
"label": "[Debug] Build update bundle",
62+
"group": "build",
63+
"type": "shell",
64+
"command": "./fbt update_package"
65+
},
66+
{
67+
"label": "[Release] Build updater",
68+
"group": "build",
69+
"type": "shell",
70+
"command": "./fbt updater_all COMPACT=1 DEBUG=0"
71+
},
72+
{
73+
"label": "[Debug] Build updater",
74+
"group": "build",
75+
"type": "shell",
76+
"command": "./fbt updater_all"
77+
},
78+
{
79+
"label": "[Debug] Flash (USB, w/o resources)",
80+
"group": "build",
81+
"type": "shell",
82+
"command": "./fbt FORCE=1 flash_usb"
83+
},
84+
{
85+
"label": "[Release] Flash (USB, w/o resources)",
86+
"group": "build",
87+
"type": "shell",
88+
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb"
89+
},
90+
{
91+
"label": "[Debug:unit_tests] Flash (USB)",
92+
"group": "build",
93+
"type": "shell",
94+
"command": "./fbt FIRMWARE_APP_SET=unit_tests FORCE=1 flash_usb"
95+
},
96+
{
97+
"label": "[Release] Flash (USB, with resources)",
98+
"group": "build",
99+
"type": "shell",
100+
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full"
101+
},
102+
]
103+
}

‎.vscode/extensions.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
3+
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
4+
// List of extensions which should be recommended for users of this workspace.
5+
"recommendations": [
6+
"ms-python.black-formatter",
7+
"ms-vscode.cpptools",
8+
"amiralizadeh9480.cpp-helper",
9+
"marus25.cortex-debug",
10+
"zxh404.vscode-proto3",
11+
"augustocdias.tasks-shell-input"
12+
],
13+
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
14+
"unwantedRecommendations": []
15+
}

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<b>Latest Updates:</b>
77

88
- TOFIX - FAP Loader disabled so the FW compiles. Compiling requires api_symbols.csv manipulation and some FAPs are not working, we are aware.
9-
- Latest OFW updates: [#1524](https://github.com/flipperdevices/flipperzero-firmware/pull/1524) & [#1492](https://github.com/flipperdevices/flipperzero-firmware/pull/1492)
9+
- Latest OFW updates: [#1524](https://github.com/flipperdevices/flipperzero-firmware/pull/1524), [#1492](https://github.com/flipperdevices/flipperzero-firmware/pull/1492), [#1496](https://github.com/flipperdevices/flipperzero-firmware/pull/1496), [#1520](https://github.com/flipperdevices/flipperzero-firmware/pull/1520), [#1523](https://github.com/flipperdevices/flipperzero-firmware/pull/1523), [#1513](https://github.com/flipperdevices/flipperzero-firmware/pull/1513), [#1462](https://github.com/flipperdevices/flipperzero-firmware/pull/1462) & [#1528](https://github.com/flipperdevices/flipperzero-firmware/pull/1528)
1010
- Excluded [App RPC Bug Fixes and redesign #1491](https://github.com/flipperdevices/flipperzero-firmware/pull/1491) since it breaks compile
11+
- Excluded [Make printf great again #1438 (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/pull/1438)
1112

1213
<table width="100%" border="0" cellspacing="0">
1314
<tr> <td colspan=2> <h3>This software is for experimental purposes only and is not meant for any illegal activity/purposes. We do not condone illegal activity and strongly encourage keeping transmissions to legal/valid uses allowed by law.</h3> </td> </tr>
@@ -115,9 +116,7 @@ $ ./fbt plugin_dist FIRMWARE_APP_SET=ext_apps
115116
- [Add a Mifare Classic info screen to parser output #1504 (By Astrrra)](https://github.com/flipperdevices/flipperzero-firmware/pull/1504)
116117
- [BadUSB: add SYSRQ keys #1460 (By rck)](https://github.com/flipperdevices/flipperzero-firmware/pull/1460)
117118
- [I²C-Scanner #1431 (By GitChris3004)](https://github.com/flipperdevices/flipperzero-firmware/pull/1431)
118-
- [nfc: make dict attack more interactive #1462 (By indutny)](https://github.com/flipperdevices/flipperzero-firmware/pull/1462)
119119
- [nfc: collect nonces during mf classic emulation #1484 (By indutny)](https://github.com/flipperdevices/flipperzero-firmware/pull/1484)
120-
- [FIX: Fixed inconsistencies between texts #1496 (By zigad)](https://github.com/flipperdevices/flipperzero-firmware/pull/1496)
121120

122121
</details>
123122

@@ -171,5 +170,6 @@ $ ./fbt plugin_dist FIRMWARE_APP_SET=ext_apps
171170
## Conflicting PRs Not Merged:
172171
- [Fixed building for users with space in windows username #1437 (By SzymonLisowiec)](https://github.com/flipperdevices/flipperzero-firmware/pull/1437)
173172
- [App RPC Bug Fixes and redesign #1491 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/1491)
173+
- [Make printf great again #1438 (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/pull/1438)
174174

175175
</td></tr></table>

‎SConstruct

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,13 @@ distenv.PhonyTarget("cli", "${PYTHON3} scripts/serial_cli.py")
287287

288288

289289
# Find blackmagic probe
290-
291290
distenv.PhonyTarget(
292291
"get_blackmagic",
293292
"@echo $( ${BLACKMAGIC_ADDR} $)",
294293
)
294+
295+
# Prepare vscode environment
296+
vscode_dist = distenv.Install("#.vscode", distenv.Glob("#.vscode/example/*"))
297+
distenv.Precious(vscode_dist)
298+
distenv.NoClean(vscode_dist)
299+
distenv.Alias("vscode_dist", vscode_dist)

‎applications/desktop/views/desktop_view_lock_menu.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,14 @@ void desktop_lock_menu_render(Canvas* canvas, void* model) {
9393
const char* str = Lockmenu_Items[i];
9494

9595
if(i == 1 && !m->pin_set) str = "Set PIN";
96+
9697
if(m->hint_timeout && m->idx == 2 && m->idx == i) {
9798
str = "Not Implemented";
9899
} else if(m->hint_timeout && m->idx == 3 && m->idx == i) {
99100
str = "UUDDLCLC For Main";
100101
}
101102
if(str != NULL) {
103+
102104
canvas_draw_str_aligned(
103105
canvas, 64, 9 + (i * 13) + STATUS_BAR_Y_SHIFT, AlignCenter, AlignCenter, str);
104106
}

0 commit comments

Comments
 (0)