Skip to content

Commit 57c438d

Browse files
hedgerskotopes
andauthored
heap: increased size (#3924)
* reduced reserved memory size for system stack; added temporary markup to monitor usage * fbt: relink elf file on linker script change; removed debug memory fill * Make PVS Happy * Make doxygen happy Co-authored-by: Aleksandr Kutuzov <[email protected]>
1 parent 0902fd4 commit 57c438d

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

applications/services/gui/canvas.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -289,15 +289,14 @@ void canvas_draw_xbm(
289289

290290
/** Draw rotated XBM bitmap
291291
*
292-
* @param canvas Canvas instance
293-
* @param x x coordinate
294-
* @param y y coordinate
295-
* @param[in] width bitmap width
296-
* @param[in] height bitmap height
297-
* @param[in] rotation bitmap rotation
298-
* @param bitmap pointer to XBM bitmap data
292+
* @param canvas Canvas instance
293+
* @param x x coordinate
294+
* @param y y coordinate
295+
* @param[in] width bitmap width
296+
* @param[in] height bitmap height
297+
* @param[in] rotation bitmap rotation
298+
* @param bitmap_data pointer to XBM bitmap data
299299
*/
300-
301300
void canvas_draw_xbm_ex(
302301
Canvas* canvas,
303302
int32_t x,

firmware.scons

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ fwelf = fwenv["FW_ELF"] = fwenv.Program(
216216
sources,
217217
LIBS=fwenv["TARGET_CFG"].linker_dependencies,
218218
)
219+
Depends(fwelf, fwenv["LINKER_SCRIPT_PATH"])
219220

220221
# Firmware depends on everything child builders returned
221222
# Depends(fwelf, lib_targets)

lib/nfc/helpers/iso14443_4_layer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define ISO14443_4_BLOCK_PCB_S_CID_MASK (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
2626
#define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
2727

28-
#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & mask) == mask)
28+
#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & (mask)) == (mask))
2929

3030
#define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
3131
ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)

lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
6565
if(instance->state == Iso14443_4aListenerStateIdle) {
6666
if(bit_buffer_get_size_bytes(rx_buffer) == 2 &&
6767
bit_buffer_get_byte(rx_buffer, 0) == ISO14443_4A_CMD_READ_ATS) {
68-
if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) !=
68+
if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) ==
6969
Iso14443_4aErrorNone) {
70-
command = NfcCommandContinue;
71-
} else {
7270
instance->state = Iso14443_4aListenerStateActive;
7371
}
7472
}
@@ -93,7 +91,6 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
9391
if(instance->callback) {
9492
command = instance->callback(instance->generic_event, instance->context);
9593
}
96-
command = NfcCommandContinue;
9794
}
9895

9996
return command;

targets/f7/stm32wb55xx_flash.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
33
/* Highest address of the user mode stack */
44
_stack_end = 0x20030000; /* end of RAM */
55
/* Generate a link error if heap and stack don't fit into RAM */
6-
_stack_size = 0x1000; /* required amount of stack */
6+
_stack_size = 0x200; /* required amount of stack */
77

88
MEMORY {
99
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K

targets/f7/stm32wb55xx_ram_fw.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
33
/* Highest address of the user mode stack */
44
_stack_end = 0x20030000; /* end of RAM */
55
/* Generate a link error if heap and stack don't fit into RAM */
6-
_stack_size = 0x1000; /* required amount of stack */
6+
_stack_size = 0x200; /* required amount of stack */
77

88
MEMORY {
99
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K

0 commit comments

Comments
 (0)