Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware

into mntm-dev
Next-Flip · Mar 15, 2024 · edba596 · edba596
2 parents 4f1ae6b + ce67472
commit edba596
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/lib/lfrfid/protocols/protocol_em4100.c b/lib/lfrfid/protocols/protocol_em4100.c
@@ -318,8 +318,8 @@ bool protocol_em4100_write_data(ProtocolEM4100* protocol, void* data) {
         request->t5577.block[0] =
             (LFRFID_T5577_MODULATION_MANCHESTER | protocol_em4100_get_t5577_bitrate(protocol) |
              (2 << LFRFID_T5577_MAXBLOCK_SHIFT));
-        request->t5577.block[1] = protocol->encoded_data;
-        request->t5577.block[2] = protocol->encoded_data >> 32;
+        request->t5577.block[1] = protocol->encoded_data >> 32;
+        request->t5577.block[2] = protocol->encoded_data;
         request->t5577.blocks_to_write = 3;
         result = true;
     }

diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
@@ -63,6 +63,15 @@ void name_generator_make_auto(char* name, size_t max_name_size, const char* pref
     name_generator_make_auto_datetime(name, max_name_size, prefix, NULL);
 }
 
+void name_generator_make_auto_basic(char* name, size_t max_name_size, const char* prefix) {
+    if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagRandomFilename)) {
+        name_generator_make_detailed_datetime(
+            name, max_name_size, prefix, NULL, momentum_settings.file_naming_prefix_after);
+    } else {
+        name_generator_make_random(name, max_name_size);
+    }
+}
+
 void name_generator_make_random_prefixed(
     char* name,
     size_t max_name_size,

diff --git a/lib/toolbox/name_generator.h b/lib/toolbox/name_generator.h
@@ -21,6 +21,9 @@ void name_generator_make_auto_datetime(
     const char* prefix,
     DateTime* custom_time);
 
+// Generate name without prefix in random names
+void name_generator_make_auto_basic(char* name, size_t max_name_size, const char* prefix);
+
 /** Generates random name
  *
  * @param      name           buffer to write random name

diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
@@ -2708,6 +2708,7 @@ Function,-,music_worker_set_volume,void,"MusicWorker*, float"
 Function,-,music_worker_start,void,MusicWorker*
 Function,-,music_worker_stop,void,MusicWorker*
 Function,+,name_generator_make_auto,void,"char*, size_t, const char*"
+Function,+,name_generator_make_auto_basic,void,"char*, size_t, const char*"
 Function,+,name_generator_make_auto_datetime,void,"char*, size_t, const char*, DateTime*"
 Function,+,name_generator_make_detailed,void,"char*, size_t, const char*"
 Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, DateTime*, _Bool"