Merge remote-tracking branch 'ul/dev' into mntm-dev --nobuild

This commit is contained in:
WillyJL
2025-06-29 01:28:52 +01:00
14 changed files with 36 additions and 23 deletions
+2
View File
@@ -523,6 +523,7 @@ static void lfrfid_worker_mode_write_process(LFRFIDWorker* worker) {
while(!lfrfid_worker_check_for_stop(worker)) {
FURI_LOG_D(TAG, "Data write");
furi_delay_ms(5); // halt
uint16_t skips = 0;
for(size_t i = 0; i < LFRFIDWriteTypeMax; i++) {
memset(request, 0, sizeof(LFRFIDWriteRequest));
@@ -626,6 +627,7 @@ static void lfrfid_worker_mode_write_and_set_pass_process(LFRFIDWorker* worker)
if(can_be_written) {
while(!lfrfid_worker_check_for_stop(worker)) {
FURI_LOG_D(TAG, "Data write with pass");
furi_delay_ms(5); // halt
LfRfid* app = worker->cb_ctx;
uint32_t pass = bit_lib_bytes_to_num_be(app->password, 4);
+2
View File
@@ -66,6 +66,8 @@ const SubGhzProtocol subghz_protocol_feron = {
.decoder = &subghz_protocol_feron_decoder,
.encoder = &subghz_protocol_feron_encoder,
.filter = SubGhzProtocolFilter_Sensors,
};
void* subghz_protocol_encoder_feron_alloc(SubGhzEnvironment* environment) {
+1
View File
@@ -370,4 +370,5 @@ const SubGhzProtocol subghz_protocol_honeywell = {
.encoder = &subghz_protocol_honeywell_encoder,
.decoder = &subghz_protocol_honeywell_decoder,
.filter = SubGhzProtocolFilter_Sensors,
};
+2
View File
@@ -80,6 +80,8 @@ const SubGhzProtocol subghz_protocol_honeywell_wdb = {
.decoder = &subghz_protocol_honeywell_wdb_decoder,
.encoder = &subghz_protocol_honeywell_wdb_encoder,
.filter = SubGhzProtocolFilter_Sensors,
};
void* subghz_protocol_encoder_honeywell_wdb_alloc(SubGhzEnvironment* environment) {
+1 -1
View File
@@ -70,7 +70,7 @@ const SubGhzProtocol subghz_protocol_kia = {
.decoder = &subghz_protocol_kia_decoder,
.encoder = &subghz_protocol_kia_encoder,
.filter = SubGhzProtocolFilter_Alarms,
.filter = SubGhzProtocolFilter_Cars,
};
void* subghz_protocol_decoder_kia_alloc(SubGhzEnvironment* environment) {
+2
View File
@@ -73,6 +73,8 @@ const SubGhzProtocol subghz_protocol_legrand = {
.decoder = &subghz_protocol_legrand_decoder,
.encoder = &subghz_protocol_legrand_encoder,
.filter = SubGhzProtocolFilter_Sensors,
};
void* subghz_protocol_encoder_legrand_alloc(SubGhzEnvironment* environment) {
+1 -1
View File
@@ -71,7 +71,7 @@ const SubGhzProtocol subghz_protocol_magellan = {
.decoder = &subghz_protocol_magellan_decoder,
.encoder = &subghz_protocol_magellan_encoder,
.filter = SubGhzProtocolFilter_Magellan,
.filter = SubGhzProtocolFilter_Sensors,
};
void* subghz_protocol_encoder_magellan_alloc(SubGhzEnvironment* environment) {
+1 -1
View File
@@ -77,7 +77,7 @@ const SubGhzProtocol subghz_protocol_scher_khan = {
.decoder = &subghz_protocol_scher_khan_decoder,
.encoder = &subghz_protocol_scher_khan_encoder,
.filter = SubGhzProtocolFilter_Alarms,
.filter = SubGhzProtocolFilter_Cars,
};
void* subghz_protocol_decoder_scher_khan_alloc(SubGhzEnvironment* environment) {
+1 -1
View File
@@ -86,7 +86,7 @@ const SubGhzProtocol subghz_protocol_star_line = {
.decoder = &subghz_protocol_star_line_decoder,
.encoder = &subghz_protocol_star_line_encoder,
.filter = SubGhzProtocolFilter_StarLine,
.filter = SubGhzProtocolFilter_Cars,
};
/**
+2 -2
View File
@@ -137,9 +137,9 @@ typedef enum {
} SubGhzProtocolFlag;
typedef enum {
SubGhzProtocolFilter_StarLine = (1 << 0),
SubGhzProtocolFilter_Cars = (1 << 0),
SubGhzProtocolFilter_Alarms = (1 << 1),
SubGhzProtocolFilter_Magellan = (1 << 2),
SubGhzProtocolFilter_Sensors = (1 << 2),
SubGhzProtocolFilter_Princeton = (1 << 3),
SubGhzProtocolFilter_NiceFlorS = (1 << 4),
SubGhzProtocolFilter_Weather = (1 << 5),