Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 52ed7be

Browse files
V51 Release (#374)
2 parents 8c91fd8 + 25434b8 commit 52ed7be

1,131 files changed

Lines changed: 33391 additions & 12060 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: bash .github/workflow_data/package.sh
5555

5656
- name: Send devbuild webhook
57-
if: "github.event_name == 'push' && github.ref_name == 'dev'"
57+
if: "github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
5858
env:
5959
NC_HOST: "https://cloud.cynthialabs.net/"
6060
NC_USER: "${{ secrets.NC_USER }}"

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
[submodule "assets/protobuf"]
1111
path = assets/protobuf
1212
url = https://github.com/flipperdevices/flipperzero-protobuf.git
13+
shallow = false
1314
[submodule "lib/libusb_stm32"]
1415
path = lib/libusb_stm32
1516
url = https://github.com/flipperdevices/libusb_stm32.git
@@ -40,3 +41,6 @@
4041
[submodule "lib/stm32wb_copro"]
4142
path = lib/stm32wb_copro
4243
url = https://github.com/flipperdevices/stm32wb_copro.git
44+
[submodule "applications/external/totp/lib/wolfssl"]
45+
path = applications/external/totp/lib/wolfssl
46+
url = https://github.com/wolfSSL/wolfssl.git

.vscode/.gitignore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
./c_cpp_properties.json
2-
./launch.json
3-
./settings.json
4-
./tasks.json
1+
/c_cpp_properties.json
2+
/extensions.json
3+
/launch.json
4+
/settings.json
5+
/tasks.json
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
"llvm-vs-code-extensions.vscode-clangd",
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+
"twxs.cmake",
16+
"ms-vscode.cpptools",
17+
"ms-vscode.cmake-tools"
18+
]
19+
}
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
],
1414
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
1515
"unwantedRecommendations": [
16+
"llvm-vs-code-extensions.vscode-clangd",
1617
"twxs.cmake",
1718
"ms-vscode.cmake-tools"
1819
]

.vscode/example/settings.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,10 @@
2121
"SConscript": "python",
2222
"SConstruct": "python",
2323
"*.fam": "python",
24-
}
25-
}
24+
},
25+
"clangd.arguments": [
26+
// We might be able to tighten this a bit more to only include the correct toolchain.
27+
"--query-driver=**",
28+
"--compile-commands-dir=${workspaceFolder}/build/latest"
29+
]
30+
}

.vscode/example/tasks.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,17 @@
2828
"command": "./fbt -c"
2929
},
3030
{
31-
"label": "[Release] Flash (ST-Link)",
31+
"label": "[Release] Flash (SWD)",
3232
"group": "build",
3333
"type": "shell",
3434
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash"
3535
},
3636
{
37-
"label": "[Debug] Flash (ST-Link)",
37+
"label": "[Debug] Flash (SWD)",
3838
"group": "build",
3939
"type": "shell",
4040
"command": "./fbt FORCE=1 flash"
4141
},
42-
{
43-
"label": "[Release] Flash (blackmagic)",
44-
"group": "build",
45-
"type": "shell",
46-
"command": "./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_blackmagic"
47-
},
48-
{
49-
"label": "[Debug] Flash (blackmagic)",
50-
"group": "build",
51-
"type": "shell",
52-
"command": "./fbt FORCE=1 flash_blackmagic"
53-
},
5442
{
5543
"label": "[Release] Flash (JLink)",
5644
"group": "build",

SConstruct

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ distenv = coreenv.Clone(
4545
],
4646
ENV=os.environ,
4747
UPDATE_BUNDLE_DIR="dist/${DIST_DIR}/f${TARGET_HW}-update-${DIST_SUFFIX}",
48+
VSCODE_LANG_SERVER=ARGUMENTS.get("LANG_SERVER", "cpptools"),
4849
)
4950

5051
firmware_env = distenv.AddFwProject(
@@ -184,27 +185,15 @@ copro_dist = distenv.CoproBuilder(
184185
distenv.AlwaysBuild(copro_dist)
185186
distenv.Alias("copro_dist", copro_dist)
186187

187-
firmware_flash = distenv.AddOpenOCDFlashTarget(firmware_env)
188+
189+
firmware_flash = distenv.AddFwFlashTarget(firmware_env)
188190
distenv.Alias("flash", firmware_flash)
189191

192+
# To be implemented in fwflash.py
190193
firmware_jflash = distenv.AddJFlashTarget(firmware_env)
191194
distenv.Alias("jflash", firmware_jflash)
192195

193-
firmware_bm_flash = distenv.PhonyTarget(
194-
"flash_blackmagic",
195-
"$GDB $GDBOPTS $SOURCES $GDBFLASH",
196-
source=firmware_env["FW_ELF"],
197-
GDBOPTS="${GDBOPTS_BASE} ${GDBOPTS_BLACKMAGIC}",
198-
GDBREMOTE="${BLACKMAGIC_ADDR}",
199-
GDBFLASH=[
200-
"-ex",
201-
"load",
202-
"-ex",
203-
"quit",
204-
],
205-
)
206-
207-
gdb_backtrace_all_threads = distenv.PhonyTarget(
196+
distenv.PhonyTarget(
208197
"gdb_trace_all",
209198
"$GDB $GDBOPTS $SOURCES $GDBFLASH",
210199
source=firmware_env["FW_ELF"],
@@ -327,6 +316,9 @@ distenv.PhonyTarget(
327316
"cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py -p ${FLIP_PORT}"
328317
)
329318

319+
# Update WiFi devboard firmware
320+
distenv.PhonyTarget("devboard_flash", "${PYTHON3} ${FBT_SCRIPT_DIR}/wifi_board.py")
321+
330322

331323
# Find blackmagic probe
332324
distenv.PhonyTarget(
@@ -345,7 +337,14 @@ distenv.PhonyTarget(
345337
)
346338

347339
# Prepare vscode environment
348-
vscode_dist = distenv.Install("#.vscode", distenv.Glob("#.vscode/example/*"))
340+
VSCODE_LANG_SERVER = cmd_environment["LANG_SERVER"]
341+
vscode_dist = distenv.Install(
342+
"#.vscode",
343+
[
344+
distenv.Glob("#.vscode/example/*.json"),
345+
distenv.Glob(f"#.vscode/example/{VSCODE_LANG_SERVER}/*.json"),
346+
],
347+
)
349348
distenv.Precious(vscode_dist)
350349
distenv.NoClean(vscode_dist)
351350
distenv.Alias("vscode_dist", vscode_dist)

applications/debug/accessor/helpers/wiegand.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ bool WIEGAND::DoWiegandConversion() {
174174
return false;
175175
}
176176

177-
// TODO: Handle validation failure case!
177+
// TODO FL-3490: Handle validation failure case!
178178
} else if(4 == _bitCount) {
179179
// 4-bit Wiegand codes have no data integrity check so we just
180180
// read the LOW nibble.

0 commit comments

Comments
 (0)