[FL-2220, FL-2221, FL-1883] RFID and iButton GUI update (#1107)

* RFID and iButton gui update
* Grammar nazi: readed -> read
* Grammar nazi pt.2: writed -> written

Co-authored-by: あく <alleteam@gmail.com>

applications/lfrfid/helpers/decoder_emmarin.cpp

@@ -15,7 +15,7 @@ constexpr uint32_t long_time_high = long_time + jitter_time;
 
 void DecoderEMMarin::reset_state() {
     ready = false;
-    readed_data = 0;
+    read_data = 0;
     manchester_advance(
         manchester_saved_state, ManchesterEventReset, &manchester_saved_state, nullptr);
 }
@@ -26,7 +26,7 @@ bool DecoderEMMarin::read(uint8_t* data, uint8_t data_size) {
     if(ready) {
         result = true;
         em_marin.decode(
-            reinterpret_cast<const uint8_t*>(&readed_data), sizeof(uint64_t), data, data_size);
+            reinterpret_cast<const uint8_t*>(&read_data), sizeof(uint64_t), data, data_size);
         ready = false;
     }
 
@@ -59,10 +59,10 @@ void DecoderEMMarin::process_front(bool polarity, uint32_t time) {
             manchester_advance(manchester_saved_state, event, &manchester_saved_state, &data);
 
         if(data_ok) {
-            readed_data = (readed_data << 1) | data;
+            read_data = (read_data << 1) | data;
 
             ready = em_marin.can_be_decoded(
-                reinterpret_cast<const uint8_t*>(&readed_data), sizeof(uint64_t));
+                reinterpret_cast<const uint8_t*>(&read_data), sizeof(uint64_t));
         }
     }
 }

applications/lfrfid/helpers/decoder_emmarin.h

@@ -13,7 +13,7 @@ public:
 private:
     void reset_state();
 
-    uint64_t readed_data = 0;
+    uint64_t read_data = 0;
     std::atomic<bool> ready;
 
     ManchesterState manchester_saved_state;

applications/lfrfid/helpers/rfid_reader.cpp

@@ -78,7 +78,7 @@ void RfidReader::start() {
     start_comparator();
 
     switch_timer_reset();
-    last_readed_count = 0;
+    last_read_count = 0;
 }
 
 void RfidReader::start_forced(RfidReader::Type _type) {
@@ -97,45 +97,45 @@ void RfidReader::stop() {
 
 bool RfidReader::read(LfrfidKeyType* _type, uint8_t* data, uint8_t data_size, bool switch_enable) {
     bool result = false;
-    bool something_readed = false;
+    bool something_read = false;
 
     // reading
     if(decoder_em.read(data, data_size)) {
         *_type = LfrfidKeyType::KeyEM4100;
-        something_readed = true;
+        something_read = true;
     }
 
     if(decoder_hid26.read(data, data_size)) {
         *_type = LfrfidKeyType::KeyH10301;
-        something_readed = true;
+        something_read = true;
     }
 
     if(decoder_indala.read(data, data_size)) {
         *_type = LfrfidKeyType::KeyI40134;
-        something_readed = true;
+        something_read = true;
     }
 
     // validation
-    if(something_readed) {
+    if(something_read) {
         switch_timer_reset();
 
-        if(last_readed_type == *_type && memcmp(last_readed_data, data, data_size) == 0) {
-            last_readed_count = last_readed_count + 1;
+        if(last_read_type == *_type && memcmp(last_read_data, data, data_size) == 0) {
+            last_read_count = last_read_count + 1;
 
-            if(last_readed_count > 2) {
+            if(last_read_count > 2) {
                 result = true;
             }
         } else {
-            last_readed_type = *_type;
-            memcpy(last_readed_data, data, data_size);
-            last_readed_count = 0;
+            last_read_type = *_type;
+            memcpy(last_read_data, data, data_size);
+            last_read_count = 0;
         }
     }
 
     // mode switching
     if(switch_enable && switch_timer_elapsed()) {
         switch_mode();
-        last_readed_count = 0;
+        last_read_count = 0;
     }
 
     return result;
@@ -152,7 +152,7 @@ bool RfidReader::detect() {
 }
 
 bool RfidReader::any_read() {
-    return last_readed_count > 0;
+    return last_read_count > 0;
 }
 
 void RfidReader::start_comparator(void) {

applications/lfrfid/helpers/rfid_reader.h

@@ -49,9 +49,9 @@ private:
     void switch_timer_reset();
     void switch_mode();
 
-    LfrfidKeyType last_readed_type;
-    uint8_t last_readed_data[LFRFID_KEY_SIZE];
-    uint8_t last_readed_count;
+    LfrfidKeyType last_read_type;
+    uint8_t last_read_data[LFRFID_KEY_SIZE];
+    uint8_t last_read_count;
 
     Type type = Type::Normal;
 };