RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 16:26:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
6771 commits 3 branches 14 tags 86 MiB
Commit graph

4247 commits

Author SHA1 Message Date
t0m4 0a1b2698c9 Code review 2019-07-07 14:00:13 +02:00
t0m4 88df59722e Code cleaning 2019-07-07 12:10:51 +02:00
t0m4 95fd247e10 Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags 2019-07-07 10:52:00 +02:00
iceman1001 959a2a9c87 mysterious keys #issue 839 offical repo 2019-07-06 11:16:39 -04:00
Philippe Teuwen e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Victor 773845f411 Print help if unknown arg for hitag reader/writer 2019-07-04 22:12:48 +01:00
Iceman ae4c3374cb
Update default_keys.dic 
More keys from 6b6bafed54
 2019-07-04 12:33:01 +02:00
Slurdge 7205a910c5 Add compiler name in [CLIENT] section 2019-07-03 16:08:09 +02:00
Iceman 3938933c63
Update default_keys.dic 
from mct app pr.
 2019-06-28 15:50:19 +02:00
Philippe Teuwen 0eea50f5a0 Add support for compilation on RaspberryPiZero (armv6) 
More generally, add support for platforms with atomics, which not really linked to
architecture but compiler features. This may also help on some mips for example.
 2019-06-26 00:12:32 +02:00
iceman1001 c6d245b843 fix: syntax erros in luascripts 2019-06-23 08:13:17 -04:00
Jacopo Jannone 7e1d4a54ad Fix syntax errors with Calypso & 14443b Lua 2019-06-23 11:53:48 +02:00
iceman1001 7961ff982d unique and added some more keys from @korsehindi 2019-06-15 12:05:40 -04:00
iceman1001 f11500f60f revert and double check empty buffers 2019-06-13 15:13:41 -04:00
Philippe Teuwen 2382ad551b update msleep in deprecated-hid-flasher 2019-06-12 13:57:02 -07:00
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Iceman cb07f2f807
Merge pull request #210 from javastraat/master 
<added keys for Transportes Insular La Palma (Public Transport)>
 2019-06-09 11:23:28 +02:00
iceman1001 db578e9f5f fix: read14a.lua - wrong call 2019-06-09 04:59:16 -04:00
Albert Einstein b344e7c133 <added keys for Transportes Insular La Palma (Public Transport)> 2019-06-09 10:27:20 +02:00
iceman1001 e7d00dce83 chg: upgrade always possible 2019-06-08 15:26:05 -04:00
iceman1001 fd2ac38ac3 chg: lf em 4x05_info 2019-06-08 15:24:12 -04:00
iceman1001 a6fc729f22 style 2019-06-08 10:11:18 -04:00
iceman1001 7fd7b539be textual 2019-06-08 10:10:04 -04:00
iceman1001 d3f26fe7b7 style 2019-06-08 10:09:13 -04:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen f7dfd2a1f2 Fix arg names mismatches between decl & def 2019-06-07 21:26:03 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 7a06a77283 text of data setdebugmode 2019-06-06 11:34:33 +02:00
Philippe Teuwen 1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
Philippe Teuwen d7614684f8 Make sure standalone modes can be launched when connected on USB without client 2019-06-02 23:20:02 +02:00
Philippe Teuwen 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen 9b668e3827 client Makefile doesn't depend on platform specs anymore 2019-06-01 01:03:34 +02:00
Philippe Teuwen 5e83fcbd58 client Makefile doesn't use PLATFORM_DEFS anymore 2019-06-01 00:59:11 +02:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00
Philippe Teuwen 501919a34a flashmem: text 2019-05-31 23:08:27 +02:00
iceman1001 ecc62add26 fix return check 2019-05-31 14:07:07 -04:00
iceman1001 0a3791ea3a chg: 'lualibs - 14a minor adaptation 2019-05-31 19:10:01 +02:00
iceman1001 a8b09eba31 chg: 'hf mfu info' - typo 2019-05-31 19:06:22 +02:00
iceman1001 430742a3b6 chg: 'mem info - public key' 2019-05-31 11:25:49 +02:00
iceman1001 b378d373ad chg: USB doesnt need extra delay 2019-05-29 04:00:02 -04:00
iceman1001 d2fb18f648 chg: 'hf mf dump' - remove debug statements 2019-05-29 08:55:12 +02:00
iceman1001 cee2fc7a34 hf mf rdbl - uses NG 2019-05-28 13:20:56 -04:00
iceman1001 ffc24d672b keys 2019-05-28 13:18:33 -04:00
iceman1001 caee0a1f6a key 2019-05-28 08:00:33 -04:00
iceman1001 0004b1075e chg: lf cotag demod - adjusted error trigger 2019-05-28 05:23:48 -04:00
iceman1001 8ed6c18497 style 2019-05-28 05:22:38 -04:00
iceman1001 74fb740c21 fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG 2019-05-28 05:15:12 -04:00
iceman1001 548d6429ed return codes 2019-05-27 09:15:53 -04:00
iceman1001 53f2058c7a chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG 2019-05-27 07:46:27 -04:00
iceman1001 58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
iceman1001 b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
iceman1001 ade858b4f5 fix: script run read_pwd_mem - wrong offsets for -i/-t/-m 2019-05-25 15:56:56 -04:00
iceman1001 6df94abf71 textual 2019-05-25 13:32:54 -04:00
iceman1001 37c30c0395 fix: askdemod - enhances which solves some viking demod errors 2019-05-25 13:27:43 -04:00
iceman1001 abc66484e5 fix: 14a raw commands - running lua scripts works again for MIX/NG frames 2019-05-25 09:06:44 -04:00
iceman1001 2d972f8cb9 style 2019-05-24 10:31:31 -04:00
iceman1001 20b39d55f2 fix: lf presco - show helptexts again 2019-05-24 10:27:21 -04:00
iceman1001 10fc50aff8 fix: lf viking demod - works :) 2019-05-24 09:48:31 -04:00
iceman1001 0d1438d156 chg: lf psksim - uses NG 2019-05-24 09:11:30 -04:00
iceman1001 80a91eba11 chg: need to free some 2019-05-24 07:22:50 -04:00
iceman1001 e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001 98b75e43a5 fix: lf t55xx wipe 2019-05-24 06:22:43 -04:00
iceman1001 d32c4d5267 chg: resized flashmem offset for dictionaries to fit 2019-05-23 18:50:24 -04:00
iceman1001 594398ef73 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 18:32:21 -04:00
iceman1001 9426f61922 chg: lf sim - free mem? 2019-05-23 18:32:17 -04:00
iceman1001 ed9a5e6d6f chg: textual 2019-05-23 18:31:56 -04:00
Iceman 16c99b9fac
Merge pull request #202 from javastraat/master 
modified help in hf mf fchk and chk & some extra keys
 2019-05-23 23:10:12 +02:00
iceman1001 1ca50fd3b2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 17:07:18 -04:00
iceman1001 c13e2f09a1 chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG 2019-05-23 17:07:12 -04:00
Albert Einstein 38d0b37e1e added keys 2019-05-23 21:08:52 +02:00
Albert Einstein 684e93d61a added keys 2019-05-23 21:06:15 +02:00
Albert Einstein de694d7cca modified help in fchk and chk 2019-05-23 21:04:48 +02:00
Philippe Teuwen fda181890c nested structs on the sender, for more lean packet size computation 2019-05-23 20:54:21 +02:00
iceman1001 263d662783 chg: lf fsksim - uses NG 2019-05-23 13:16:06 -04:00
iceman1001 0564931450 fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field 2019-05-23 10:51:19 -04:00
iceman1001 f8dbf6138a fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data 2019-05-23 06:12:20 -04:00
iceman1001 78d7077f01 chg: more keys 2019-05-23 05:02:28 -04:00
Philippe Teuwen e0c9e2b0d1 rework usart RX timings 2019-05-22 23:30:52 +02:00
iceman1001 794d109f30 chg: lf t55 - fixes / read block uses NG 2019-05-22 11:59:39 -04:00
iceman1001 150fc205b2 chg - returns 2019-05-22 10:10:48 -04:00
iceman1001 1e4f7b7f68 chg - returns 2019-05-22 10:07:27 -04:00
iceman1001 160110f56d chg - returns 2019-05-22 09:57:29 -04:00
iceman1001 8266514ef0 chg - returns 2019-05-22 09:53:10 -04:00
iceman1001 da2c8d0292 chg - returns 2019-05-22 09:48:57 -04:00
iceman1001 f8749c9ee9 chg - returns 2019-05-22 09:47:03 -04:00
iceman1001 09b66e500d chg - returns 2019-05-22 09:46:40 -04:00
iceman1001 66361ec6a3 chg - returns 2019-05-22 09:44:55 -04:00
iceman1001 e191dc777d chg - returns 2019-05-22 09:43:39 -04:00
iceman1001 24458e1392 chg: lf search - works again 2019-05-22 09:40:58 -04:00
iceman1001 461a90eeaf chg: lf em - and even more return codes 2019-05-22 09:28:12 -04:00
iceman1001 420ca1b235 more returns 2019-05-22 09:04:38 -04:00
iceman1001 486211599d chg: return codes 2019-05-22 08:57:08 -04:00
iceman1001 d546f39534 chg: cmdlft55xx return codes 2019-05-22 08:48:23 -04:00
iceman1001 9925159bcd chg: return codes 2019-05-22 08:33:33 -04:00
iceman1001 ad394a2d6b chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data. 2019-05-22 08:32:30 -04:00
iceman1001 750739efe4 chg: not fatal 2019-05-22 05:59:43 -04:00
iceman1001 69bab29834 chg: params 2019-05-22 05:58:16 -04:00
Philippe Teuwen 13b461cab2 usart txrx: wait reply depends on rx waittime 2019-05-22 00:06:51 +02:00
Philippe Teuwen fe6cbfc8fd baudrates & btfactory 2019-05-20 21:37:50 +02:00
iceman1001 cbc42336d6 fix: lf nedap sim - error when adding parity 2019-05-20 15:24:47 -04:00
iceman1001 f0c173ccba style 2019-05-20 10:50:23 -04:00
iceman1001 178c922218 chg: lf read - now uses NG 2019-05-20 10:48:51 -04:00
iceman1001 ab8826fed8 chg: lf config - uses NG 2019-05-20 09:50:04 -04:00
iceman1001 d7f1ab2175 chg: lf cmdread - now uses NG 2019-05-20 09:15:45 -04:00
iceman1001 ce4198f5f2 new pwds - white cloner (mwalker) 2019-05-20 07:11:16 -04:00
iceman1001 983e63d82f hw commands - uses NG 2019-05-20 04:28:34 -04:00
Philippe Teuwen f0ec37b742 fix hw connect parsing 2019-05-18 21:35:50 +02:00
iceman1001 d4ad0da335 textual, 2019-05-18 18:51:05 +02:00
Philippe Teuwen 413440fdab hw connect: detect invalid usages 2019-05-18 18:45:15 +02:00
Philippe Teuwen e6d64df6d0 Fixing segfault 2019-05-18 18:41:24 +02:00
iceman1001 faf3a95a45 chg: 'hw connect' - new params. p <port> b <baudrate> 
a correct call is now

hw connect p com6 b 115200

This will set baudrate between Client and BT White Dongle.
 2019-05-18 18:06:14 +02:00
iceman1001 24a4d053b3 chg: prompt now shows which channel is used. 2019-05-18 18:02:30 +02:00
iceman1001 d5802ff766 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-18 17:59:48 +02:00
iceman1001 687f7f3697 consistent output 2019-05-18 17:56:03 +02:00
iceman1001 cba5d18124 use MIX 2019-05-18 17:55:11 +02:00
iceman1001 a4f4104075 textual 2019-05-18 17:53:08 +02:00
Philippe Teuwen 10dc959f34 btfactory: reset role as well 2019-05-18 17:47:29 +02:00
Philippe Teuwen e9eb764358 Fix MCK in usart, our MCK is 16*12/2/2 2019-05-16 20:12:00 +02:00
Philippe Teuwen b5e4a60a15 timeout reconfiguration: flag was never cleared and some more changes: 
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
 2019-05-16 12:35:40 +02:00
iceman1001 9b85f80321 chg: the reconnect now works good on ubuntu and mingw (for me :)) 
chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
 2019-05-16 08:02:56 +02:00
iceman1001 c125b3e9fe chg: less nesting 2019-05-16 07:33:02 +02:00
Philippe Teuwen b4e8be82f4 remove spMutex, use atomic test&set instead 2019-05-16 00:29:30 +02:00
iceman1001 bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001 50c59fb6b2 chg: cident - uses NG 2019-05-15 07:03:19 -04:00
iceman1001 65ff4f0e92 chg: hf mf setmod - uses NG 2019-05-15 06:52:22 -04:00
iceman1001 0edf5500fe mix 2019-05-15 12:02:22 +02:00
iceman1001 0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen bc090857b8 text 2019-05-15 08:57:15 +02:00
iceman1001 1e31455474 textual 2019-05-15 02:18:23 -04:00
Philippe Teuwen 8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
iceman1001 586e2ebabd textual 2019-05-14 11:42:58 -04:00
iceman1001 36ecc4be97 style 2019-05-14 11:42:17 -04:00
Iceman eef53a853a
Merge pull request #196 from mcd1992/guikeys 
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
 2019-05-14 17:38:35 +02:00
iceman1001 ace4798c4d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 17:13:54 +02:00
iceman1001 8bfe669430 fix: 'script run legic' - at last, it now saves in EML and BIN format. 2019-05-14 17:13:29 +02:00
Aaron McDaniel 1186753bf6 Added clamp to PageDown case in plot GUI and updated changelog 2019-05-14 10:12:46 -05:00
Philippe Teuwen 1147c9faf8 Use ARRAYLEN 2019-05-14 12:51:45 +02:00
iceman1001 da09131aa3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 12:37:02 +02:00
iceman1001 d792f015a2 fix: 'script run legic' - bytes was in string format, 2019-05-14 12:36:37 +02:00
Philippe Teuwen 62cf4ad8a7 fancy INPLACE 2019-05-14 12:35:25 +02:00
iceman1001 48c71aeef6 fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193 
if binary file exists,  it will try to increase filename counter to find a non-existing name.
 2019-05-14 11:54:25 +02:00
iceman1001 28398222e6 chg: 'hf tune' - now with prefix :) 2019-05-14 11:18:33 +02:00
Iceman d4eb91fa43
Merge pull request #195 from mcd1992/guikeys 
Added paged moving to the plot GUI
 2019-05-14 11:18:00 +02:00
Philippe Teuwen d535d5a378 hf tune: can be interrupted by keyboard 2019-05-14 08:40:22 +02:00
Philippe Teuwen 42d025d01a Slight rework of hw tune 2019-05-14 08:29:24 +02:00
Philippe Teuwen c281f71f59 hf tune: group commands 2019-05-14 08:25:26 +02:00
mcd1992 528da6ec32 Added paged moving to the plot GUI 2019-05-13 19:39:27 -05:00
Philippe Teuwen 7ed7a9de40 Rework hf tune to make it synchronous (needed for rdv4) 2019-05-14 00:37:03 +02:00
Philippe Teuwen 995d782bb0 CMD_READER_HITAG requires always a hitag_data struct 
used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
 2019-05-13 23:15:07 +02:00
Philippe Teuwen ff7cd9d84d CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes of data. 
used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
  [...]
  uint64_t ui64Key = bytes_to_num(datain, 6);

=> we should always send 6 bytes for "bytes_to_num"
 2019-05-13 23:11:05 +02:00
Philippe Teuwen e4f00c52da Fix #194 Graph window loops to end if you scroll left past 0 2019-05-13 20:34:02 +02:00
iceman1001 6a6902e57d chg: luascripts now uses t55xx write NG frame format 2019-05-13 16:51:26 +02:00
iceman1001 801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
iceman1001 d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen 0e827b1083 Fix CMD_T55XX_WRITE_BLOCK expecting data and sending NULL 2019-05-13 12:21:09 +02:00
Philippe Teuwen 6caf571a44 NG->MIX for hitag cmds where the zeroes were actual args 2019-05-13 10:35:30 +02:00
Philippe Teuwen 4929b16bf9 style 2019-05-12 20:38:03 +02:00
Philippe Teuwen a2c70e5481 Add .dic to gitattributes for LF, remove existing CR 2019-05-12 20:37:51 +02:00
Chris 41db59f028 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-12 18:45:13 +02:00
Chris d44a5712a7 add: default key for library / parking 2019-05-12 18:43:20 +02:00
Philippe Teuwen 80a71c59d4
Merge pull request #186 from uhei/hexdump 
Cmdtrace: Show trace ouput in hexdump format
 2019-05-10 19:27:45 +02:00
Philippe Teuwen b6b20e246c
Merge pull request #187 from uhei/macos-readline 
client/Makefile: use brew libreadline on macOS
 2019-05-10 19:07:03 +02:00
Philippe Teuwen 3412e9d8c5 Capabilities versionning, would also detect platform struct pack issues 2019-05-10 19:00:18 +02:00
Philippe Teuwen 5aed3e04c9
Merge pull request #190 from uhei/memcpy-bo 
client/comms.c: fix buffer overflow
 2019-05-10 18:47:39 +02:00
Uli Heilmeier a1c24c6c7d Cmdtrace: Show trace ouput in hexdump format 
Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.

Format defined at https://www.kaiser.cx/pcap-iso14443.html
 2019-05-10 16:03:39 +02:00
Uli Heilmeier 0119e13ff3 client/comms.c: fix buffer overflow 
Don't copy more bytes into pm3_capabilities as its size.

Fix: RfidResearchGroup/proxmark3#189
 2019-05-10 14:50:09 +02:00
Uli Heilmeier 94b782ee10 client/Makefile: use brew libreadline on macOS 
Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
 2019-05-10 12:24:38 +02:00
Philippe Teuwen 39c7941930 style 2019-05-09 20:20:54 +02:00
Philippe Teuwen 2bee7e12f6 Fix hf mfu dump on ULC: UID in filename 2019-05-09 20:05:12 +02:00
Philippe Teuwen 7195ce9b27 remove iso15 getUID timeout msg 2019-05-09 13:25:14 +02:00
Philippe Teuwen 730927a81d NG->MIX for few cmds where the zeroes were actual args 
CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
 2019-05-09 12:33:17 +02:00
Philippe Teuwen 84f696451d units 2019-05-09 01:07:34 +02:00
Philippe Teuwen 2c10482279 all LF sim: client waits till button pressed 2019-05-09 00:08:59 +02:00
Philippe Teuwen ddd62e2848 text 2019-05-08 22:45:20 +02:00
Philippe Teuwen d088ed4232 fast mode on LF techs using t55xx write block 2019-05-08 22:43:35 +02:00
Philippe Teuwen 962f45e3e6 mf nested: remove compilation warning 2019-05-08 22:02:14 +02:00
Philippe Teuwen 77398550b0 fast mode on Mifare emulator upload 2019-05-08 21:54:15 +02:00
Philippe Teuwen c72e74275d fast mode on epa pace replay 2019-05-08 20:13:07 +02:00
Philippe Teuwen e7362d5e6a fast mode on legic cmds 2019-05-08 19:48:53 +02:00
Philippe Teuwen 93171e3d74 fast mode on sc upgrade, no much diff 2019-05-08 19:34:11 +02:00
Philippe Teuwen 2f71d951e1 iclass: avoid last ping in fast modes 2019-05-08 19:16:37 +02:00
Philippe Teuwen 2f2796be7e Fix deprecated-hid-flasher 2019-05-08 13:32:17 +02:00
Philippe Teuwen 4fd520c6d4 Introduce SendCommandBL 2019-05-08 13:31:58 +02:00
Philippe Teuwen e93b4e3c61 Remove usb_cmd refs 2019-05-08 11:17:14 +02:00
Philippe Teuwen c190ac0955 Hide conn error when hw reset, as suggested by @iceman 2019-05-08 11:14:29 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
Philippe Teuwen f49d7e6d39 remove SendCommand 2019-05-08 01:32:32 +02:00
Philippe Teuwen c867b3bc9a Add cmd: usart btpin to change add-on BT PIN 2019-05-08 01:24:46 +02:00
Philippe Teuwen df2203d9c3 hw command text 2019-05-08 00:58:36 +02:00
iceman1001 964006fd21 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-08 00:17:52 +02:00
iceman1001 01efa71e27 use NG 2019-05-08 00:10:03 +02:00
iceman1001 8ebd5e0579 textual, fixes to legic commands used. Needs testing 2019-05-08 00:07:20 +02:00
Philippe Teuwen 02ea378e38 Wow, two improbable bugs were cancelling each other 2019-05-08 00:02:08 +02:00
iceman1001 5b087a053c fix: script run legic_buffer2card - correct params for write command 2019-05-07 23:53:06 +02:00
iceman1001 a5f19cde79 textual 2019-05-07 23:46:37 +02:00
iceman1001 81feb56003 text 2019-05-07 23:44:46 +02:00
iceman1001 8548eda9bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-07 23:41:56 +02:00
iceman1001 d313804e78 textual 2019-05-07 23:41:41 +02:00
Philippe Teuwen 920affeb44 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  textual
 2019-05-07 23:39:47 +02:00
Philippe Teuwen c505a59e3d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  refactor NG
  refactor
  textual
  refactored NG
  textual
  refactoring NG
  refactoring
  15 - use NG and refactoring
  textual
  using MIX
  textual
  textual
  textual
  Update .gitignore
  chg: script run didump - helptexts
  fix:  rename to match the new file
  chg: script run didump - use MIX
  chg: hw ping - shouldnt be converted yet..
 2019-05-07 23:38:28 +02:00
iceman1001 9c95a2e8aa textual 2019-05-07 23:37:15 +02:00
Philippe Teuwen 2f1061f95b rework ping 2019-05-07 23:35:09 +02:00
iceman1001 89e25a4d1d textual 2019-05-07 23:34:05 +02:00
iceman1001 a59f2a1b60 refactor NG 2019-05-07 23:27:16 +02:00
iceman1001 e1bb05b35e refactor 2019-05-07 23:21:56 +02:00
iceman1001 7ccff2db4a textual 2019-05-07 23:19:22 +02:00
iceman1001 e799717880 refactored NG 2019-05-07 23:12:58 +02:00
iceman1001 6b472f6c56 textual 2019-05-07 23:04:29 +02:00
iceman1001 3c533db308 refactoring NG 2019-05-07 22:59:29 +02:00
iceman1001 9bf961cb8a refactoring 2019-05-07 22:48:18 +02:00
iceman1001 6fbd45aaed 15 - use NG and refactoring 2019-05-07 22:46:00 +02:00
iceman1001 b52a4a53b0 textual 2019-05-07 22:33:51 +02:00
iceman1001 b73146533a using MIX 2019-05-07 22:33:26 +02:00
iceman1001 c81bce6bf2 textual 2019-05-07 22:15:26 +02:00
iceman1001 2af7255f62 textual 2019-05-07 22:12:18 +02:00
iceman1001 75325aef86 textual 2019-05-07 22:08:46 +02:00
iceman1001 07b6535f7e chg: script run didump - helptexts 2019-05-07 22:03:11 +02:00
iceman1001 c99845b3d1 fix: rename to match the new file 2019-05-07 21:56:05 +02:00
iceman1001 df555be792 chg: script run didump - use MIX 2019-05-07 21:49:45 +02:00
iceman1001 c180c8df20 chg: hw ping - shouldnt be converted yet.. 2019-05-07 21:35:22 +02:00
Philippe Teuwen bf0ab55833 text 2019-05-07 20:47:05 +02:00
Philippe Teuwen 532dbf28a1 let OpenPm be responsible of setting session.pm3_present 2019-05-07 20:37:23 +02:00
Philippe Teuwen 061321c353 flash still need old cmds 2019-05-07 20:13:01 +02:00
Philippe Teuwen 290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
iceman1001 39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
iceman1001 0c20c1a9d1 convert to MIX for simple send commands. 2019-05-07 19:03:25 +02:00
iceman1001 119b1e7c81 chg: mem commands - sendMIX 2019-05-07 18:50:45 +02:00
iceman1001 cb991b4d2c make sure CloseProxmark sets pm3_present. 2019-05-07 17:31:07 +02:00
iceman1001 7eb7685559 cleaning up, simplify 2019-05-07 15:57:22 +02:00
iceman1001 f2a954b422 chg: save serial port name as copy. 2019-05-07 15:40:01 +02:00
iceman1001 43db2a50e2 cleaning 2019-05-07 14:48:53 +02:00
iceman1001 f60977695a cleaning up 2019-05-07 14:41:20 +02:00
iceman1001 b91e21edde better output from setting prompt, cursor is still inside ... 2019-05-07 12:29:26 +02:00
iceman1001 f85280ad41 fix: 'hw connect' - if pm3 client was in offline more to start with, check.. 2019-05-07 12:28:17 +02:00
Philippe Teuwen a20392edf3 change offline prompt asap 2019-05-07 12:18:51 +02:00
Philippe Teuwen de54d35d5f unplug detection 2019-05-07 12:11:36 +02:00
iceman1001 f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001 bb19e42bbd textual 2019-05-07 11:44:29 +02:00
iceman1001 fb7445a027 chg: 'hw connect' - make port optional. Reused previous serial port 2019-05-07 11:42:36 +02:00
iceman1001 61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
Philippe Teuwen 1c70163605 reconnect fast 2019-05-07 01:06:01 +02:00
Philippe Teuwen ec5876ba35 Linux: Detect soon when pm3 is unplugged 2019-05-06 23:25:01 +02:00
iceman1001 fa8bd85016 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-06 22:42:01 +02:00
iceman1001 29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001 52396e8b5a textual 2019-05-06 22:40:06 +02:00
Philippe Teuwen c6b8c0c472 manual Makefile style (as some tabs need to be preserved) 2019-05-06 20:45:59 +02:00
iceman1001 dd82c42588 fix #185 - Only -mno-ms-bitfields on MINGW (@doegox) 2019-05-06 15:37:40 +02:00
iceman1001 3a902a7a4c chg: add some helptexts 2019-05-06 14:38:56 +02:00
iceman1001 cffd14a96b chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :) 
chg: renamed thread
chg: easier if-statements for USART
 2019-05-06 14:11:23 +02:00