Merge branch 'master' into master

diff --cc CHANGELOG.md
index f10ef4e24f6f79a824839ed8e58e165090fdecae,7f5c4542548bdfa072a567f4025761c3c7471628..3c9f29d994e6420fdd1de0905e015745b1caab8c
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,7 -19,7 +19,8 @@@ This project uses the changelog in acco
  - Changed TLV parser messages to more convenient (Merlok)
  - Rewritten Legic Prime reader (`hf legic reader`, `write` and `fill`) - it is using xcorrelation now (AntiCat)
  - `hf 14a` commands works via argtable3 commandline parsing library (Merlok)
 +- HID LF operations on firmware updated for complete native support of long (>37 bit) HID tags (grauerfuchs)
+ - Changed Legic Prime tag simulator (`hf legic sim`) to run from 212 kHz SSP clock for better reliability (AntiCat)
  
  ### Fixed
  - Changed start sequence in Qt mode (fix: short commands hangs main Qt thread) (Merlok)

diff --cc armsrc/lfops.c
Simple merge

diff --cc client/Makefile
Simple merge