liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2733] multitarget support for fbt (#2209)

Browse Source 
* First part of multitarget porting
* Delete firmware/targets/f7/Inc directory
* Delete firmware/targets/f7/Src directory
* gpio: cli fixes; about: using version from HAL
* sdk: path fixes
* gui: include fixes
* applications: more include fixes
* gpio: ported to new apis
* hal: introduced furi_hal_target_hw.h; libs: added one_wire
* hal: f18 target
* github: also build f18 by default
* typo fix
* fbt: removed extra checks on app list
* api: explicitly bundling select mlib headers with sdk
* hal: f18: changed INPUT_DEBOUNCE_TICKS to match f7
* cleaned up commented out code
* docs: added info on hw targets
* docs: targets: formatting fixes
* f18: fixed link error
* f18: fixed API version to match f7
* docs: hardware: minor wording fixes
* faploader: added fw target check
* docs: typo fixes
* github: not building komi target by default
* fbt: support for `targets` field for built-in apps
* github: reworked build flow to exclude app_set; fbt: removed komi-specific appset; added additional target buildset check
* github: fixed build; nfc: fixed pvs warnings
* attempt to fix target id
* f7, f18: removed certain HAL function from public API
* apps: debug: enabled bt_debug_app for f18
* Targets: backport input pins configuration routine from F7 to F18

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
hedger
2023-02-07 19:33:05 +03:00
committed by GitHub
parent 1eda913367
commit 224d0aefe4
152 changed files with 4140 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/settings/about/about.c
View File

@@ -13,17 +13,29 @@ typedef DialogMessageButton (*AboutDialogScreen)(DialogsApp* dialogs, DialogMess
static DialogMessageButton product_screen(DialogsApp* dialogs, DialogMessage* message) {
DialogMessageButton result;
const char* screen_header = "Product: Flipper Zero\n"
"Model: FZ.1\n";
const char* screen_text = "FCC ID: 2A2V6-FZ\n"
"IC: 27624-FZ";
FuriString* screen_header = furi_string_alloc_printf(
"Product: %s\n"
"Model: %s",
furi_hal_version_get_model_name(),
furi_hal_version_get_model_code());
dialog_message_set_header(message, screen_header, 0, 0, AlignLeft, AlignTop);
dialog_message_set_text(message, screen_text, 0, 26, AlignLeft, AlignTop);
FuriString* screen_text = furi_string_alloc_printf(
"FCC ID: %s\n"
"IC: %s",
furi_hal_version_get_fcc_id(),
furi_hal_version_get_ic_id());
dialog_message_set_header(
message, furi_string_get_cstr(screen_header), 0, 0, AlignLeft, AlignTop);
dialog_message_set_text(
message, furi_string_get_cstr(screen_text), 0, 26, AlignLeft, AlignTop);
result = dialog_message_show(dialogs, message);
dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
furi_string_free(screen_header);
furi_string_free(screen_text);
return result;
}

2
applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_confirm.c
View File

@@ -1,5 +1,5 @@
#include "../bt_settings_app.h"
#include "furi_hal_bt.h"
#include <furi_hal_bt.h>
void bt_settings_scene_forget_dev_confirm_dialog_callback(DialogExResult result, void* context) {
furi_assert(context);

2
applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c
View File

@@ -1,5 +1,5 @@
#include "../bt_settings_app.h"
#include "furi_hal_bt.h"
#include <furi_hal_bt.h>
void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) {
BtSettingsApp* app = context;

2
applications/settings/bt_settings_app/scenes/bt_settings_scene_start.c
View File

@@ -1,5 +1,5 @@
#include "../bt_settings_app.h"
#include "furi_hal_bt.h"
#include <furi_hal_bt.h>
enum BtSetting {
BtSettingOff,