Skip to content

Commit 24f353e

Browse files
committed
Mise à jours, correction encodage de caractères, mise en page,...
1 parent 16f4501 commit 24f353e

File tree

117 files changed

+925
-801
lines changed

Some content is hidden

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

117 files changed

+925
-801
lines changed
Binary file not shown.

applications/debug/accessor/helpers/wiegand.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#include <furi.h>
33
#include <furi_hal.h>
44

5-
volatile unsigned long WIEGAND::_cardTempHigh = 0;
6-
volatile unsigned long WIEGAND::_cardTemp = 0;
7-
volatile unsigned long WIEGAND::_lastWiegand = 0;
5+
unsigned long WIEGAND::_cardTempHigh = 0;
6+
unsigned long WIEGAND::_cardTemp = 0;
7+
unsigned long WIEGAND::_lastWiegand = 0;
88
unsigned long WIEGAND::_code = 0;
99
unsigned long WIEGAND::_codeHigh = 0;
10-
volatile int WIEGAND::_bitCount = 0;
10+
int WIEGAND::_bitCount = 0;
1111
int WIEGAND::_wiegandType = 0;
1212

1313
constexpr uint32_t clocks_in_ms = 64 * 1000;
@@ -98,10 +98,7 @@ void WIEGAND::ReadD1() {
9898
_lastWiegand = DWT->CYCCNT; // Keep track of last wiegand bit received
9999
}
100100

101-
unsigned long WIEGAND::GetCardId(
102-
volatile unsigned long* codehigh,
103-
volatile unsigned long* codelow,
104-
char bitlength) {
101+
unsigned long WIEGAND::GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength) {
105102
if(bitlength == 26) // EM tag
106103
return (*codelow & 0x1FFFFFE) >> 1;
107104

applications/debug/accessor/helpers/wiegand.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ class WIEGAND {
1515

1616
private:
1717
static bool DoWiegandConversion();
18-
static unsigned long GetCardId(
19-
volatile unsigned long* codehigh,
20-
volatile unsigned long* codelow,
21-
char bitlength);
18+
static unsigned long
19+
GetCardId(unsigned long* codehigh, unsigned long* codelow, char bitlength);
2220

23-
static volatile unsigned long _cardTempHigh;
24-
static volatile unsigned long _cardTemp;
25-
static volatile unsigned long _lastWiegand;
26-
static volatile int _bitCount;
21+
static unsigned long _cardTempHigh;
22+
static unsigned long _cardTemp;
23+
static unsigned long _lastWiegand;
24+
static int _bitCount;
2725
static int _wiegandType;
2826
static unsigned long _code;
2927
static unsigned long _codeHigh;

applications/debug/battery_test_app/battery_test_app.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ void battery_test_dialog_callback(DialogExResult result, void* context) {
1212
}
1313
}
1414

15-
uint32_t battery_test_exit_confirm_view() {
15+
uint32_t battery_test_exit_confirm_view(void* context) {
16+
UNUSED(context);
1617
return BatteryTestAppViewExitDialog;
1718
}
1819

applications/debug/unit_tests/furi/furi_string_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ MU_TEST(mu_test_furi_string_trim) {
417417
}
418418

419419
MU_TEST(mu_test_furi_string_utf8) {
420-
FuriString* utf8_string = furi_string_alloc_set("イルカ");
420+
FuriString* utf8_string = furi_string_alloc_set("イルカ");
421421

422422
// test furi_string_utf8_length
423423
mu_assert_int_eq(9, furi_string_size(utf8_string));
@@ -440,7 +440,7 @@ MU_TEST(mu_test_furi_string_utf8) {
440440
// test furi_string_utf8_push
441441
furi_string_set(utf8_string, "");
442442
furi_string_utf8_push(utf8_string, value);
443-
mu_assert_string_eq("🐬", furi_string_get_cstr(utf8_string));
443+
mu_assert_string_eq("🐬", furi_string_get_cstr(utf8_string));
444444

445445
furi_string_free(utf8_string);
446446
}

applications/drivers/subghz/cc1101_ext/cc1101_ext.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,8 @@ static bool subghz_device_cc1101_ext_stop_debug() {
568568
return ret;
569569
}
570570

571-
static void subghz_device_cc1101_ext_capture_ISR() {
571+
static void subghz_device_cc1101_ext_capture_ISR(void* context) {
572+
UNUSED(context);
572573
if(!furi_hal_gpio_read(subghz_device_cc1101_ext->g0_pin)) {
573574
if(subghz_device_cc1101_ext->async_rx.capture_callback) {
574575
if(subghz_device_cc1101_ext->async_mirror_pin != NULL)
@@ -747,7 +748,8 @@ static void subghz_device_cc1101_ext_async_tx_refill(uint32_t* buffer, size_t sa
747748
}
748749
}
749750

750-
static void subghz_device_cc1101_ext_async_tx_dma_isr() {
751+
static void subghz_device_cc1101_ext_async_tx_dma_isr(void* context) {
752+
UNUSED(context);
751753
furi_assert(subghz_device_cc1101_ext->state == SubGhzDeviceCC1101ExtStateAsyncTx);
752754

753755
#if SUBGHZ_DEVICE_CC1101_EXT_DMA_CH3_CHANNEL == LL_DMA_CHANNEL_3

applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
static bool subghz_device_cc1101_ext_interconnect_is_frequency_valid(uint32_t frequency) {
88
bool ret = subghz_device_cc1101_ext_is_frequency_valid(frequency);
99
if(!ret) {
10-
furi_crash("SubGhz: fréquence incorrecte.");
10+
furi_crash("SubGhz: fréquence incorrecte.");
1111
}
1212
return ret;
1313
}

applications/examples/example_plugins_advanced/app_api_table.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ constexpr HashtableApiInterface applicaton_hashtable_api_interface{
1818
.resolver_callback = &elf_resolve_from_hashtable,
1919
},
2020
/* pointers to application's API table boundaries */
21-
.table_cbegin = app_api_table.cbegin(),
22-
.table_cend = app_api_table.cend(),
21+
app_api_table.cbegin(),
22+
app_api_table.cend(),
2323
};
2424

2525
/* Casting to generic resolver to use in Composite API resolver */

0 commit comments

Comments
 (0)