Skip to content

Commit c69ce4c

Browse files
xMasterXxMasterX
committed
fbt format
1 parent b77e430 commit c69ce4c

File tree

3 files changed

+63
-41
lines changed

3 files changed

+63
-41
lines changed

‎applications/main/nfc/plugins/supported_cards/social_moscow.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
226226

227227
DateTime card_start_trip_minutes_s = {0};
228228
from_minutes_to_datetime(
229-
(card_start_trip_date)*24 * 60 + card_start_trip_time,
229+
(card_start_trip_date) * 24 * 60 + card_start_trip_time,
230230
&card_start_trip_minutes_s,
231231
1992);
232232
furi_string_printf(

‎applications/main/nfc/plugins/supported_cards/troika.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
175175

176176
DateTime card_start_trip_minutes_s = {0};
177177
from_minutes_to_datetime(
178-
(card_start_trip_date)*24 * 60 + card_start_trip_time,
178+
(card_start_trip_date) * 24 * 60 + card_start_trip_time,
179179
&card_start_trip_minutes_s,
180180
1992);
181181
furi_string_printf(
@@ -252,7 +252,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
252252

253253
DateTime card_start_trip_minutes_s = {0};
254254
from_minutes_to_datetime(
255-
(card_start_trip_date)*24 * 60 + card_start_trip_time,
255+
(card_start_trip_date) * 24 * 60 + card_start_trip_time,
256256
&card_start_trip_minutes_s,
257257
1992);
258258
furi_string_printf(
@@ -426,7 +426,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
426426
from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
427427
DateTime card_start_trip_minutes_s = {0};
428428
from_minutes_to_datetime(
429-
(card_start_trip_date)*24 * 60 + card_start_trip_time,
429+
(card_start_trip_date) * 24 * 60 + card_start_trip_time,
430430
&card_start_trip_minutes_s,
431431
1992);
432432
furi_string_printf(
@@ -507,7 +507,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
507507
from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
508508
DateTime card_start_trip_minutes_s = {0};
509509
from_minutes_to_datetime(
510-
(card_start_trip_date)*24 * 60 + card_start_trip_time,
510+
(card_start_trip_date) * 24 * 60 + card_start_trip_time,
511511
&card_start_trip_minutes_s,
512512
1992);
513513
furi_string_printf(
@@ -647,7 +647,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
647647

648648
DateTime card_start_trip_minutes_s = {0};
649649
from_minutes_to_datetime(
650-
(card_valid_to_date)*24 * 60 + card_valid_for_minutes - card_start_trip_neg_minutes,
650+
(card_valid_to_date) * 24 * 60 + card_valid_for_minutes - card_start_trip_neg_minutes,
651651
&card_start_trip_minutes_s,
652652
2016); //-time
653653
furi_string_printf(

‎lib/subghz/protocols/magellan.c

+57-35
Original file line numberDiff line numberDiff line change
@@ -403,43 +403,65 @@ static void subghz_protocol_magellan_get_event_serialize(uint8_t event, FuriStri
403403
const char* event_type;
404404
const char* event_subtype;
405405

406-
switch ((event >> 4) & 0x0F) {
407-
case 0x00: event_type = "Nothing"; break;
408-
case 0x01: event_type = "Door"; break;
409-
case 0x02: event_type = "Motion"; break;
410-
case 0x03: event_type = "Smoke Alarm"; break;
411-
case 0x04: event_type = "REM1"; break;
412-
case 0x05:
413-
event_type = "REM1";
414-
event_subtype = "Off1";
415-
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
416-
return;
417-
case 0x06:
418-
event_type = "REM2";
419-
event_subtype = "Off1";
420-
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
421-
return;
422-
default: event_type = "Unknown"; break;
406+
switch((event >> 4) & 0x0F) {
407+
case 0x00:
408+
event_type = "Nothing";
409+
break;
410+
case 0x01:
411+
event_type = "Door";
412+
break;
413+
case 0x02:
414+
event_type = "Motion";
415+
break;
416+
case 0x03:
417+
event_type = "Smoke Alarm";
418+
break;
419+
case 0x04:
420+
event_type = "REM1";
421+
break;
422+
case 0x05:
423+
event_type = "REM1";
424+
event_subtype = "Off1";
425+
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
426+
return;
427+
case 0x06:
428+
event_type = "REM2";
429+
event_subtype = "Off1";
430+
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
431+
return;
432+
default:
433+
event_type = "Unknown";
434+
break;
423435
}
424436

425-
switch (event & 0x0F) {
426-
case 0x00:
427-
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Arm1" : "Sealed";
428-
break;
429-
case 0x01:
430-
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn1" : "Alarm";
431-
break;
432-
case 0x02:
433-
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn2" : "Tamper";
434-
break;
435-
case 0x03:
436-
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn3" : "Alarm + Tamper";
437-
break;
438-
case 0x08: event_subtype = "Reset"; break;
439-
case 0x09: event_subtype = "LowBatt"; break;
440-
case 0x0A: event_subtype = "BattOk"; break;
441-
case 0x0B: event_subtype = "Learn"; break;
442-
default: event_subtype = "Unknown"; break;
437+
switch(event & 0x0F) {
438+
case 0x00:
439+
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Arm1" : "Sealed";
440+
break;
441+
case 0x01:
442+
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn1" : "Alarm";
443+
break;
444+
case 0x02:
445+
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn2" : "Tamper";
446+
break;
447+
case 0x03:
448+
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn3" : "Alarm + Tamper";
449+
break;
450+
case 0x08:
451+
event_subtype = "Reset";
452+
break;
453+
case 0x09:
454+
event_subtype = "LowBatt";
455+
break;
456+
case 0x0A:
457+
event_subtype = "BattOk";
458+
break;
459+
case 0x0B:
460+
event_subtype = "Learn";
461+
break;
462+
default:
463+
event_subtype = "Unknown";
464+
break;
443465
}
444466

445467
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);

0 commit comments

Comments
 (0)