Skip to content

Commit e8e9384

Browse files
committed
Merge remote-tracking branch 'origin/release-candidate' into release
2 parents cb2e06e + 9a10372 commit e8e9384

File tree

296 files changed

+7209
-2964
lines changed

Some content is hidden

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

296 files changed

+7209
-2964
lines changed

.clangd

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
CompileFlags:
2+
Add:
3+
- -Wno-unknown-warning-option
4+
- -Wno-format
5+
Remove:
6+
- -mword-relocations
7+
8+
Diagnostics:
9+
ClangTidy:
10+
FastCheckFilter: None
11+
12+
---
13+
14+
If:
15+
PathMatch: .*\.h
16+
Diagnostics:
17+
UnusedIncludes: None

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464
python3 scripts/testing/units.py ${{steps.device.outputs.flipper}}
6565
6666
- name: 'Check GDB output'
67-
if: failure()
67+
if: failure() && steps.flashing.outcome == 'success'
6868
run: |
6969
./fbt gdb_trace_all SWD_TRANSPORT_SERIAL=2A0906016415303030303032 LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ compile_commands.json
1212
# JetBrains IDEs
1313
.idea/
1414

15+
# Sublime Text
16+
.sublime-project.sublime-workspace
17+
1518
# Python VirtEnvironments
1619
.env
1720
.venv

.sublime-project

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"folders":
3+
[
4+
{
5+
"path": ".",
6+
}
7+
],
8+
"settings": {
9+
"LSP": {
10+
"clangd": {
11+
"initializationOptions": {
12+
"clangd.compile-commands-dir": "build/latest",
13+
"clangd.header-insertion": "never",
14+
"clangd.query-driver": "**",
15+
"clangd.clang-tidy": true,
16+
},
17+
"enabled": true,
18+
},
19+
},
20+
},
21+
}

.vscode/example/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"clangd.arguments": [
2020
// We might be able to tighten this a bit more to only include the correct toolchain.
2121
"--query-driver=**",
22-
"--compile-commands-dir=${workspaceFolder}/build/latest"
22+
"--compile-commands-dir=${workspaceFolder}/build/latest",
23+
"--clang-tidy",
24+
"--header-insertion=never"
2325
]
2426
}

applications/debug/accessor/accessor_app.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@ void AccessorApp::run(void) {
3434
AccessorApp::AccessorApp()
3535
: text_store{0} {
3636
notification = static_cast<NotificationApp*>(furi_record_open(RECORD_NOTIFICATION));
37+
expansion = static_cast<Expansion*>(furi_record_open(RECORD_EXPANSION));
3738
onewire_host = onewire_host_alloc(&gpio_ibutton);
39+
expansion_disable(expansion);
3840
furi_hal_power_enable_otg();
3941
}
4042

4143
AccessorApp::~AccessorApp() {
4244
furi_hal_power_disable_otg();
45+
expansion_enable(expansion);
46+
furi_record_close(RECORD_EXPANSION);
4347
furi_record_close(RECORD_NOTIFICATION);
4448
onewire_host_free(onewire_host);
4549
}

applications/debug/accessor/accessor_app.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "helpers/wiegand.h"
77
#include <one_wire/one_wire_host.h>
88
#include <notification/notification_messages.h>
9+
#include <expansion/expansion.h>
910

1011
class AccessorApp {
1112
public:
@@ -51,4 +52,5 @@ class AccessorApp {
5152
OneWireHost* onewire_host;
5253

5354
NotificationApp* notification;
55+
Expansion* expansion;
5456
};

applications/debug/accessor/scene/accessor_scene_start.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "../accessor_app.h"
22
#include "../accessor_view_manager.h"
33
#include "../accessor_event.h"
4-
#include "callback_connector.h"
54
#include "accessor_scene_start.h"
65

76
void AccessorSceneStart::on_enter(AccessorApp* app) {

applications/debug/battery_test_app/views/battery_info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static void draw_battery(Canvas* canvas, BatteryInfoModel* data, int x, int y) {
6868
drain_current > HIGH_DRAIN_CURRENT_THRESHOLD ? "mA!" : "mA");
6969
} else if(drain_current != 0) {
7070
snprintf(header, 20, "...");
71-
} else if(data->charging_voltage < 4.2) {
71+
} else if(data->charging_voltage < 4.2f) {
7272
// Non-default battery charging limit, mention it
7373
snprintf(emote, sizeof(emote), "Charged!");
7474
snprintf(header, sizeof(header), "Limited to");

applications/debug/blink_test/blink_test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <core/common_defines.h>
21
#include <furi.h>
32
#include <furi_hal.h>
43

0 commit comments

Comments
 (0)