diff --git a/Brewfile b/Brewfile deleted file mode 100644 index be9674970..000000000 --- a/Brewfile +++ /dev/null @@ -1,7 +0,0 @@ -cask "brew-cask/gcc-arm-embedded.rb" -brew "protobuf" -brew "gdb" -brew "open-ocd" -brew "clang-format" -brew "dfu-util" -brew "protobuf-c" diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.h b/applications/drivers/subghz/cc1101_ext/cc1101_ext.h index d504a1979..3fbe23124 100644 --- a/applications/drivers/subghz/cc1101_ext/cc1101_ext.h +++ b/applications/drivers/subghz/cc1101_ext/cc1101_ext.h @@ -11,7 +11,6 @@ #include #include #include -#include #ifdef __cplusplus extern "C" { diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index 9128ffb37..16683ba74 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -1,7 +1,6 @@ #include #include "../desktop_i.h" -#include #define DesktopFaultEventExit 0x00FF00FF diff --git a/applications/services/gui/view_dispatcher.c b/applications/services/gui/view_dispatcher.c index 8c58fcf5c..b7acfc667 100644 --- a/applications/services/gui/view_dispatcher.c +++ b/applications/services/gui/view_dispatcher.c @@ -67,7 +67,7 @@ void view_dispatcher_enable_queue(ViewDispatcher* view_dispatcher) { view_dispatcher_run_input_callback, view_dispatcher); - view_dispatcher->ascii_queue = furi_message_queue_alloc(8, sizeof(AsciiEvent)); + view_dispatcher->ascii_queue = furi_message_queue_alloc(16, sizeof(AsciiEvent)); furi_event_loop_message_queue_subscribe( view_dispatcher->event_loop, view_dispatcher->ascii_queue, diff --git a/brew-cask/gcc-arm-embedded.rb b/brew-cask/gcc-arm-embedded.rb deleted file mode 100644 index 1f9228991..000000000 --- a/brew-cask/gcc-arm-embedded.rb +++ /dev/null @@ -1,56 +0,0 @@ -cask "gcc-arm-embedded" do - # Exists as a cask because it is impractical as a formula: - # https://github.com/Homebrew/homebrew-core/pull/45780#issuecomment-569246452 - version "10.3-2021.07,10.14.6" - sha256 "cae8b168ad16556ca204c0b441f9fb2c05be85362fe10e3b210be6b7177ef2d7" - - url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/#{version.before_comma}/gcc-arm-none-eabi-#{version.before_comma}-mac-#{version.after_comma}-sha1.pkg" - name "GCC ARM Embedded" - desc "Pre-built GNU bare-metal toolchain for 32-bit Arm processors" - homepage "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm" - - livecheck do - url "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" - strategy :page_match do |page| - match = page.match(/href=.*?gcc-arm-none-eabi-(\d+\.\d+-\d+\.\d+)-mac-(\d+\.\d+\.\d+)-sha1.pkg/i) - "#{match[1]},#{match[2]}" - end - end - - pkg "gcc-arm-none-eabi-#{version.before_comma}-mac-#{version.after_comma}-sha1.pkg" - binary "#{appdir}/ARM/bin/arm-none-eabi-addr2line" - binary "#{appdir}/ARM/bin/arm-none-eabi-ar" - binary "#{appdir}/ARM/bin/arm-none-eabi-as" - binary "#{appdir}/ARM/bin/arm-none-eabi-c++" - binary "#{appdir}/ARM/bin/arm-none-eabi-c++filt" - binary "#{appdir}/ARM/bin/arm-none-eabi-cpp" - binary "#{appdir}/ARM/bin/arm-none-eabi-elfedit" - binary "#{appdir}/ARM/bin/arm-none-eabi-g++" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcc" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcc-10.3.1" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcc-ar" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcc-nm" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcc-ranlib" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcov" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcov-dump" - binary "#{appdir}/ARM/bin/arm-none-eabi-gcov-tool" - binary "#{appdir}/ARM/bin/arm-none-eabi-gdb" - binary "#{appdir}/ARM/bin/arm-none-eabi-gdb-add-index" - binary "#{appdir}/ARM/bin/arm-none-eabi-gdb-add-index-py" - binary "#{appdir}/ARM/bin/arm-none-eabi-gdb-py" - binary "#{appdir}/ARM/bin/arm-none-eabi-gprof" - binary "#{appdir}/ARM/bin/arm-none-eabi-ld" - binary "#{appdir}/ARM/bin/arm-none-eabi-ld.bfd" - binary "#{appdir}/ARM/bin/arm-none-eabi-lto-dump" - binary "#{appdir}/ARM/bin/arm-none-eabi-nm" - binary "#{appdir}/ARM/bin/arm-none-eabi-objcopy" - binary "#{appdir}/ARM/bin/arm-none-eabi-objdump" - binary "#{appdir}/ARM/bin/arm-none-eabi-ranlib" - binary "#{appdir}/ARM/bin/arm-none-eabi-readelf" - binary "#{appdir}/ARM/bin/arm-none-eabi-size" - binary "#{appdir}/ARM/bin/arm-none-eabi-strings" - binary "#{appdir}/ARM/bin/arm-none-eabi-strip" - - uninstall pkgutil: "gcc.arm-none-eabi-#{version[/^(\d{2})/]}", - delete: "/Applications/ARM" -end diff --git a/fbt b/fbt index f884e87d4..efb031eb2 100755 --- a/fbt +++ b/fbt @@ -33,7 +33,7 @@ if [ -z "$FBT_NO_SYNC" ]; then _FBT_CLONE_FLAGS="$_FBT_CLONE_FLAGS --depth 1"; fi - git submodule update --init --recursive --recursive $_FBT_CLONE_FLAGS; + git submodule update --init --recursive $_FBT_CLONE_FLAGS; fi $SCONS_EP $SCONS_DEFAULT_FLAGS "$@" diff --git a/fbt.cmd b/fbt.cmd index f83cdf14e..d8e42f80c 100644 --- a/fbt.cmd +++ b/fbt.cmd @@ -9,7 +9,7 @@ if [%FBT_NO_SYNC%] == [] ( set _FBT_CLONE_FLAGS=%_FBT_CLONE_FLAGS% --depth 1 ) if exist ".git" ( - git submodule update --init --recursive --recursive %_FBT_CLONE_FLAGS% + git submodule update --init --recursive %_FBT_CLONE_FLAGS% if %ERRORLEVEL% neq 0 ( echo Failed to update submodules, set FBT_NO_SYNC to skip exit /b 1 diff --git a/fbt_options.py b/fbt_options.py index a31b56ace..eceb35b22 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -1,6 +1,5 @@ from pathlib import Path import posixpath -import re import os # For more details on these options, run 'fbt -h' diff --git a/lib/fatfs/ff.c b/lib/fatfs/ff.c index fa9da1b6d..7318df31c 100644 --- a/lib/fatfs/ff.c +++ b/lib/fatfs/ff.c @@ -5371,7 +5371,7 @@ FRESULT f_mkfs ( /* Pre-determine the FAT type */ do { if (_FS_EXFAT && (opt & FM_EXFAT)) { /* exFAT possible? */ - if ((opt & FM_ANY) == FM_EXFAT || sz_vol >= 0x2000000 || au > 128) { /* exFAT only, vol >= 32Ms or au > 128s ? */ + if ((opt & FM_ANY) == FM_EXFAT || sz_vol >= 0x4000000 || au > 128) { /* exFAT only, vol >= 64Ms or au > 128s ? */ fmt = FS_EXFAT; break; } } diff --git a/lib/lfrfid/tools/t5577.c b/lib/lfrfid/tools/t5577.c index 483762ff6..9d0d28fc5 100644 --- a/lib/lfrfid/tools/t5577.c +++ b/lib/lfrfid/tools/t5577.c @@ -1,7 +1,6 @@ #include "t5577.h" #include #include -#include #define T5577_TIMING_WAIT_TIME 400 #define T5577_TIMING_START_GAP 30 diff --git a/lib/lfs_config.h b/lib/lfs_config.h index 40e79a81a..ff8bc4b23 100644 --- a/lib/lfs_config.h +++ b/lib/lfs_config.h @@ -2,12 +2,12 @@ #include -// #ifdef FURI_NDEBUG -// #define LFS_NO_ASSERT -// #define LFS_ASSERT(x) -// #else +#ifdef FURI_NDEBUG +#define LFS_NO_ASSERT +#define LFS_ASSERT(x) +#else #define LFS_ASSERT furi_assert -// #endif +#endif #define LFS_TAG "Lfs" diff --git a/lib/u8g2/u8g2.h b/lib/u8g2/u8g2.h index 7a3d10c5e..7564e3b96 100644 --- a/lib/u8g2/u8g2.h +++ b/lib/u8g2/u8g2.h @@ -5813,7 +5813,6 @@ extern const uint8_t u8g2_font_px437wyse700b_tn[] U8G2_FONT_SECTION("u8g2_font_p extern const uint8_t u8g2_font_px437wyse700b_mf[] U8G2_FONT_SECTION("u8g2_font_px437wyse700b_mf"); extern const uint8_t u8g2_font_px437wyse700b_mr[] U8G2_FONT_SECTION("u8g2_font_px437wyse700b_mr"); extern const uint8_t u8g2_font_px437wyse700b_mn[] U8G2_FONT_SECTION("u8g2_font_px437wyse700b_mn"); -extern const uint8_t u8g2_font_eurocorp_tr[] U8G2_FONT_SECTION("u8g2_font_eurocorp_tr"); /* end font list */ diff --git a/sonar-build b/sonar-build deleted file mode 100755 index 3cf736dcd..000000000 --- a/sonar-build +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -pushd . -$1 -popd diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index a937a997a..000000000 --- a/sonar-project.properties +++ /dev/null @@ -1,28 +0,0 @@ -sonar.projectKey=Next-Flip_Momentum-Firmware -sonar.organization=Next-Flip - -# This is the name and version displayed in the SonarCloud UI. -#sonar.projectName=Momentum-Firmware -#sonar.projectVersion=1.0 - -# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. -#sonar.sources=. - -# Encoding of the source code. Default is default system encoding -#sonar.sourceEncoding=UTF-8 - - -# Ignore some rules -sonar.issue.ignore.multicriteria=c1,c2,c3 - -# Make sure use of "strcpy" is safe here -sonar.issue.ignore.multicriteria.c1.ruleKey=c:S5801 -sonar.issue.ignore.multicriteria.c1.resourceKey=**/*.c - -# Make sure use of "strlen" is safe here -sonar.issue.ignore.multicriteria.c2.ruleKey=c:S5813 -sonar.issue.ignore.multicriteria.c2.resourceKey=**/*.c - -# Make sure that using this pseudorandom number generator "rand" is safe here -sonar.issue.ignore.multicriteria.c3.ruleKey=c:S2245 -sonar.issue.ignore.multicriteria.c3.resourceKey=**/*.c diff --git a/targets/f7/ble_glue/services/dev_info_service.c b/targets/f7/ble_glue/services/dev_info_service.c index 0db1f65ee..ae2b976b6 100644 --- a/targets/f7/ble_glue/services/dev_info_service.c +++ b/targets/f7/ble_glue/services/dev_info_service.c @@ -107,7 +107,7 @@ BleServiceDevInfo* ble_svc_dev_info_start(void) { sizeof(software_revision), "%s %s %s %s", version_get_githash(NULL), - version_get_version(NULL), + version_get_gitbranch(NULL), version_get_gitbranchnum(NULL), version_get_builddate(NULL)); snprintf(hardware_revision, sizeof(hardware_revision), "%d", version_get_target(NULL)); diff --git a/targets/f7/furi_hal/furi_hal_info.c b/targets/f7/furi_hal/furi_hal_info.c index 0548013e7..4908cca69 100644 --- a/targets/f7/furi_hal/furi_hal_info.c +++ b/targets/f7/furi_hal/furi_hal_info.c @@ -9,12 +9,6 @@ #include #include -#include -#include -#include -#include -#include - FURI_WEAK void furi_hal_info_get_api_version(uint16_t* major, uint16_t* minor) { *major = 0; *minor = 0;