FIX: start up,MUXSEL_HIPKD(PA19),MUXSEL_LOPKD(PA20) are floating state. Should adapt FPGA image aswell.

This commit is contained in:
iceman1001 2018-02-07 12:08:50 +01:00
commit 3d2fd2e3a1

View file

@ -270,7 +270,7 @@ void MeasureAntennaTuningHf(void) {
DbprintfEx(CMD_MEASURE_ANTENNA_TUNING_HF, "%u mV / %5.2f V", vHf, vHf/1000.0); DbprintfEx(CMD_MEASURE_ANTENNA_TUNING_HF, "%u mV / %5.2f V", vHf, vHf/1000.0);
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("cancelled"); DbpString("[+] cancelled");
} }
void ReadMem(int addr) { void ReadMem(int addr) {
@ -885,9 +885,9 @@ void UsbPacketReceived(uint8_t *packet, int len) {
MifareCIdent(); MifareCIdent();
break; break;
// mifare sniffer // mifare sniffer
case CMD_MIFARE_SNIFFER: // case CMD_MIFARE_SNIFFER:
//SniffMifare(c->arg[0]); //SniffMifare(c->arg[0]);
break; // break;
case CMD_MIFARE_SETMOD: case CMD_MIFARE_SETMOD:
MifareSetMod(c->arg[0], c->d.asBytes); MifareSetMod(c->arg[0], c->d.asBytes);
break; break;
@ -1155,6 +1155,12 @@ void __attribute__((noreturn)) AppMain(void) {
// Reset SSC // Reset SSC
AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST; AT91C_BASE_SSC->SSC_CR = AT91C_SSC_SWRST;
// set pins LOW
LOW(GPIO_MUXSEL_HIPKD);
LOW(GPIO_MUXSEL_LOPKD);
LOW(GPIO_MUXSEL_HIRAW);
LOW(GPIO_MUXSEL_LORAW);
// Load the FPGA image, which we have stored in our flash. // Load the FPGA image, which we have stored in our flash.
// (the HF version by default) // (the HF version by default)
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);