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

textual

Browse source
This commit is contained in:
Philippe Teuwen 2019-09-24 14:59:05 +02:00
commit 891a079989
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/appmain.c
View file

@ -206,7 +206,7 @@ void MeasureAntennaTuning(void) {
LEDsoff(); LEDsoff();
} }
// Measure HF in miliVolt // Measure HF in milliVolt
uint16_t MeasureAntennaTuningHfData(void) { uint16_t MeasureAntennaTuningHfData(void) {
uint16_t volt = 0; uint16_t volt = 0;
uint16_t avg = AvgAdc(ADC_CHAN_HF); uint16_t avg = AvgAdc(ADC_CHAN_HF);
@ -220,7 +220,7 @@ uint16_t MeasureAntennaTuningHfData(void) {
return volt; return volt;
} }
// Measure LF in miliVolt // Measure LF in milliVolt
uint32_t MeasureAntennaTuningLfData(void) { uint32_t MeasureAntennaTuningLfData(void) {
return (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10; return (MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10;
} }
@ -1451,7 +1451,7 @@ static void PacketReceived(PacketCommandNG *packet) {
switch (packet->data.asBytes[0]) { switch (packet->data.asBytes[0]) {
case 1: // MEASURE_ANTENNA_TUNING_LF_START case 1: // MEASURE_ANTENNA_TUNING_LF_START
// Let the FPGA drive the low-frequency antenna around 125Khz // Let the FPGA drive the low-frequency antenna around 125kHz
FpgaDownloadAndGo(FPGA_BITSTREAM_LF); FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD); FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95);

5
client/cmdhf.c
View file

@ -60,11 +60,12 @@ static int usage_hf_sniff() {
} }
static int usage_hf_tune() { static int usage_hf_tune() {
PrintAndLogEx(NORMAL, "Usage: hf tune [<iter>]");
PrintAndLogEx(NORMAL, "Continuously measure HF antenna tuning."); PrintAndLogEx(NORMAL, "Continuously measure HF antenna tuning.");
PrintAndLogEx(NORMAL, "Press button or Enter to interrupt."); PrintAndLogEx(NORMAL, "Press button or Enter to interrupt.");
PrintAndLogEx(NORMAL, "Usage: hf tune [h] [<iter>]");
PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " <iter> - number of iterations (default: infinite)"); PrintAndLogEx(NORMAL, " h - This help");
PrintAndLogEx(NORMAL, " <iter> - number of iterations (default: 0=infinite)");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

12
client/cmdlf.c
View file

@ -191,15 +191,13 @@ static int usage_lf_find(void) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_lf_tune(void) { static int usage_lf_tune(void) {
PrintAndLogEx(NORMAL, "Continuously measure LF antenna tuning."); PrintAndLogEx(NORMAL, "Continuously measure LF antenna tuning at 125 kHz.");
PrintAndLogEx(NORMAL, "Press button or Enter to interrupt."); PrintAndLogEx(NORMAL, "Press button or Enter to interrupt.");
PrintAndLogEx(NORMAL, "Usage: lf tune [h] <0|1>"); PrintAndLogEx(NORMAL, "Usage: lf tune [h] [<iter>]");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h This help"); PrintAndLogEx(NORMAL, " h - This help");
PrintAndLogEx(NORMAL, " <> "); PrintAndLogEx(NORMAL, " <iter> - number of iterations (default: 0=infinite)");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, " lf tune = ");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -208,7 +206,7 @@ int CmdLFTune(const char *Cmd) {
if (cmdp == 'h') return usage_lf_tune(); if (cmdp == 'h') return usage_lf_tune();
int iter = param_get32ex(Cmd, 0, 0, 10); int iter = param_get32ex(Cmd, 0, 0, 10);
PrintAndLogEx(SUCCESS, "Measuring LF antenna, click button or press Enter to exit"); PrintAndLogEx(SUCCESS, "Measuring LF antenna at 125kHz, click button or press Enter to exit");
uint8_t mode[] = {1}; uint8_t mode[] = {1};
PacketResponseNG resp; PacketResponseNG resp;