| 6658905f |
1 | ################ |
| 2 | ## 2009/03/28 ## |
| 3 | ################ |
| 4 | winsrc/command.cpp |
| 5 | Added two new LF commands for tag exploration : |
| 6 | |
| 7 | - askdemod: takes 2 arguments, one is the clock rate, one is the modulation |
| 8 | convention (high mod is 1 or high mod is zero) |
| 9 | |
| 10 | This command demodulates the stream into a binary stream into |
| 11 | the trace buffer (0's and 1's) |
| 12 | |
| 13 | - mandemod: manchester decoding of a bitstream: takes a binary stream from |
| 14 | the trace buffer (see askdemod) and attempts to do manchester decoding |
| 15 | to it. One argument: clock rate. Outputs the bitstream to the scrollback buffer. |
| 16 | |
| 17 | Those two helped me to validate that the unknown tag I had was indeed an EM4100 type of tag |
| 18 | |
| 19 | |
| 20 | ################\r |
| 21 | ## 2008/12/11 ##\r |
| 22 | ################\r |
| 23 | bootrom/bootrom.c\r |
| 24 | Significant changes to bootloader. Use of Chip ID register to detect if running on a SAM7S512 then configure FLASH\r |
| 25 | waitstates as per SummoningDark's suggestion for a SAM7S512 or SAM7S256.\r |
| 26 | Deleted idle loops waiting blindly for clocks to settle and now using status registers to detect when clocks are stable.\r |
| 27 | \r |
| 28 | *************************\r |
| 29 | * IMPORTANT INFORMATION *\r |
| 30 | **************************************************************************************************************************\r |
| 31 | * With this boot code, the device can now only be flashed if button is held down after power on or a software reset.\r |
| 32 | * The flash procedure is this:\r |
| 33 | * Hold down button. Either plug in USB or software reset it. _While_holding_down_button_ (red and yellow LEDs are lit) you can\r |
| 34 | * issue one or more of the "prox bootrom <file>" "prox fpga <file>" "prox load <file>", be sure to hold button down for the\r |
| 35 | * entire duration of the flash process. Only release the button when flashing is complete and you want to let the board boot.\r |
| 36 | * This process may be less convenient but it's safer and avoids "unintentional" flashing of the board.\r |
| 37 | **************************************************************************************************************************\r |
| 38 | LED boot sequence now changed, C (red) lights up when boot code jumps from flash to RAM boot code, A (yellow) lights up after\r |
| 39 | clocks have been initialized, B (green) lights up when jumping from boot code to main code, then D (red led away from the others)\r |
| 40 | lights up while code is being downloaded to FPGA, then all leds turn off and board is ready for action.\r |
| 41 | \r |
| 42 | With these changes the board now boots and is ready to use in about 3 seconds. Also since the USB bus is not initialized\r |
| 43 | twice (once during boot, then again when the main code runs) unless the button is held down at boot, this seems to avoid\r |
| 44 | the double USB connect and "USB device not recognized" when device is connected to the USB bus or software reset.\r |
| 45 | \r |
| 46 | ################\r |
| 47 | ## 2008/12/06 ##\r |
| 48 | ################\r |
| 49 | armsrc/fpga.c\r |
| 50 | Implemented function SetupSpi() to initialize the Serial Peripheral Interface (SPI) in preparation to adding an LCD to the board.\r |
| 51 | Changed FpgaWriteConfWord() to use the SPI communication now instead of bit banging the serial data to the FPGA.\r |
| 52 | \r |
| 53 | fpga/fpga.v\r |
| 54 | The FPGA config word serializer required non standard SPI communication (ie for shifting in a 8 bit word, it required a 9th clock\r |
| 55 | cycle with NCS high to load the word from the shift register to the conf register). This was OK for manually bitbanging it but not\r |
| 56 | suitable for using SPI comms. The serializer was fixed to load the conf word from the shift register on a NCS lo-hi transition and\r |
| 57 | not require additional clocking.\r |
| 58 | \r |
| 59 | armsrc/fpgaimg.c\r |
| 60 | Recompiled FPGA code after changes above.\r |
| 61 | \r |
| 62 | armsrc/LCD.c\r |
| 63 | LCD driver for PCF8833 based LCDs like those found on Nokia models 2600,2650,3100,3120,5140,6030,6100,6610,7210,7250 maybe\r |
| 64 | others. These color LCDs have a resolution of 132x132 and a serial interface. They are very cheap like even down to $2/pc\r |
| 65 | This LCD driver is a straight rip of that found at http://www.sparkfun.com/datasheets/LCD/Jimbo-Nokia-SAM7-Example.zip with\r |
| 66 | very small changes, mainly to integrate it and make it compile with our codebase. Also comented out the circle subroutines\r |
| 67 | to keep the code to integer math only.\r |
| 68 | \r |
| 69 | armsrc/fonts.c\r |
| 70 | Font definition for LCD driver\r |
| 71 | \r |
| 72 | armsrc/appmain.c\r |
| 73 | Fixed a small bug in CmdHIDdemodFSK (added case 4) which prevented reading some tags. When a logic 0 is immediately followed\r |
| 74 | by the start of the next transmisson (special pattern) a pattern of 4 bit duration lengths is created.\r |
| 75 | \r |
| 76 | ################\r |
| 77 | ## 2008/11/27 ##\r |
| 78 | ################\r |
| 79 | armsrc/appmain.c\r |
| 80 | Implemented an HID tag FSK demodulator (CmdHIDdemodFSK) to obtain the tag ID code from the raw sampled waveform.\r |
| 81 | Implemented CmdHIDsimTAG which takes a 44bit HID tag ID as a hex number then creates the waveform and simulates the tag\r |
| 82 | \r |
| 83 | winsrc/command.cpp\r |
| 84 | Added command "hidfskdemod" that calls CmdHIDdemodFSK, the ARM FSK demodulator for HID tags.\r |
| 85 | \r |
| 86 | include/usb-cmd.h\r |
| 87 | New defines CMD_HID_DEMOD_FSK and CMD_HID_SIM_TAG\r |
| 88 | \r |
| 89 | 2008/11/25\r |
| 90 | common/iso14443_crc.c\r |
| 91 | Moved CRC calculation code into this file as it's common to both ARM and Windows side. This file is now included as needed.\r |
| 92 | \r |
| 93 | ################\r |
| 94 | ## 2008/11/21 ##\r |
| 95 | ################\r |
| 96 | armsrc/Makefile\r |
| 97 | Changes to split up the compilation of the ARM and produce separate S files for the FPGA code and the ARM code.\r |
| 98 | \r |
| 99 | armsrc/appmain.c\r |
| 100 | Replaced some of the hex value params in FpgaWriteConfWord with more explanatory defines.\r |
| 101 | Changes to the Tune command as it assumes wrong HF capacitor value (130pF) and produces wrong voltage readings.\r |
| 102 | Combined some of the integer arithmetic statements to improve accuracy slightly, since the voltage divider ratio is not an integer.\r |
| 103 | Voltage divider resistor network is 10M/240k = ratio of 41.6666\r |
| 104 | \r |
| 105 | Originally the calculation was rounding the ratio down to 41\r |
| 106 | 3300 (mV) * 41 * sample_value / 1024\r |
| 107 | New calculation without rounding error is\r |
| 108 | 3300 (mV) * 41.66666 * sample_value / 1024 => 137500 * sample_value / 1024\r |
| 109 | \r |
| 110 | New define BUTTON_PRESS() returns status of button\r |
| 111 | \r |
| 112 | armsrc/fpga.c\r |
| 113 | The current board can only take a X2S30 as there is no larger FPGA in PQFP100 package and\r |
| 114 | the smaller X2S15 FPGA can't fit the current code. The X2S30 FPGA config is fixed at 336,768 bits\r |
| 115 | The FPGA code base address and length is hard coded to occupy FLASH region 0x2000 - 0xC470.\r |
| 116 | \r |
| 117 | armsrc/ldscript-fpga\r |
| 118 | New file to place the FPGA code at FLASH address 0x2000\r |
| 119 | \r |
| 120 | bootrom/Makefile\r |
| 121 | Slight changes, commented out the generation of byteswapped S file, the other S files are generated in the same section of the makefile now.\r |
| 122 | \r |
| 123 | bootrom/bootrom.c\r |
| 124 | Changed some thumb code with a one line ARM code which is clearer and more explicit. Processor runs in ARM mode at reset anyway.\r |
| 125 | Changed jump to RAM address, used to jump to 0x2000 (now FPGA area), now jumps to 0x10000.\r |
| 126 | \r |
| 127 | bootrom/flash-reset.s\r |
| 128 | Changed name of CMain to CopyBootToRAM. Streamlined reset code, fixed up stack pointer initialization.\r |
| 129 | \r |
| 130 | bootrom/fromflash.c\r |
| 131 | Removed the whole section of initializing clocks, this is redundant as it's being done once we jump to boot code in RAM\r |
| 132 | All fromflash.c does now is copy the boot code to ram and jumps to it.\r |
| 133 | \r |
| 134 | bootrom/ram-reset.s\r |
| 135 | Fixed up stack pointer initialization that caused crash when using "loread"\r |
| 136 | \r |
| 137 | include/at91sam7s128.h\r |
| 138 | New defines for debug register, lets you identify what processor flavour the code runs on, RAM and FLASH sizes, etc.\r |
| 139 | \r |
| 140 | include/proxmark3.h\r |
| 141 | New useful defines for relay and button\r |
| 142 | \r |
| 143 | winsrc/Makefile\r |
| 144 | Added new define /D_CRT_SECURE_NO_WARNINGS to elliminate a _whole bunch_ of bogus compilation warnings\r |
| 145 | \r |
| 146 | winsrc/command.cpp\r |
| 147 | Changed CmdLosamples to take a numeric argument (number of samples x4 to retrieve from buffer)\r |
| 148 | New command Quit to exit the program from the GUI command prompt.\r |
| 149 | \r |
| 150 | winsrc/gui.cpp\r |
| 151 | Fixup compilation warnings.\r |
| 152 | \r |
| 153 | winsrc/prox.cpp\r |
| 154 | Tidy up printing to stdout, flashing progress now updates on the same line instead of scrolling up.\r |
| 155 | New command line parameter to load FPGA image to FLASH.\r |
projects / proxmark3-svn / blame