Skip to content

Commit 9effc03

Browse files
WillyJLRogueMaster
authored andcommitted
Latest RM0523-1659-0.420.0-f4aa88e on PATREON & GitHub - ULxMFW 2x
1 parent 4d30d03 commit 9effc03

File tree

8 files changed

+17
-9
lines changed

8 files changed

+17
-9
lines changed

ReadMe.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ This software is for experimental purposes only and is not meant for any illegal
3535
- UL: [SubGHz: V2 Phoenix show counter value (By xMasterX)](https://github.com/DarkFlippers/unleashed-firmware/commit/350dea6535441a8dd52871eb5accb7ca508f90cb)
3636
- Updated: [Sub-GHz Playlist v1.0.1 (By darmiel)](https://github.com/darmiel/flipper-playlist) [Sub-GHz Playlist: Add support for custom modulation presets, remake with txrx library and support for dynamic signals, cleanup code (By xMasterX)](https://github.com/xMasterX/all-the-plugins/commit/39d7c0e9379a1bc3bb0dca772de3efd148a61a9b)
3737
- Updated: [Quac! v0.9.0 (By rdefeo)](https://github.com/rdefeo/quac) Changes (By xMasterX)
38+
- UL: [Sub-GHz: Rename and extend Alarms ignore option with Hollarm & GangQi (By xMasterX)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/f9a6958eb6eb54f4c6557e839dbacf23dfdb84c1)
39+
- UL: [Display: Backlight option `Always ON` (By Dmitry422)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/f9a6958eb6eb54f4c6557e839dbacf23dfdb84c1)
3840

3941
<a name="release">
4042

@@ -235,6 +237,7 @@ $ ./fbt dolphin_ext
235237
- SubGHz: [Beep on TX for SubGHz & Remote (By LeeroysHub)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/ad0a273a71d7701af30df75c9174f3bdc3fd6e4a)
236238
- SubGhz: [GPS support (By Sil333033) & SubGHz Repeater (By LeeroysHub) & Optimizations (By WillyJL) & Merge Fixes (By RogueMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/3e5e1870621b52caad8fd1287e116c542703984a)
237239
- SubGHz: [keeloq jolly motors add full support with add manually (By pkooiman)](https://github.com/DarkFlippers/unleashed-firmware/commit/dd6e0a9b721c09b82a127aadd0a1accba8b18f7c)
240+
- SubGHz: [Ignore options - Alarms: Hollarm, GangQi | Cars: Kia, Starline, ScherKhan (By xMaster)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/f9a6958eb6eb54f4c6557e839dbacf23dfdb84c1)
238241
- SubGHz: Moved setting_user file to setting_user.txt! This makes it changable from IOS app. (By RogueMaster)
239242
- SubGHz: Nicer SubGHz Chat via [CLI Bridge (By ranchordo)](https://github.com/ranchordo/flipperzero-cli-bridge) with "chat" command (Thanks ESurge and qqMajikpp)
240243
- SubGHz: OFW PR [Decode RAW recordings #1667 (By qistoph)](https://github.com/flipperdevices/flipperzero-firmware/pull/1667)

applications/main/subghz/scenes/subghz_scene_receiver_config.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ enum SubGhzSettingIndex {
1515
SubGhzSettingIndexDeleteOldSignals,
1616
SubGhzSettingIndexAutosave,
1717
SubGhzSettingIndexIgnoreStarline,
18-
SubGhzSettingIndexIgnoreCars,
18+
SubGhzSettingIndexIgnoreAlarms,
1919
SubGhzSettingIndexIgnoreMagellan,
2020
SubGhzSettingIndexIgnorePrinceton,
2121
SubGhzSettingIndexIgnoreNiceFlorS,
@@ -415,7 +415,7 @@ static void subghz_scene_receiver_config_set_starline(VariableItem* item) {
415415
}
416416

417417
static void subghz_scene_receiver_config_set_auto_alarms(VariableItem* item) {
418-
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_AutoAlarms);
418+
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFilter_Alarms);
419419
}
420420

421421
static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
@@ -617,13 +617,13 @@ void subghz_scene_receiver_config_on_enter(void* context) {
617617

618618
item = variable_item_list_add(
619619
subghz->variable_item_list,
620-
"Ignore Cars",
620+
"Ignore Alarms",
621621
COMBO_BOX_COUNT,
622622
subghz_scene_receiver_config_set_auto_alarms,
623623
subghz);
624624

625625
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
626-
subghz->ignore_filter, SubGhzProtocolFilter_AutoAlarms);
626+
subghz->ignore_filter, SubGhzProtocolFilter_Alarms);
627627
variable_item_set_current_value_index(item, value_index);
628628
variable_item_set_current_value_text(item, combobox_text[value_index]);
629629

applications/settings/notification_settings/notification_settings_app.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ const float volume_value[VOLUME_COUNT] = {
8080
0.55f, 0.60f, 0.65f, 0.70f, 0.75f, 0.80f, 0.85f, 0.90f, 0.95f, 1.00f,
8181
};
8282

83-
#define DELAY_COUNT 11
83+
#define DELAY_COUNT 12
8484
const char* const delay_text[DELAY_COUNT] = {
85+
"Always ON",
8586
"1s",
8687
"5s",
8788
"10s",
@@ -95,7 +96,7 @@ const char* const delay_text[DELAY_COUNT] = {
9596
"30min",
9697
};
9798
const uint32_t delay_value[DELAY_COUNT] =
98-
{1000, 5000, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000, 1800000};
99+
{0, 1000, 5000, 10000, 15000, 30000, 60000, 90000, 120000, 300000, 600000, 1800000};
99100

100101
#define VIBRO_COUNT 2
101102
const char* const vibro_text[VIBRO_COUNT] = {

lib/subghz/protocols/gangqi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ const SubGhzProtocol subghz_protocol_gangqi = {
6868

6969
.decoder = &subghz_protocol_gangqi_decoder,
7070
.encoder = &subghz_protocol_gangqi_encoder,
71+
72+
.filter = SubGhzProtocolFilter_Alarms,
7173
};
7274

7375
void* subghz_protocol_encoder_gangqi_alloc(SubGhzEnvironment* environment) {

lib/subghz/protocols/hollarm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ const SubGhzProtocol subghz_protocol_hollarm = {
6868

6969
.decoder = &subghz_protocol_hollarm_decoder,
7070
.encoder = &subghz_protocol_hollarm_encoder,
71+
72+
.filter = SubGhzProtocolFilter_Alarms,
7173
};
7274

7375
void* subghz_protocol_encoder_hollarm_alloc(SubGhzEnvironment* environment) {

lib/subghz/protocols/kia.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ const SubGhzProtocol subghz_protocol_kia = {
270270
.decoder = &subghz_protocol_kia_decoder,
271271
.encoder = &subghz_protocol_kia_encoder,
272272

273-
.filter = SubGhzProtocolFilter_AutoAlarms,
273+
.filter = SubGhzProtocolFilter_Alarms,
274274
};
275275

276276
void* subghz_protocol_decoder_kia_alloc(SubGhzEnvironment* environment) {

lib/subghz/protocols/scher_khan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const SubGhzProtocol subghz_protocol_scher_khan = {
7777
.decoder = &subghz_protocol_scher_khan_decoder,
7878
.encoder = &subghz_protocol_scher_khan_encoder,
7979

80-
.filter = SubGhzProtocolFilter_AutoAlarms,
80+
.filter = SubGhzProtocolFilter_Alarms,
8181
};
8282

8383
void* subghz_protocol_decoder_scher_khan_alloc(SubGhzEnvironment* environment) {

lib/subghz/types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typedef enum {
138138

139139
typedef enum {
140140
SubGhzProtocolFilter_StarLine = (1 << 0),
141-
SubGhzProtocolFilter_AutoAlarms = (1 << 1),
141+
SubGhzProtocolFilter_Alarms = (1 << 1),
142142
SubGhzProtocolFilter_Magellan = (1 << 2),
143143
SubGhzProtocolFilter_Princeton = (1 << 3),
144144
SubGhzProtocolFilter_NiceFlorS = (1 << 4),

0 commit comments

Comments
 (0)