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

small fix

Browse Source
This commit is contained in:
merlokk 2019-02-07 16:05:08 +02:00
parent 32400c8d09
commit c6d946136e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,6 @@ void ams_print_int1(uint8_t int0)
bool ams_init() bool ams_init()
{ {
uint8_t block[4]; uint8_t block[4];
LL_GPIO_SetPinMode(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN,LL_GPIO_MODE_OUTPUT); LL_GPIO_SetPinMode(SOLO_AMS_CS_PORT,SOLO_AMS_CS_PIN,LL_GPIO_MODE_OUTPUT);
@ -290,7 +289,7 @@ bool ams_init()
uint8_t productType = ams_read_reg(AMS_REG_PRODUCT_TYPE); uint8_t productType = ams_read_reg(AMS_REG_PRODUCT_TYPE);
if (productType != 0x14) if (productType != 0x14)
{ {
printf1(TAG_NFC, "Have no product type [0x%02x]. AMS3956 connection error.\n", productType); printf1(TAG_NFC, "Have wrong product type [0x%02x]. AMS3956 connection error.\n", productType);
return false; return false;
} }
printf1(TAG_NFC,"AMS3956 product type 0x%02x.\n", productType); printf1(TAG_NFC,"AMS3956 product type 0x%02x.\n", productType);
@ -298,10 +297,8 @@ bool ams_init()
// enable tunneling mode and RF configuration // enable tunneling mode and RF configuration
ams_write_reg(AMS_REG_IC_CONF2, AMS_RFCFG_EN | AMS_TUN_MOD); ams_write_reg(AMS_REG_IC_CONF2, AMS_RFCFG_EN | AMS_TUN_MOD);
// enable tunneling mode and RF configuration if (1)
ams_write_reg(AMS_REG_IC_CONF2, AMS_RFCFG_EN | AMS_TUN_MOD); {
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);

2
targets/stm32l432/src/redirect.c
View File

@ -52,7 +52,7 @@ int _write (int fd, const void *buf, long int len)
memcpy(&logbuf[logbuflen], data, len); memcpy(&logbuf[logbuflen], data, len);
logbuflen += len; logbuflen += len;
// Send out USB serial // Send out USB serial
uint8_t res = CDC_Transmit_FS(logbuf, logbuflen); uint8_t res = CDC_Transmit_FS(logbuf, logbuflen);
if (res == USBD_OK) if (res == USBD_OK)
logbuflen = 0; logbuflen = 0;