Update to flipper SDK version 1.3.2

polarikus · polarikus · commit a9c7f8a7c574 · 2025-04-14T14:45:20.000+03:00
diff --git a/.clang-format b/.clang-format
@@ -3,22 +3,55 @@ Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
 AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
+AlignConsecutiveAssignments:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   true
+  AlignFunctionPointers: false
+  PadOperators:    true
+AlignConsecutiveShortCaseStatements:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCaseColons: false
 AlignEscapedNewlines: Left
 AlignOperands:   Align
-AlignTrailingComments: false
+AlignTrailingComments:
+  Kind:            Never
+  OverEmptyLines:  0
 AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortEnumsOnASingleLine: true
+AllowBreakBeforeNoexceptSpecifier: Never
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortCompoundRequirementOnASingleLine: true
+AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
-AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLoopsOnASingleLine: true
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
@@ -27,17 +60,18 @@ AttributeMacros:
   - __capability
 BinPackArguments: false
 BinPackParameters: false
+BitFieldColonSpacing: Both
 BraceWrapping:
   AfterCaseLabel:  false
   AfterClass:      false
   AfterControlStatement: Never
   AfterEnum:       false
+  AfterExternBlock: false
   AfterFunction:   false
   AfterNamespace:  false
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
-  AfterExternBlock: false
   BeforeCatch:     false
   BeforeElse:      false
   BeforeLambdaBody: false
@@ -46,38 +80,35 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
+BreakAdjacentStringLiterals: true
+BreakAfterAttributes: Leave
+BreakAfterJavaFieldAnnotations: false
+BreakArrays:     true
 BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
+BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
+BreakBeforeInlineASMColon: OnlyMultiline
 BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma
-BreakAfterJavaFieldAnnotations: false
+BreakInheritanceList: BeforeColon
 BreakStringLiterals: false
 ColumnLimit:     99
 CommentPragmas:  '^ IWYU pragma:'
-QualifierAlignment: Leave
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
-PackConstructorInitializers: BinPack
-BasedOnStyle:    ''
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-AllowAllConstructorInitializersOnNextLine: true
 FixNamespaceComments: false
 ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+  - M_EACH
 IfMacros:
   - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
@@ -97,19 +128,30 @@ IncludeCategories:
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: false
-IndentCaseLabels: false
 IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
 IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
+IndentRequiresClause: false
 IndentWidth:     4
 IndentWrappedFunctionNames: true
+InsertBraces:    false
+InsertNewlineAtEOF: true
 InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
+KeepEmptyLinesAtEOF: false
 LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
@@ -119,34 +161,44 @@ ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 10
 PenaltyBreakBeforeFirstCallParameter: 30
 PenaltyBreakComment: 10
 PenaltyBreakFirstLessLess: 0
 PenaltyBreakOpenParenthesis: 0
+PenaltyBreakScopeResolution: 500
 PenaltyBreakString: 10
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 PPIndentWidth:   -1
+QualifierAlignment: Leave
 ReferenceAlignment: Pointer
 ReflowComments:  false
 RemoveBracesLLVM: false
+RemoveParentheses: Leave
+RemoveSemicolon: true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 1
+SkipMacroDefinitionBody: false
 SortIncludes:    Never
 SortJavaStaticImport: Before
-SortUsingDeclarations: false
+SortUsingDeclarations: Never
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
 SpaceBeforeParens: Never
 SpaceBeforeParensOptions:
   AfterControlStatements: false
@@ -155,32 +207,35 @@ SpaceBeforeParensOptions:
   AfterFunctionDeclarationName: false
   AfterIfMacros:   false
   AfterOverloadedOperator: false
+  AfterPlacementOperator: true
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
   BeforeNonEmptyParentheses: false
-SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  Never
-SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
 SpacesInLineCommentPrefix:
   Minimum:         1
   Maximum:         -1
-SpacesInParentheses: false
+SpacesInParens:  Never
+SpacesInParensOptions:
+  InCStyleCasts:   false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other:           false
 SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        c++03
+Standard:        c++20
 StatementAttributeLikeMacros:
   - Q_EMIT
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth:        4
-UseCRLF:         false
 UseTab:          Never
+VerilogBreakBetweenInstancePorts: true
 WhitespaceSensitiveMacros:
   - STRINGIZE
   - PP_STRINGIZE
diff --git a/fn_test_app.c b/fn_test_app.c
@@ -5,7 +5,7 @@
 #endif
 #include <furi.h>
 
-#define TAG "FNTest"
+#define TAG        "FNTest"
 #define WORKER_TAG TAG "App"
 
 static bool fn_test_app_custom_event_callback(void* context, uint32_t event) {
@@ -43,7 +43,6 @@ FNApp* fn_test_app_alloc(void) {
     app->fn_info->serial_number[0] = 'N';
 
     app->view_dispatcher = view_dispatcher_alloc();
-    view_dispatcher_enable_queue(app->view_dispatcher);
 
     app->scene_manager = scene_manager_alloc(&fn_test_scene_handlers, app);
 
diff --git a/lib/fn/uart/fn_uart.c b/lib/fn/uart/fn_uart.c
@@ -50,15 +50,15 @@ static void timer_timeout(void* ctx) {
 }
 
 static void console_disable() {
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_session_close(cli);
-    furi_record_close(RECORD_CLI);
+    CliVcp* cli = furi_record_open(RECORD_CLI_VCP);
+    cli_vcp_disable(cli);
+    furi_record_close(RECORD_CLI_VCP);
 }
 
 static void console_enable() {
-    Cli* cli = furi_record_open(RECORD_CLI);
-    cli_session_open(cli, &cli_vcp);
-    furi_record_close(RECORD_CLI);
+    CliVcp* cli = furi_record_open(RECORD_CLI_VCP);
+    cli_vcp_enable(cli);
+    furi_record_close(RECORD_CLI_VCP);
 }
 
 static void fn_init_uart(uint32_t baudrate, UARTApp* app) {
diff --git a/scenes/fn_test_scene_about.c b/scenes/fn_test_scene_about.c
@@ -1,10 +1,10 @@
 #include "../fn_test_app_i.h"
 
 #define FN_TEST_VERSION_APP "0.1-betta"
-#define FN_TEST_DEVELOPER "Polarikus"
-#define FN_TEST_GITHUB "https://github.com/polarikus/flipper-zero-fn_test"
-#define FN_TEST_NAME "\e#\e!       FN Tester        \e!\n"
-#define FN_TEST_BLANK_INV "\e#\e!                                                      \e!\n"
+#define FN_TEST_DEVELOPER   "Polarikus"
+#define FN_TEST_GITHUB      "https://github.com/polarikus/flipper-zero-fn_test"
+#define FN_TEST_NAME        "\e#\e!       FN Tester        \e!\n"
+#define FN_TEST_BLANK_INV   "\e#\e!                                                      \e!\n"
 
 void fn_test_scene_about_on_enter(void* context) {
     FNApp* app = context;
diff --git a/scenes/fn_test_scene_fn_info.c b/scenes/fn_test_scene_fn_info.c
@@ -5,7 +5,7 @@
 #include "fn_helpers.h"
 #include "data_types/fn_data_types.h"
 
-#define FN_TEST_NAME "\e#\e!       FN Info        \e!\n"
+#define FN_TEST_NAME      "\e#\e!       FN Info        \e!\n"
 #define FN_TEST_BLANK_INV "\e#\e!                                                      \e!\n"
 
 void fn_test_scene_fn_info_on_enter(void* context) {
diff --git a/scenes/fn_test_scene_life_info.c b/scenes/fn_test_scene_life_info.c
@@ -6,7 +6,7 @@
 #include "fn_objects/life_info/fn_life_info.h"
 #include "../views/fn_test_view_progress.h"
 
-#define FN_TEST_NAME "\e#\e!       Life Info        \e!\n"
+#define FN_TEST_NAME      "\e#\e!       Life Info        \e!\n"
 #define FN_TEST_BLANK_INV "\e#\e!                                                      \e!\n"
 
 static void
diff --git a/scenes/fn_test_scene_test.c b/scenes/fn_test_scene_test.c
@@ -28,4 +28,4 @@ bool fn_test_scene_test_on_event(void* context, SceneManagerEvent event) {
 void fn_test_scene_test_on_exit(void* context) {
     FNApp* app = context;
     widget_reset(app->widget);
-}
+}
diff --git a/scenes/fn_test_scene_timeout.c b/scenes/fn_test_scene_timeout.c
@@ -39,4 +39,4 @@ bool fn_test_scene_timeout_on_event(void* context, SceneManagerEvent event) {
 void fn_test_scene_timeout_on_exit(void* context) {
     FNApp* app = context;
     widget_reset(app->widget);
-}
+}
diff --git a/unit_tests/lib_tests/fn/uart/fn_uart_test.c b/unit_tests/lib_tests/fn/uart/fn_uart_test.c
@@ -56,7 +56,8 @@ MU_TEST(fn_uart_start_and_stop_thread_test) {
     mu_assert(
         furi_thread_get_state(fn_uart->thread) == FuriThreadStateRunning, "FN UART not started!");
 #ifndef FURI_DEBUG
-    mu_assert(fn_uart->serial_id == FuriHalSerialIdUsart, "FN UART ID is not FuriHalUartIdUSART1!!!");
+    mu_assert(
+        fn_uart->serial_id == FuriHalSerialIdUsart, "FN UART ID is not FuriHalUartIdUSART1!!!");
 #else
     mu_assert(
         fn_uart->serial_id == FuriHalSerialIdLpuart, "FN UART ID is not FuriHalUartIdLPUART1!!!");
diff --git a/unit_tests/minunit.h b/unit_tests/minunit.h
@@ -71,7 +71,7 @@ extern "C" {
 /*  Maximum length of last message */
 #define MINUNIT_MESSAGE_LEN 1024
 /*  Accuracy with which floats are compared */
-#define MINUNIT_EPSILON 1E-12
+#define MINUNIT_EPSILON     1E-12
 
 #include "minunit_vars_ex.h"
 
@@ -83,9 +83,9 @@ void minunit_print_progress(void);
 void minunit_print_fail(const char* error);
 
 /*  Definitions */
-#define MU_TEST(method_name) static void method_name(void)
+#define MU_TEST(method_name)          static void method_name(void)
 #define MU_TEST_1(method_name, arg_1) static void method_name(arg_1)
-#define MU_TEST_SUITE(suite_name) static void suite_name(void)
+#define MU_TEST_SUITE(suite_name)     static void suite_name(void)
 
 #define MU__SAFE_BLOCK(block) \
     do {                      \
diff --git a/unit_tests/test_index.c b/unit_tests/test_index.c
@@ -47,7 +47,7 @@ void minunit_print_progress() {
 void minunit_print_fail(const char* str) {
     printf(_FURI_LOG_CLR_E "%s\r\n" _FURI_LOG_CLR_RESET, str);
 }
-
+/*
 static void fn_test_cli(Cli* cli, FuriString* args, void* context) {
     UNUSED(context);
     minunit_run = 0;
@@ -99,6 +99,7 @@ static void fn_test_cli(Cli* cli, FuriString* args, void* context) {
         }
     }
 }
+ */
 
 void fn_register_tests() {
 #ifdef FURI_DEBUG
@@ -117,6 +118,6 @@ void fn_unregister_tests() {
     furi_record_close(RECORD_CLI);
 #else
     UNUSED(fn_unregister_tests);
-    UNUSED(fn_test_cli);
+    //UNUSED(fn_test_cli);
 #endif
 }
diff --git a/views/fn_test_view_progress.c b/views/fn_test_view_progress.c

Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ static void timer_timeout(void* ctx) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`static void console_disable() {`
`53`		`- Cli* cli = furi_record_open(RECORD_CLI);`
`54`		`- cli_session_close(cli);`
`55`		`- furi_record_close(RECORD_CLI);`
	`53`	`+ CliVcp* cli = furi_record_open(RECORD_CLI_VCP);`
	`54`	`+ cli_vcp_disable(cli);`
	`55`	`+ furi_record_close(RECORD_CLI_VCP);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static void console_enable() {`
`59`		`- Cli* cli = furi_record_open(RECORD_CLI);`
`60`		`- cli_session_open(cli, &cli_vcp);`
`61`		`- furi_record_close(RECORD_CLI);`
	`59`	`+ CliVcp* cli = furi_record_open(RECORD_CLI_VCP);`
	`60`	`+ cli_vcp_enable(cli);`
	`61`	`+ furi_record_close(RECORD_CLI_VCP);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static void fn_init_uart(uint32_t baudrate, UARTApp* app) {`