From: iceman1001 Date: Fri, 12 Feb 2016 06:37:10 +0000 (+0100) Subject: FIX: @wllm-rbnt 's typo fixes X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a11ca2f3057416c07ca03b24ff16229f67d1b3f8?ds=sidebyside FIX: @wllm-rbnt 's typo fixes --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 49a7994c..0f1863f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ of stream transmissions (marshmellow) - Added `[l] ` option to data printdemodbuffer - Adjusted lf awid clone to optionally clone to Q5 tags - Adjusted lf t55xx detect to find Q5 tags (t5555) instead of just t55x7 -- Adjusted all lf NRZ demods - works more acurately and consistantly (as long as you have strong signal) +- Adjusted all lf NRZ demods - works more accurately and consistently (as long as you have strong signal) - Adjusted lf pskindalademod to reduce false positive reads. - Small adjustments to psk, nrz, and ask clock detect routines - more reliable. - Adjusted lf em410x em410xsim to accept a clock argument @@ -49,7 +49,7 @@ of stream transmissions (marshmellow) - Adjusted timings for t55xx commands. more reliable now. (marshmellow & iceman) - `lf cmdread` adjusted input methods and added help text (marshmellow & iceman) - changed `lf config t ` to be 0 - 128 and will trigger on + or - threshold value (marshmellow) -- `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to muliple pages for the larger tags yet) +- `hf iclass dump` cli options - can now dump AA1 and AA2 with different keys in one run (does not go to multiple pages for the larger tags yet) - Revised workflow for StandAloneMode14a (Craig Young) - EPA functions (`hf epa`) now support both ISO 14443-A and 14443-B cards (frederikmoellers) - 'hw version' only talks to ARM at startup, after that the info is cached. (pwpiwi) diff --git a/armsrc/hitag2.c b/armsrc/hitag2.c index 1147cb8d..aef28e78 100644 --- a/armsrc/hitag2.c +++ b/armsrc/hitag2.c @@ -414,7 +414,7 @@ static void hitag_reader_send_bit(int bit) { // Binary puls length modulation (BPLM) is used to encode the data stream // This means that a transmission of a one takes longer than that of a zero - // Enable modulation, which means, drop the the field + // Enable modulation, which means, drop the field HIGH(GPIO_SSC_DOUT); // Wait for 4-10 times the carrier period @@ -444,7 +444,7 @@ static void hitag_reader_send_frame(const byte_t* frame, size_t frame_len) } // Send EOF AT91C_BASE_TC0->TC_CCR = AT91C_TC_SWTRG; - // Enable modulation, which means, drop the the field + // Enable modulation, which means, drop the field HIGH(GPIO_SSC_DOUT); // Wait for 4-10 times the carrier period while(AT91C_BASE_TC0->TC_CV < T0*6); diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c index 70c18aba..a46b7741 100644 --- a/client/cmdhficlass.c +++ b/client/cmdhficlass.c @@ -1212,7 +1212,7 @@ int CmdHFiClass_loclass(const char *Cmd) { PrintAndLog("f Bruteforce iclass dumpfile"); PrintAndLog(" An iclass dumpfile is assumed to consist of an arbitrary number of"); PrintAndLog(" malicious CSNs, and their protocol responses"); - PrintAndLog(" The the binary format of the file is expected to be as follows: "); + PrintAndLog(" The binary format of the file is expected to be as follows: "); PrintAndLog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); PrintAndLog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); PrintAndLog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); diff --git a/client/loclass/main.c b/client/loclass/main.c index d1b0359b..95112f7d 100644 --- a/client/loclass/main.c +++ b/client/loclass/main.c @@ -69,7 +69,7 @@ int showHelp() prnlog("-h Show this help"); prnlog("-f Bruteforce iclass dumpfile"); prnlog(" An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses"); - prnlog(" The the binary format of the file is expected to be as follows: "); + prnlog(" The binary format of the file is expected to be as follows: "); prnlog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); prnlog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); prnlog(" <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>"); diff --git a/common/usb_cdc.c b/common/usb_cdc.c index 049cb8cf..79f34979 100644 --- a/common/usb_cdc.c +++ b/common/usb_cdc.c @@ -363,7 +363,7 @@ uint32_t usb_write(const byte_t* data, const size_t len) { cpt = MIN(length, AT91C_EP_IN_SIZE-1); length -= cpt; while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++; - // Wait for the the first bank to be sent + // Wait for the first bank to be sent while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) { if (!usb_check()) return length; }