Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

lib/flipper_application/elf/elf_file.h

@@ -98,8 +98,7 @@ bool elf_file_is_init_complete(ELFFile* elf);
 /**
  * @brief Get actual entry point for ELF file
  * @param elf_file 
- * @param args 
- * @return int32_t 
+ * @return void*
  */
 void* elf_file_get_entry_point(ELFFile* elf_file);
 
@@ -148,4 +147,4 @@ ElfProcessSectionResult elf_process_section(
 
 #ifdef __cplusplus
 }
-#endif
+#endif

lib/nfc/nfc.h

@@ -170,7 +170,7 @@ void nfc_set_fdt_listen_fc(Nfc* instance, uint32_t fdt_listen_fc);
  * @brief Set mask receive time.
  *
  * @param[in,out] instance pointer to the instance to be modified.
- * @param[in] mask_rx_time mask receive time, in carrier cycles.
+ * @param[in] mask_rx_time_fc mask receive time, in carrier cycles.
  */
 void nfc_set_mask_receive_time_fc(Nfc* instance, uint32_t mask_rx_time_fc);
 

lib/nfc/nfc_scanner.h

@@ -72,14 +72,14 @@ NfcScanner* nfc_scanner_alloc(Nfc* nfc);
 /**
  * @brief Delete an NfcScanner instance.
  *
- * @param[in,out] pointer to the instance to be deleted.
+ * @param[in,out] instance pointer to the instance to be deleted.
  */
 void nfc_scanner_free(NfcScanner* instance);
 
 /**
  * @brief Start an NfcScanner.
  *
- * @param[in,out] pointer to the instance to be started.
+ * @param[in,out] instance pointer to the instance to be started.
  * @param[in] callback pointer to the callback function (will be called upon a detection event).
  * @param[in] context pointer to the caller-specific context (will be passed to the callback).
  */
@@ -88,7 +88,7 @@ void nfc_scanner_start(NfcScanner* instance, NfcScannerCallback callback, void*
 /**
  * @brief Stop an NfcScanner.
  *
- * @param[in,out] pointer to the instance to be stopped.
+ * @param[in,out] instance pointer to the instance to be stopped.
  */
 void nfc_scanner_stop(NfcScanner* instance);