diff --git a/doc/commands.json b/doc/commands.json index 5747901f2..d0c84c398 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -973,7 +973,7 @@ }, "help": { "command": "help", - "description": "help use ` help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210830.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save", + "description": "help use ` help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log /home/phil/.proxmark3/logs/log_20210903.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save", "notes": [ "auto" ], @@ -5846,8 +5846,8 @@ "command": "hw connect", "description": "connects to a proxmark3 device via specified serial port. baudrate here is only for physical uart or uart-bt, not for usb-cdc or blue shark add-on", "notes": [ - "hw connect -p com3", - "hw connect -p com3 -b 115200" + "hw connect -p /dev/ttyacm0", + "hw connect -p /dev/ttyacm0 -b 115200" ], "offline": true, "options": [ @@ -10000,6 +10000,6 @@ "metadata": { "commands_extracted": 589, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2021-08-30T09:35:54" + "extracted_on": "2021-09-03T21:05:08" } } \ No newline at end of file diff --git a/fpga-xc3s100e/fpga_allinone.v b/fpga-xc3s100e/fpga_allinone.v index dbd9eca8b..070afec2e 100644 --- a/fpga-xc3s100e/fpga_allinone.v +++ b/fpga-xc3s100e/fpga_allinone.v @@ -1,20 +1,20 @@ ////////////////////////////////////////////////////////////////////////////////// -// Company: -// Engineer: -// -// Create Date: 16:09:14 05/13/2020 -// Design Name: -// Module Name: fpga_all_in_one -// Project Name: -// Target Devices: -// Tool versions: -// Description: +// Company: +// Engineer: // -// Dependencies: +// Create Date: 16:09:14 05/13/2020 +// Design Name: +// Module Name: fpga_all_in_one +// Project Name: +// Target Devices: +// Tool versions: +// Description: // -// Revision: +// Dependencies: +// +// Revision: // Revision 0.01 - File Created -// Additional Comments: +// Additional Comments: // ////////////////////////////////////////////////////////////////////////////////// module fpga_hf( @@ -29,8 +29,8 @@ module fpga_hf( output PWR_LO_EN, input FPGA_SWITCH ); - - + + fpga_hfmod hfmod( hfspck, hfmiso, hfmosi, hfncs, hfpck0, hfck_1356meg, hfck_1356megb,