diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-02-25 09:18:53 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-02-25 09:18:53 +0200 |
| commit | a9713d76bb1602c38cf204bf7e7b2daeb714bda2 (patch) | |
| tree | 854c4a04e4c06a48e67fb7829d6464a8e2e622f8 /Software/Embedded_SW/Embedded | |
| parent | 49823de1fda9ba72975dbc5ed466b574aec09fbe (diff) | |
| download | Tango-a9713d76bb1602c38cf204bf7e7b2daeb714bda2.tar.gz Tango-a9713d76bb1602c38cf204bf7e7b2daeb714bda2.zip | |
remove warnings at NFC i2c
Diffstat (limited to 'Software/Embedded_SW/Embedded')
4 files changed, 19 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.c index 87676ff6b..03fbb3aa2 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.c @@ -12,7 +12,8 @@ #include <DataDef.h> #include "driverlib/sysctl.h" #include <Drivers/I2C_Communication/I2C.h> - +#include "delay.h" +#include <Drivers/I2C_Communication/RFID_NFC/PN7150/PN7150.h> #include <Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h> #define MUX_I2C_BASE 4 @@ -136,9 +137,9 @@ uint32_t I2C_NFC_Test() */ -uint32_t I2C_NFC_Test() +void I2C_NFC_Test() { - uint32_t Status = OK; + Reset_NFC_Device(CART_1); delayUs(10); @@ -156,11 +157,12 @@ uint32_t I2C_NFC_Test() NCISetConfig_NFC(); NxpNci_StartDiscovery(); - I2C_NFC_Set_For_Read_Ch(); + I2C_NFC_Set_For_Read_Ch(); SysCtlDelay(5); I2C_NFC_Read_Ch(14); delayms(5); } + } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.h index 3e96a0016..ebc59575a 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.h @@ -8,7 +8,7 @@ #ifndef DRIVERS_I2C_COMMUNICATION_RFID_NFC_NFC_I2C_NFC_I2C_H_ #define DRIVERS_I2C_COMMUNICATION_RFID_NFC_NFC_I2C_NFC_I2C_H_ -uint32_t I2C_NFC_Test(); +void I2C_NFC_Test(); uint32_t Enable_I2C_NFC_Channel(PANEL_BUTTON_OR_CRAT_ID Cart_ID); uint32_t I2C_NFC_Write_Ch(uint8_t No_BytesToWrite ); uint32_t I2C_NFC_Set_For_Read_Ch(); @@ -16,4 +16,5 @@ uint32_t I2C_NFC_Read_Ch(uint8_t No_BytesToRead ); + #endif /* DRIVERS_I2C_COMMUNICATION_RFID_NFC_NFC_I2C_NFC_I2C_H_ */ diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.c index a08c76a4f..8b5ea642d 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.c @@ -6,6 +6,8 @@ */ #include "include.h" #include <Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h> +#include <Drivers/I2C_Communication/RFID_NFC/NFC_I2C/NFC_I2C.h> +#include "delay.h" extern uint8_t NFC_I2C_Read_buf[MaxNoBytesToRead]; extern uint8_t NFC_I2C_Write_Buf[MaxNoBytesToWrite]; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h index 1a02f1dd1..18f488703 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC_I2C/Test_NFC.h @@ -9,6 +9,15 @@ #define MaxNoBytesToRead 7// #define MaxNoBytesToWrite 100// +uint32_t NCICoreReset(); +uint32_t NCICoreInit(); +uint32_t NCIDiscoverMap(); +uint32_t NCIRouting(); +uint32_t NCISetConfig_NFCA_SELRSP(); +uint32_t NCISetConfig_NFC(); +uint32_t NxpNci_StartDiscovery(); +uint32_t NCIProprietary(); + //https://community.nxp.com/thread/434748 /* //NCICoreReset [ CORE_RESET_CMD] |