Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ca39d1b
examples: plugins: utilize fal_embedded
hedger Nov 21, 2023
8280fef
libs: removed fnv1a_hash
hedger Nov 21, 2023
ce5399c
furi: added FURI_PACKED; apps, libs: changed to use FURI_PACKED
hedger Nov 21, 2023
83f6d2c
lib: mbedtls: using custom config
hedger Nov 21, 2023
40ce2be
lib: toolbox: removed md5, switched to mbedtls
hedger Nov 21, 2023
17efbc5
targets: f18: link fix
hedger Nov 21, 2023
475cb4c
lib: added mbedtls_cfg.h
hedger Nov 21, 2023
7a42ff9
apps: nfc: explicit dependency on libmbedtls
hedger Nov 21, 2023
0b50039
u2f: reworking to mbedtls
hedger Nov 21, 2023
86c5750
u2f: replaced sha256 & hmac with mbedtls
hedger Nov 21, 2023
49806fb
u2f: functional rework using mbedtls
hedger Nov 23, 2023
5c29a3c
libs: dropped micro-ecc
hedger Nov 23, 2023
36f8bc7
u2f: dropped old implementation
hedger Nov 23, 2023
c863545
toolbox: removed sha256 impl
hedger Nov 23, 2023
8fabfe7
mcheck() for mbedtls
hedger Nov 24, 2023
40e48e7
libs: removed libmisc; split into smaller libs
hedger Nov 24, 2023
8d736e6
apps: debug: fixed display_test
hedger Nov 24, 2023
09bcf7e
apps: include cleanups
hedger Nov 24, 2023
ded73dc
fbt: fixed VERSIONCOMSTR
hedger Nov 24, 2023
b5f3466
furi: added FURI_CHECK_RETURN
hedger Nov 24, 2023
3cfbe45
lib: removed qrcode
hedger Nov 24, 2023
db3ddf8
cleanup
hedger Nov 24, 2023
42d8c46
fbt: lint_py+format_py: fixed excessive command length
hedger Nov 24, 2023
cdc0297
Merge branch 'dev' into hedger/libcleanup
hedger Nov 26, 2023
87dac59
Merge branch 'dev' into hedger/libcleanup
hedger Nov 30, 2023
9bad67a
api: Removed bzero from f7
hedger Nov 30, 2023
df2ef0d
api: Removed bzero from f18
hedger Nov 30, 2023
a878b90
Bump API Symbols
skotopes Dec 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pvsoptions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/micro-ecc -e lib/microtar -e lib/mlib -e lib/qrcode -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
--ignore-ccache -C gccarm --rules-config .pvsconfig -e lib/cmsis_core -e lib/fatfs -e lib/fnv1a-hash -e lib/FreeRTOS-Kernel -e lib/heatshrink -e lib/libusb_stm32 -e lib/littlefs -e lib/mbedtls -e lib/microtar -e lib/mlib -e lib/stm32wb_cmsis -e lib/stm32wb_copro -e lib/stm32wb_hal -e lib/u8g2 -e lib/nanopb -e */arm-none-eabi/*
11 changes: 9 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,17 @@ distenv.PhonyTarget(
LINT_SOURCES=[n.srcnode() for n in firmware_env["LINT_SOURCES"]],
)

# PY_LINT_SOURCES contains recursively-built modules' SConscript files + application manifests
# PY_LINT_SOURCES contains recursively-built modules' SConscript files
# Here we add additional Python files residing in repo root
firmware_env.Append(
PY_LINT_SOURCES=[
# Py code folders
"site_scons",
"scripts",
"applications",
"applications_user",
"assets",
"targets",
# Extra files
"SConstruct",
"firmware.scons",
Expand All @@ -304,7 +308,10 @@ firmware_env.Append(


black_commandline = "@${PYTHON3} -m black ${PY_BLACK_ARGS} ${PY_LINT_SOURCES}"
black_base_args = ["--include", '"\\.scons|\\.py|SConscript|SConstruct"']
black_base_args = [
"--include",
'"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
]

distenv.PhonyTarget(
"lint_py",
Expand Down
4 changes: 2 additions & 2 deletions applications/debug/ccid_test/iso7816_t0_apdu.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ struct ISO7816_Command_APDU {
//body
uint8_t Lc;
uint8_t Le;
} __attribute__((packed));
} FURI_PACKED;

struct ISO7816_Response_APDU {
uint8_t SW1;
uint8_t SW2;
} __attribute__((packed));
} FURI_PACKED;

void iso7816_answer_to_reset(uint8_t* atrBuffer, uint32_t* atrlen);
void iso7816_read_command_apdu(
Expand Down
2 changes: 1 addition & 1 deletion applications/debug/display_test/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ App(
apptype=FlipperAppType.DEBUG,
entry_point="display_test_app",
requires=["gui"],
fap_libs=["misc"],
fap_libs=["u8g2"],
stack_size=1 * 1024,
order=120,
fap_category="Debug",
Expand Down
36 changes: 20 additions & 16 deletions applications/debug/unit_tests/rpc/rpc_test.c
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
#include "flipper.pb.h"
#include <core/check.h>
#include <core/record.h>
#include "pb_decode.h"
#include <rpc/rpc.h>
#include "rpc/rpc_i.h"
#include "storage.pb.h"
#include "storage/filesystem_api_defines.h"
#include "storage/storage.h"
#include <furi.h>
#include "../minunit.h"
#include <stdint.h>
#include <pb.h>
#include <pb_encode.h>
#include <m-list.h>
#include <lib/toolbox/md5_calc.h>
#include <lib/toolbox/path.h>
#include <cli/cli.h>
#include <loader/loader.h>
#include <protobuf_version.h>

#include <FreeRTOS.h>
#include <semphr.h>

#include <rpc/rpc.h>
#include <rpc/rpc_i.h>
#include <cli/cli.h>
#include <storage/storage.h>
#include <loader/loader.h>
#include <storage/filesystem_api_defines.h>

#include <lib/toolbox/md5_calc.h>
#include <lib/toolbox/path.h>

#include <m-list.h>
#include "../minunit.h"

#include <protobuf_version.h>
#include <pb.h>
#include <pb_encode.h>
#include <pb_decode.h>
#include <storage.pb.h>
#include <flipper.pb.h>

LIST_DEF(MsgList, PB_Main, M_POD_OPLIST)
#define M_OPL_MsgList_t() LIST_OPLIST(MsgList)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ App(
entry_point="advanced_plugin1_ep",
requires=["example_advanced_plugins"],
sources=["plugin1.c"],
fal_embedded=True,
)

App(
Expand All @@ -22,4 +23,5 @@ App(
entry_point="advanced_plugin2_ep",
requires=["example_advanced_plugins"],
sources=["plugin2.c"],
fal_embedded=True,
)
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ int32_t example_advanced_plugins_app(void* p) {
PLUGIN_APP_ID, PLUGIN_API_VERSION, composite_api_resolver_get(resolver));

do {
if(plugin_manager_load_all(manager, APP_DATA_PATH("plugins")) != PluginManagerErrorNone) {
// For built-in .fals (fal_embedded==True), use APP_ASSETS_PATH
// Otherwise, use APP_DATA_PATH
if(plugin_manager_load_all(manager, APP_ASSETS_PATH("plugins")) !=
PluginManagerErrorNone) {
FURI_LOG_E(TAG, "Failed to load all libs");
break;
}
Expand Down
2 changes: 1 addition & 1 deletion applications/main/nfc/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ App(
"!plugins",
"!nfc_cli.c",
],
fap_libs=["assets"],
fap_libs=["assets", "mbedtls"],
fap_icon="icon.png",
fap_category="NFC",
)
Expand Down
2 changes: 1 addition & 1 deletion applications/main/u2f/application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ App(
icon="A_U2F_14",
order=80,
resources="resources",
fap_libs=["assets"],
fap_libs=["assets", "mbedtls"],
fap_category="USB",
fap_icon="icon.png",
)
98 changes: 0 additions & 98 deletions applications/main/u2f/hmac_sha256.c

This file was deleted.

38 changes: 0 additions & 38 deletions applications/main/u2f/hmac_sha256.h

This file was deleted.

Loading