Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2025-02-16 21:38:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

fbt format

Browse source
This commit is contained in:
MX 2024-02-21 02:21:20 +03:00
parent b77e430df5
commit c69ce4c921
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83
3 changed files with 63 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/main/nfc/plugins/supported_cards/social_moscow.c
View file

@ -226,7 +226,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_start_trip_date)*24 * 60 + card_start_trip_time, (card_start_trip_date) * 24 * 60 + card_start_trip_time,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
1992); 1992);
furi_string_printf( furi_string_printf(

10
applications/main/nfc/plugins/supported_cards/troika.c
View file

@ -175,7 +175,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_start_trip_date)*24 * 60 + card_start_trip_time, (card_start_trip_date) * 24 * 60 + card_start_trip_time,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
1992); 1992);
furi_string_printf( furi_string_printf(
@ -252,7 +252,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_start_trip_date)*24 * 60 + card_start_trip_time, (card_start_trip_date) * 24 * 60 + card_start_trip_time,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
1992); 1992);
furi_string_printf( furi_string_printf(
@ -426,7 +426,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992); from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_start_trip_date)*24 * 60 + card_start_trip_time, (card_start_trip_date) * 24 * 60 + card_start_trip_time,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
1992); 1992);
furi_string_printf( furi_string_printf(
@ -507,7 +507,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992); from_days_to_datetime(card_use_before_date, &card_use_before_date_s, 1992);
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_start_trip_date)*24 * 60 + card_start_trip_time, (card_start_trip_date) * 24 * 60 + card_start_trip_time,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
1992); 1992);
furi_string_printf( furi_string_printf(
@ -647,7 +647,7 @@ bool parse_transport_block(const MfClassicBlock* block, FuriString* result) {
DateTime card_start_trip_minutes_s = {0}; DateTime card_start_trip_minutes_s = {0};
from_minutes_to_datetime( from_minutes_to_datetime(
(card_valid_to_date)*24 * 60 + card_valid_for_minutes - card_start_trip_neg_minutes, (card_valid_to_date) * 24 * 60 + card_valid_for_minutes - card_start_trip_neg_minutes,
&card_start_trip_minutes_s, &card_start_trip_minutes_s,
2016); //-time 2016); //-time
furi_string_printf( furi_string_printf(

92
lib/subghz/protocols/magellan.c
View file

@ -403,43 +403,65 @@ static void subghz_protocol_magellan_get_event_serialize(uint8_t event, FuriStri
const char* event_type; const char* event_type;
const char* event_subtype; const char* event_subtype;
switch ((event >> 4) & 0x0F) { switch((event >> 4) & 0x0F) {
case 0x00: event_type = "Nothing"; break; case 0x00:
case 0x01: event_type = "Door"; break; event_type = "Nothing";
case 0x02: event_type = "Motion"; break; break;
case 0x03: event_type = "Smoke Alarm"; break; case 0x01:
case 0x04: event_type = "REM1"; break; event_type = "Door";
case 0x05: break;
event_type = "REM1"; case 0x02:
event_subtype = "Off1"; event_type = "Motion";
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype); break;
return; case 0x03:
case 0x06: event_type = "Smoke Alarm";
event_type = "REM2"; break;
event_subtype = "Off1"; case 0x04:
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype); event_type = "REM1";
return; break;
default: event_type = "Unknown"; break; case 0x05:
event_type = "REM1";
event_subtype = "Off1";
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
return;
case 0x06:
event_type = "REM2";
event_subtype = "Off1";
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);
return;
default:
event_type = "Unknown";
break;
} }
switch (event & 0x0F) { switch(event & 0x0F) {
case 0x00: case 0x00:
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Arm1" : "Sealed"; event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Arm1" : "Sealed";
break; break;
case 0x01: case 0x01:
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn1" : "Alarm"; event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn1" : "Alarm";
break; break;
case 0x02: case 0x02:
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn2" : "Tamper"; event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn2" : "Tamper";
break; break;
case 0x03: case 0x03:
event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn3" : "Alarm + Tamper"; event_subtype = (((event >> 4) & 0x0F) > 0x03) ? "Btn3" : "Alarm + Tamper";
break; break;
case 0x08: event_subtype = "Reset"; break; case 0x08:
case 0x09: event_subtype = "LowBatt"; break; event_subtype = "Reset";
case 0x0A: event_subtype = "BattOk"; break; break;
case 0x0B: event_subtype = "Learn"; break; case 0x09:
default: event_subtype = "Unknown"; break; event_subtype = "LowBatt";
break;
case 0x0A:
event_subtype = "BattOk";
break;
case 0x0B:
event_subtype = "Learn";
break;
default:
event_subtype = "Unknown";
break;
} }
furi_string_cat_printf(output, "%s - %s", event_type, event_subtype); furi_string_cat_printf(output, "%s - %s", event_type, event_subtype);