Skip to content

Commit 4afd070

Browse files
authored
Merge branch 'dev' into banapass_parser
2 parents 0269d66 + 7380eac commit 4afd070

File tree

4 files changed

+40
-2
lines changed

4 files changed

+40
-2
lines changed

applications/main/infrared/resources/infrared/assets/audio.ir

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4689,3 +4689,35 @@ protocol: NECext
46894689
address: 87 7C 00 00
46904690
command: 1D E2 00 00
46914691
#
4692+
# Model: JVC RM-SRVNB1A for JVC RV-NB1 boombox (2004)
4693+
#
4694+
name: Power
4695+
type: raw
4696+
frequency: 38000
4697+
duty_cycle: 0.333333
4698+
data: 8400 4200 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 25248 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 33664
4699+
#
4700+
name: Vol_up
4701+
type: raw
4702+
frequency: 38000
4703+
duty_cycle: 0.333333
4704+
data: 8400 4200 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 25248 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 526 526 33664
4705+
#
4706+
name: Vol_dn
4707+
type: raw
4708+
frequency: 38000
4709+
duty_cycle: 0.333333
4710+
data: 8400 4200 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 25248 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 1578 526 526 526 526 526 526 526 526 526 526 526 526 526 33664
4711+
#
4712+
name: Next
4713+
type: raw
4714+
frequency: 38000
4715+
duty_cycle: 0.333333
4716+
data: 8400 4200 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 1578 526 526 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 25248 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 1578 526 526 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 33664
4717+
#
4718+
name: Prev
4719+
type: raw
4720+
frequency: 38000
4721+
duty_cycle: 0.333333
4722+
data: 8400 4200 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 25248 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 1578 526 526 526 1578 526 1578 526 1578 526 1578 526 1578 526 526 526 526 526 33664
4723+
#
-14 Bytes
Loading

lib/nfc/protocols/iso14443_3a/iso14443_3a_poller_i.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ static Iso14443_3aError iso14443_3a_poller_standard_frame_exchange(
4242
break;
4343
}
4444

45+
if(bit_buffer_get_capacity_bytes(rx_buffer) <
46+
bit_buffer_get_size_bytes(instance->rx_buffer)) {
47+
ret = Iso14443_3aErrorBufferOverflow;
48+
break;
49+
}
4550
bit_buffer_copy(rx_buffer, instance->rx_buffer);
51+
4652
if(!iso14443_crc_check(Iso14443CrcTypeA, instance->rx_buffer)) {
4753
ret = Iso14443_3aErrorWrongCrc;
4854
break;

lib/toolbox/cli/cli_registry.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ void cli_registry_reload_external_commands(
136136
FURI_LOG_T(TAG, "Plugin: %s", plugin_filename);
137137
furi_string_set_str(plugin_name, plugin_filename);
138138

139-
furi_check(furi_string_end_with_str(plugin_name, ".fal"));
139+
if(!furi_string_end_with_str(plugin_name, ".fal")) continue;
140140
furi_string_replace_all_str(plugin_name, ".fal", "");
141-
furi_check(furi_string_start_with_str(plugin_name, config->fal_prefix));
141+
if(!furi_string_start_with_str(plugin_name, config->fal_prefix)) continue;
142142
furi_string_replace_at(plugin_name, 0, strlen(config->fal_prefix), "");
143143

144144
CliRegistryCommand command = {

0 commit comments

Comments
 (0)