shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

simplify ams init

Browse Source
This commit is contained in:
Conor Patrick 2019-02-07 19:45:02 -05:00
parent 0f6be6740b
commit be9bd941c8
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
targets/stm32l432/src/ams.c
View File

@ -280,25 +280,22 @@ bool ams_init()
// delay(10); // delay(10);
SELECT(); SELECT();
// delay(10); // delay(1);
ams_write_command(AMS_CMD_DEFAULT); // Needs to be disabled for passive operation
ams_write_command(AMS_CMD_CLEAR_BUFFER); // if (0)
if (1)
// check connection
uint8_t productType = ams_read_reg(AMS_REG_PRODUCT_TYPE);
if (productType != 0x14)
{ {
printf1(TAG_NFC, "Have wrong product type [0x%02x]. AMS3956 connection error.\n", productType); // check connection
return false; uint8_t productType = ams_read_reg(AMS_REG_PRODUCT_TYPE);
} if (productType != 0x14)
printf1(TAG_NFC,"AMS3956 product type 0x%02x.\n", productType); {
printf1(TAG_NFC, "Have wrong product type [0x%02x]. AMS3956 connection error.\n", productType);
// enable tunneling mode and RF configuration return false;
ams_write_reg(AMS_REG_IC_CONF2, AMS_RFCFG_EN | AMS_TUN_MOD); }
printf1(TAG_NFC,"AMS3956 product type 0x%02x.\n", productType);
if (1)
{
ams_read_eeprom_block(AMS_CONFIG_UID_ADDR, block); ams_read_eeprom_block(AMS_CONFIG_UID_ADDR, block);
printf1(TAG_NFC,"UID: "); dump_hex1(TAG_NFC,block,4); printf1(TAG_NFC,"UID: "); dump_hex1(TAG_NFC,block,4);
@ -335,7 +332,12 @@ bool ams_init()
if (block[0] != ic_cfg1 || block[1] != ic_cfg2) if (block[0] != ic_cfg1 || block[1] != ic_cfg2)
{ {
printf1(TAG_NFC,"Writing config block 1\r\n"); printf1(TAG_NFC,"Writing config block 1\r\n");
ams_write_reg(AMS_REG_IC_CONF1,ic_cfg1);
ams_write_reg(AMS_REG_IC_CONF2,ic_cfg2);
// set IC_CFG1 // set IC_CFG1
block[0] = ic_cfg1; block[0] = ic_cfg1;