github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 04:50:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mem spibaud uses NG. And a simplification of tuning

Browse source
This commit is contained in:
iceman1001 2019-09-19 12:13:39 +02:00
commit aa2f80795d
2 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
armsrc/appmain.c
View file

@ -208,13 +208,13 @@ void MeasureAntennaTuning(void) {
uint16_t MeasureAntennaTuningHfData(void) { uint16_t MeasureAntennaTuningHfData(void) {
uint16_t volt = 0; // in mV uint16_t volt = 0; // in mV
volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10; uint16_t avg = AvgAdc(ADC_CHAN_HF);
volt = (MAX_ADC_HF_VOLTAGE * avg) >> 10;
bool use_high = (volt > MAX_ADC_HF_VOLTAGE - 300); bool use_high = (volt > MAX_ADC_HF_VOLTAGE - 300);
if (!use_high) { if (use_high) {
volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
} else {
volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10; volt = (MAX_ADC_HF_VOLTAGE_RDV40 * AvgAdc(ADC_CHAN_HF_RDV40)) >> 10;
// volt = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
} }
return volt; return volt;
} }
@ -787,7 +787,7 @@ static void PacketReceived(PacketCommandNG *packet) {
uint32_t password; uint32_t password;
uint8_t flags; uint8_t flags;
} PACKED; } PACKED;
struct p *payload = (struct p *) packet->data.asBytes; struct p *payload = (struct p *) packet->data.asBytes;
T55xxWakeUp(payload->password, payload->flags); T55xxWakeUp(payload->password, payload->flags);
break; break;
} }
@ -846,7 +846,7 @@ static void PacketReceived(PacketCommandNG *packet) {
bool Q5; bool Q5;
uint8_t blocks[8]; uint8_t blocks[8];
} PACKED; } PACKED;
struct p *payload = (struct p*)packet->data.asBytes; struct p *payload = (struct p *)packet->data.asBytes;
CopyVikingtoT55xx(payload->blocks, payload->Q5); CopyVikingtoT55xx(payload->blocks, payload->Q5);
break; break;
} }
@ -1236,22 +1236,22 @@ static void PacketReceived(PacketCommandNG *packet) {
break; break;
} }
case CMD_HF_ICLASS_READBL: { case CMD_HF_ICLASS_READBL: {
/* /*
struct p { struct p {
uint8_t blockno; uint8_t blockno;
} PACKED; } PACKED;
struct p *payload = (struct p *)packet->data.asBytes; struct p *payload = (struct p *)packet->data.asBytes;
*/ */
iClass_ReadBlk( packet->data.asBytes[0] ); iClass_ReadBlk(packet->data.asBytes[0]);
break; break;
} }
case CMD_HF_ICLASS_AUTH: { //check case CMD_HF_ICLASS_AUTH: { //check
/* /*
struct p { struct p {
uint8_t mac[4]; uint8_t mac[4];
} PACKED; } PACKED;
struct p *payload = (struct p *)packet->data.asBytes; struct p *payload = (struct p *)packet->data.asBytes;
*/ */
iClass_Authentication(packet->data.asBytes); iClass_Authentication(packet->data.asBytes);
break; break;
} }
@ -1665,7 +1665,9 @@ static void PacketReceived(PacketCommandNG *packet) {
break; break;
} }
case CMD_FLASHMEM_SET_SPIBAUDRATE: { case CMD_FLASHMEM_SET_SPIBAUDRATE: {
FlashmemSetSpiBaudrate(packet->oldarg[0]); if (packet->length != sizeof(uint32_t))
break;
FlashmemSetSpiBaudrate(packet->data.asDwords[0]);
break; break;
} }
case CMD_FLASHMEM_WRITE: { case CMD_FLASHMEM_WRITE: {

2
client/cmdflashmem.c
View file

@ -117,7 +117,7 @@ static int CmdFlashmemSpiBaudrate(const char *Cmd) {
usage_flashmem_spibaud(); usage_flashmem_spibaud();
return PM3_EINVARG; return PM3_EINVARG;
} }
SendCommandMIX(CMD_FLASHMEM_SET_SPIBAUDRATE, baudrate, 0, 0, NULL, 0); SendCommandNG(CMD_FLASHMEM_SET_SPIBAUDRATE, (uint8_t*)&baudrate, sizeof(uint32_t));
return PM3_SUCCESS; return PM3_SUCCESS;
} }