mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 20:49:49 +04:00
Ignore princeton option and fix typo magellan
This commit is contained in:
@@ -270,7 +270,11 @@ static void subghz_scene_receiver_config_set_auto_alarms(VariableItem* item) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
|
static void subghz_scene_receiver_config_set_magellan(VariableItem* item) {
|
||||||
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Magelan);
|
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Magellan);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void subghz_scene_receiver_config_set_princeton(VariableItem* item) {
|
||||||
|
subghz_scene_receiver_config_set_ignore_filter(item, SubGhzProtocolFlag_Princeton);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) {
|
static void subghz_scene_receiver_config_var_list_enter_callback(void* context, uint32_t index) {
|
||||||
@@ -424,7 +428,19 @@ void subghz_scene_receiver_config_on_enter(void* context) {
|
|||||||
subghz);
|
subghz);
|
||||||
|
|
||||||
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
|
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
|
||||||
subghz->ignore_filter, SubGhzProtocolFlag_Magelan);
|
subghz->ignore_filter, SubGhzProtocolFlag_Magellan);
|
||||||
|
variable_item_set_current_value_index(item, value_index);
|
||||||
|
variable_item_set_current_value_text(item, combobox_text[value_index]);
|
||||||
|
|
||||||
|
item = variable_item_list_add(
|
||||||
|
subghz->variable_item_list,
|
||||||
|
"Ignore Princeton:",
|
||||||
|
COMBO_BOX_COUNT,
|
||||||
|
subghz_scene_receiver_config_set_princeton,
|
||||||
|
subghz);
|
||||||
|
|
||||||
|
value_index = subghz_scene_receiver_config_ignore_filter_get_index(
|
||||||
|
subghz->ignore_filter, SubGhzProtocolFlag_Princeton);
|
||||||
variable_item_set_current_value_index(item, value_index);
|
variable_item_set_current_value_index(item, value_index);
|
||||||
variable_item_set_current_value_text(item, combobox_text[value_index]);
|
variable_item_set_current_value_text(item, combobox_text[value_index]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -320,6 +320,6 @@ void subghz_last_settings_log(SubGhzLastSettings* instance) {
|
|||||||
subghz_last_settings_log_filter_get_index(
|
subghz_last_settings_log_filter_get_index(
|
||||||
instance->ignore_filter, SubGhzProtocolFlag_AutoAlarms),
|
instance->ignore_filter, SubGhzProtocolFlag_AutoAlarms),
|
||||||
subghz_last_settings_log_filter_get_index(
|
subghz_last_settings_log_filter_get_index(
|
||||||
instance->ignore_filter, SubGhzProtocolFlag_Magelan),
|
instance->ignore_filter, SubGhzProtocolFlag_Magellan),
|
||||||
subghz_last_settings_log_filter_get_index(instance->filter, SubGhzProtocolFlag_BinRAW));
|
subghz_last_settings_log_filter_get_index(instance->filter, SubGhzProtocolFlag_BinRAW));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ const SubGhzProtocol subghz_protocol_magellan = {
|
|||||||
.type = SubGhzProtocolTypeStatic,
|
.type = SubGhzProtocolTypeStatic,
|
||||||
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
|
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
|
||||||
SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
|
SubGhzProtocolFlag_Load | SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send |
|
||||||
SubGhzProtocolFlag_Magelan,
|
SubGhzProtocolFlag_Magellan,
|
||||||
|
|
||||||
.decoder = &subghz_protocol_magellan_decoder,
|
.decoder = &subghz_protocol_magellan_decoder,
|
||||||
.encoder = &subghz_protocol_magellan_encoder,
|
.encoder = &subghz_protocol_magellan_encoder,
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ const SubGhzProtocol subghz_protocol_princeton = {
|
|||||||
.type = SubGhzProtocolTypeStatic,
|
.type = SubGhzProtocolTypeStatic,
|
||||||
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_868 | SubGhzProtocolFlag_315 |
|
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_868 | SubGhzProtocolFlag_315 |
|
||||||
SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Load |
|
SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Load |
|
||||||
SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send,
|
SubGhzProtocolFlag_Save | SubGhzProtocolFlag_Send | SubGhzProtocolFlag_Princeton,
|
||||||
|
|
||||||
.decoder = &subghz_protocol_princeton_decoder,
|
.decoder = &subghz_protocol_princeton_decoder,
|
||||||
.encoder = &subghz_protocol_princeton_encoder,
|
.encoder = &subghz_protocol_princeton_encoder,
|
||||||
|
|||||||
@@ -127,7 +127,8 @@ typedef enum {
|
|||||||
SubGhzProtocolFlag_BinRAW = (1 << 10),
|
SubGhzProtocolFlag_BinRAW = (1 << 10),
|
||||||
SubGhzProtocolFlag_StarLine = (1 << 11),
|
SubGhzProtocolFlag_StarLine = (1 << 11),
|
||||||
SubGhzProtocolFlag_AutoAlarms = (1 << 12),
|
SubGhzProtocolFlag_AutoAlarms = (1 << 12),
|
||||||
SubGhzProtocolFlag_Magelan = (1 << 13),
|
SubGhzProtocolFlag_Magellan = (1 << 13),
|
||||||
|
SubGhzProtocolFlag_Princeton = (1 << 14),
|
||||||
} SubGhzProtocolFlag;
|
} SubGhzProtocolFlag;
|
||||||
|
|
||||||
struct SubGhzProtocol {
|
struct SubGhzProtocol {
|
||||||
|
|||||||
Reference in New Issue
Block a user