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

18413 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaka c871e435e4 fix implicit use of time() 2024-04-18 09:40:00 +02:00
Iceman 42d0cc04b1
Merge pull request #2354 from philicious/fix-typo-qt5-cmake 
Fix typo in cmake for qt5 detection
 2024-04-17 15:51:26 +02:00
iceman1001 45bf8801fd Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-04-17 12:37:12 +02:00
iceman1001 a6dfe052bd missmatching name 2024-04-17 12:36:33 +02:00
philicious c9a83b0222 missed in #2351 2024-04-16 23:07:22 +02:00
philicious c44992232e Update gitignore for CMake artifacts 2024-04-16 23:04:14 +02:00
Iceman 7857baa5f4
Merge pull request #2352 from philicious/fix-macosx-make-python312 
Fix building against Python3.12 on MacOS
 2024-04-16 22:39:11 +02:00
Iceman 9ebc753dd9
Merge pull request #2351 from philicious/fix-macosx-qt5-detection-cmake 
Fix homebrew Qt5 detection on MacOS also for cmake
 2024-04-16 22:37:13 +02:00
iceman1001 6cc9c435e0 fix #2350 updated the swig wrappers to swig version 4.2.1. Lets hope it solves the OSX issues 2024-04-16 22:35:10 +02:00
philicious bfaf440fb2 Fix building against Python3.12 on MacOS with make by prefering python3-embed over python3 (as CMakeLists.txt does) 2024-04-16 22:34:47 +02:00
philicious 41d808bf69 Fix homebrew Qt5 detection on MacOS also for cmake 2024-04-16 22:22:41 +02:00
Iceman 628ed5c96b
Merge pull request #2349 from philicious/fix-macosx-qt5-detection 
Fix homebrew Qt5 detection on MacOS
 2024-04-16 21:23:28 +02:00
philicious 87597835e6 Fix homebrew Qt5 detection on MacOS 2024-04-16 20:51:47 +02:00
Iceman ce61d94040
Merge pull request #2348 from jlitewski/plot_cursor_improvements 
Marker code cleanup
 2024-04-15 01:51:10 +02:00
Jacob Litewski 31bfa16b76 Marker code cleanup 2024-04-14 14:58:52 -04:00
Iceman 197baa4623
Merge pull request #2347 from jlitewski/plot_refactor 
Refactored Plot Annotations and some cleanup
 2024-04-14 12:19:16 +02:00
Jacob Litewski f2afbca6ec Refactored Plot Annotations and some cleanup 2024-04-13 23:03:35 -04:00
iceman1001 3c8b1317c2 deprecated hex2bin and bin2hex. Use data num instead 2024-04-13 11:30:26 +02:00
Iceman de7579ab00
Merge pull request #2345 from jlitewski/plot_gui_improvements 
Plot Improvements, Round 1
 2024-04-13 11:01:32 +02:00
iceman1001 500e10f3a5 text 2024-04-13 10:59:55 +02:00
iceman1001 6bc6ec23ce fix #2346 refactored the write loop before it assumed a full t55xx memory layout. Now handles block writes to individual parts 2024-04-13 10:59:07 +02:00
Jacob Litewski 0608a7c530 Minor Changes to the Operation Buffer Implementation 
Instead of being initialized as all zeros and showing changes if those values are not zero, it now has a copy of the Graph Buffer data, and will show changes if it's different from what's stored in the Graph Buffer.
 2024-04-12 08:34:05 -04:00
Jacob Litewski 6b72e39f51 Command Organization in cmddata.c 
Getting ready to do some refactoring!
 2024-04-11 20:06:36 -04:00
iceman1001 9a73e77d72 style 2024-04-11 22:08:25 +02:00
Iceman 2612b87f41
Merge pull request #2343 from p51d78th/master_mine 
Fix compile error from variable type declaration
 2024-04-11 19:20:29 +02:00
Jacob Litewski c2e43c3f46 Rough Implementation of the Operations Buffer 
The Operations Buffer is basically a buffer of changes to the Graph Buffer. Instead of writing all the changes to the Graph Buffer directly, I plan to have those changes written to the Operation Buffer, so you can visually see what would be changed before it's applied.
 2024-04-11 08:57:26 -04:00
Jacob Litewski 8e3efec3e2 Rename s_Buff to s_OverlayBuff 2024-04-11 08:46:46 -04:00
Jacob Litewski 3d2169b833 Cursor A graph scrolling implementation 
If Cursor A goes off the screen, it will reposition the window to place the cursor in the middle of it.
 2024-04-10 21:01:05 -04:00
David Driscoll f3d9423f70 Fix compile error from variable type declaration 2024-04-10 11:52:11 -04:00
iceman1001 6a7e70ad26 style 2024-04-10 14:26:05 +02:00
Iceman 8426beb173
Merge pull request #2342 from jlitewski/plot_point_mods 
Plot improvements
 2024-04-10 08:29:17 +02:00
jlitewski ad01195a04 Plot improvements 
- Added hotkeys to move the yellow/purple cursor around
- Added hotkeys to manually increment/decrement a value from a plot point
-- This is currently the point where the yellow cursor is at
 2024-04-09 22:47:40 -04:00
iceman1001 befb2644d2 dont hook signal in MINGW environments like proxspace 2024-04-09 15:30:34 +02:00
iceman1001 9b8cf1e323 the waitforResponseTimeoutW fct will lock the client in situations like sniffing and if the device locks up there is no way to exit nice. This fix will look for life signs from the device. if lost, we will break. Allowing for the client to handle it better 2024-04-07 23:50:58 +02:00
iceman1001 4e540053e9 style 2024-04-07 11:38:51 +02:00
iceman1001 9ba8937f3c text 2024-04-07 11:32:25 +02:00
iceman1001 ab984c5fdf minor style 2024-04-06 21:11:07 +02:00
iceman1001 a68a5a8825 if using readline , the CTRL-C should now handle it a bit more nicer. Especially the pm3 history file should be flushed with the upside you dont loose all your commands you issued and mistakingly pressed CTRL-C. for the linenoice and Win32, you still have this issue. 2024-04-06 20:57:54 +02:00
iceman1001 7c755e20bc parentheses miss 2024-04-06 18:53:04 +02:00
iceman1001 27735355cd initial text changes 2024-04-06 15:48:41 +02:00
Iceman 2110af617a
Merge pull request #2340 from gentilkiwi/patch-1 
Update intertic.py to support Lyon (TCL / Keolis)
 2024-04-05 00:41:04 +02:00
iceman1001 82a809887c hf mf ginfo -now supports decoding of a user supplied configuration block and improved textual output 2024-04-05 00:40:13 +02:00
iceman1001 39984c400a make Ev1 keys stick out and with an explaination making it a bit more clear for user 2024-04-05 00:37:02 +02:00
Benjamin DELPY 10c4679f1e
Update intertic.py to support Lyon (TCL / Keolis) 
Signed-off-by: Benjamin DELPY <benjamin@gentilkiwi.com>
 2024-04-05 00:20:55 +02:00
iceman1001 263180377a sixth time is the charm 2024-04-04 00:40:42 +02:00
iceman1001 77c549acad test5... cleaning 2024-04-04 00:26:16 +02:00
iceman1001 d22b57008a test4 2024-04-04 00:18:56 +02:00
iceman1001 d882cb9b90 test3 2024-04-04 00:15:51 +02:00
iceman1001 32d08c9db9 test2 2024-04-04 00:07:53 +02:00
iceman1001 720a518b53 seems to be python3.so that the linker CLANG on OSX which alerts for it cant do dynamic lookups 2024-04-03 23:55:54 +02:00