github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

lf config s update

Browse source
This commit is contained in:
mwalker33 2019-09-30 19:41:25 +10:00
commit f5d7963780
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/lfsampling.c
View file

@ -147,7 +147,6 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
uint32_t sample_total_numbers = 0; uint32_t sample_total_numbers = 0;
uint32_t sample_total_saved = 0; uint32_t sample_total_saved = 0;
uint32_t cancel_counter = 0; uint32_t cancel_counter = 0;
uint32_t samples_skipped = 0;
uint16_t checker = 0; uint16_t checker = 0;
@ -181,8 +180,8 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
trigger_threshold = 0; trigger_threshold = 0;
if (samples_to_skip > samples_skipped) { if (samples_to_skip > 0) {
samples_skipped++; samples_to_skip--;
continue; continue;
} }
@ -249,7 +248,7 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
* @return number of bits sampled * @return number of bits sampled
*/ */
uint32_t DoAcquisition_default(int trigger_threshold, bool silent) { uint32_t DoAcquisition_default(int trigger_threshold, bool silent) {
return DoAcquisition(1, 8, 0, trigger_threshold, silent, 0, 0,0); return DoAcquisition(1, 8, 0, trigger_threshold, silent, 0, 0, 0);
} }
uint32_t DoAcquisition_config(bool silent, int sample_size) { uint32_t DoAcquisition_config(bool silent, int sample_size) {
return DoAcquisition(config.decimation return DoAcquisition(config.decimation
@ -263,7 +262,7 @@ uint32_t DoAcquisition_config(bool silent, int sample_size) {
} }
uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after) { uint32_t DoPartialAcquisition(int trigger_threshold, bool silent, int sample_size, uint32_t cancel_after) {
return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after,0); return DoAcquisition(1, 8, 0, trigger_threshold, silent, sample_size, cancel_after, 0);
} }
uint32_t ReadLF(bool activeField, bool silent, int sample_size) { uint32_t ReadLF(bool activeField, bool silent, int sample_size) {

4
client/cmdlf.c
View file

@ -441,7 +441,7 @@ int CmdLFSetConfig(const char *Cmd) {
cmdp += 2; cmdp += 2;
break; break;
case 's': case 's':
samples_to_skip = param_get32ex(Cmd,cmdp+1,0,10); samples_to_skip = param_get32ex(Cmd, cmdp + 1, 0, 10);
cmdp+=2; cmdp+=2;
break; break;
default: default:
@ -457,7 +457,7 @@ int CmdLFSetConfig(const char *Cmd) {
//Bps is limited to 8 //Bps is limited to 8
if (bps >> 4) bps = 8; if (bps >> 4) bps = 8;
sample_config config = { decimation, bps, averaging, divisor, trigger_threshold,samples_to_skip }; sample_config config = { decimation, bps, averaging, divisor, trigger_threshold, samples_to_skip };
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_SAMPLING_SET_CONFIG, (uint8_t *)&config, sizeof(sample_config)); SendCommandNG(CMD_LF_SAMPLING_SET_CONFIG, (uint8_t *)&config, sizeof(sample_config));