More read_success view tweaks

flipperdevices · Mar 22, 2024 · c2db03b · c2db03b
1 parent 52261b3
commit c2db03b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 34 deletions.
diff --git a/lib/lfrfid/protocols/protocol_awid.c b/lib/lfrfid/protocols/protocol_awid.c
@@ -192,7 +192,7 @@ void protocol_awid_render_brief_data(ProtocolAwid* protocol, FuriString* result)
     uint8_t* decoded_data = protocol->data;
     uint8_t format_length = decoded_data[0];
 
-    furi_string_printf(result, "Format: %hhu\n", format_length);
+    furi_string_printf(result, "Format: %hhu", format_length);
 
     if(format_length == 26) {
         uint8_t facility;
@@ -203,12 +203,12 @@ void protocol_awid_render_brief_data(ProtocolAwid* protocol, FuriString* result)
         bit_lib_copy_bits((uint8_t*)&card_id, 0, 8, decoded_data, 25);
         furi_string_cat_printf(
             result,
-            "FC: %hhu\n"
+            "; FC: %hhu\n"
             "Card: %hu",
             facility,
             card_id);
     } else {
-        furi_string_cat(result, "Data: Unknown");
+        furi_string_cat(result, "\nData: Unknown");
     }
 };
 

diff --git a/lib/lfrfid/protocols/protocol_fdx_b.c b/lib/lfrfid/protocols/protocol_fdx_b.c
@@ -329,17 +329,13 @@ void protocol_fdx_b_render_brief_data(ProtocolFDXB* protocol, FuriString* result
     // 10 bit of country code
     uint16_t country_code = protocol_fdx_b_get_country_code(protocol->data);
 
-    bool animal_flag = bit_lib_get_bit(protocol->data, 63);
-
     furi_string_printf(
         result,
         "ID: %03hu-%012llu\n"
-        "Country Code: %hu\n"
-        "Animal: %s, Temp.: ",
+        "Country: %hu; Temp.: ",
         country_code,
         national_code,
-        country_code,
-        animal_flag ? "Yes" : "No");
+        country_code);
 
     float temperature;
     if(protocol_fdx_b_get_temp(protocol->data, &temperature)) {

diff --git a/lib/lfrfid/protocols/protocol_gallagher.c b/lib/lfrfid/protocols/protocol_gallagher.c
@@ -280,11 +280,8 @@ static void protocol_gallagher_render_data_internal(
     if(brief) {
         furi_string_printf(
             result,
-            "Region: %u, Issue Level: %u\n"
             "FC: %lu\n"
             "Card: %lu",
-            region,
-            issue_level,
             fc,
             card_id);
     } else {

diff --git a/lib/lfrfid/protocols/protocol_indala26.c b/lib/lfrfid/protocols/protocol_indala26.c
@@ -290,11 +290,9 @@ void protocol_indala26_render_data_internal(
         furi_string_printf(
             result,
             "FC: %u\n"
-            "Card: %u\n"
-            "Parity: %c",
+            "Card: %u",
             fc,
-            card,
-            (wiegand_correct ? '+' : '-'));
+            card);
     } else {
         furi_string_printf(
             result,

diff --git a/lib/lfrfid/protocols/protocol_keri.c b/lib/lfrfid/protocols/protocol_keri.c
@@ -212,20 +212,40 @@ LevelDuration protocol_keri_encoder_yield(ProtocolKeri* protocol) {
     return level_duration;
 };
 
-void protocol_keri_render_data(ProtocolKeri* protocol, FuriString* result) {
+static void
+    protocol_keri_render_data_internal(ProtocolKeri* protocol, FuriString* result, bool brief) {
     uint32_t data = bit_lib_get_bits_32(protocol->data, 0, 32);
     uint32_t internal_id = data & 0x7FFFFFFF;
     uint32_t fc = 0;
     uint32_t cn = 0;
     protocol_keri_descramble(&fc, &cn, &data);
-    furi_string_printf(
-        result,
-        "Internal ID: %lu\n"
-        "FC: %lu\n"
-        "Card: %lu",
-        internal_id,
-        fc,
-        cn);
+
+    if(brief) {
+        furi_string_printf(
+            result,
+            "Internal ID: %lu\n"
+            "FC: %lu; Card: %lu",
+            internal_id,
+            fc,
+            cn);
+    } else {
+        furi_string_printf(
+            result,
+            "Internal ID: %lu\n"
+            "FC: %lu\n"
+            "Card: %lu",
+            internal_id,
+            fc,
+            cn);
+    }
+}
+
+void protocol_keri_render_data(ProtocolKeri* protocol, FuriString* result) {
+    protocol_keri_render_data_internal(protocol, result, false);
+}
+
+void protocol_keri_render_brief_data(ProtocolKeri* protocol, FuriString* result) {
+    protocol_keri_render_data_internal(protocol, result, true);
 }
 
 bool protocol_keri_write_data(ProtocolKeri* protocol, void* data) {
@@ -269,6 +289,6 @@ const ProtocolBase protocol_keri = {
             .yield = (ProtocolEncoderYield)protocol_keri_encoder_yield,
         },
     .render_data = (ProtocolRenderData)protocol_keri_render_data,
-    .render_brief_data = (ProtocolRenderData)protocol_keri_render_data,
+    .render_brief_data = (ProtocolRenderData)protocol_keri_render_brief_data,
     .write_data = (ProtocolWriteData)protocol_keri_write_data,
 };
diff --git a/lib/lfrfid/protocols/protocol_nexwatch.c b/lib/lfrfid/protocols/protocol_nexwatch.c
@@ -288,8 +288,8 @@ static void protocol_nexwatch_render_data_internal(
     if(brief) {
         furi_string_printf(
             result,
-            "ID: %lu, Mode: %hhu\n"
-            "Type: %s",
+            "ID: %lu\n"
+            "Mode: %hhu; Type: %s",
             id,
             mode,
             type);

diff --git a/lib/lfrfid/protocols/protocol_paradox.c b/lib/lfrfid/protocols/protocol_paradox.c
@@ -197,15 +197,12 @@ void protocol_paradox_render_brief_data(ProtocolParadox* protocol, FuriString* r
 
     furi_string_printf(
         result,
-        "FC: %hhu\n"
-        "Card: %hu\n"
-        "CRC: %hhu",
+        "FC: %hhu; Card: %hu",
         fc,
-        card_id,
-        card_crc);
+        card_id);
 
     if(calc_crc != card_crc) {
-        furi_string_cat(result, " (Mismatch)");
+        furi_string_cat(result, "\nCRC Mismatch, Invalid Card!");
     }
 };