Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add NTAG #326

Merged
merged 3 commits into from
Sep 11, 2023
Merged

Add NTAG #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5370bd
nfc: fix some documentation issues
GaryOderNichts Jul 30, 2023
3fed1f6
nn_nfp: flags -> fontRegion
GaryOderNichts Jul 30, 2023
09b3556
ntag: Add initial header
GaryOderNichts Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cafe/ntag.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ NTAGConvertMasterDataToWriteDataForT2T
NTAGConvertT2T
NTAGCreateAllWriteData
NTAGCreateAllWriteDataForT2T
NTAGDetect
NTAGFormat
NTAGInit
NTAGInitEx
Expand All @@ -28,3 +27,6 @@ NTAGWriteT2TLockArea
NTAGWriteT2TRawData
NTAGWriteT2TRawDataEx
NTAGWriteT2TWithConvert

:TEXT_WRAP
NTAGDetect
16 changes: 8 additions & 8 deletions include/nfc/nfc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ NFCAntennaCheck(VPADChan chan,
void *userContext);

/**
* Start tag discovery provide info about the first detected tag.
* Start tag discovery and provide info about the first detected tag.
*
* \param chan
* The DRC channel to use.
Expand Down Expand Up @@ -1144,7 +1144,7 @@ NFCSetReadOnly(VPADChan chan,
* The end page address.
*
* \param authenticate
* \c TRUE if (custom?) authentification using PWD_AUTH should be done.
* \c TRUE if authentification using PWD_AUTH should be done.
*
* \param callback
* A pointer to the callback function.
Expand Down Expand Up @@ -1198,8 +1198,8 @@ NFCReadT2T(VPADChan chan,
* \param write0Start,write1Start,write2Start,write3Start
* The start page address.
*
* \param write0End,write1End,write2End,write3End
* The end page address.
* \param write0Size,write1Size,write2Size,write3Size
* The size of the data to write in bytes.
*
* \param write0Data,write1Data,write2Data,write3Data
* The data which should be written (max. \c 0xF0 bytes per write).
Expand Down Expand Up @@ -1239,10 +1239,10 @@ NFCWriteT2T(VPADChan chan,
NFCNTAGVersion *version,
uint32_t commandTimeout,
uint8_t numWrites,
uint8_t write0Start, uint8_t write0End, void *write0Data,
uint8_t write1Start, uint8_t write1End, void *write1Data,
uint8_t write2Start, uint8_t write2End, void *write2Data,
uint8_t write3Start, uint8_t write3End, void *write3Data,
uint8_t write0Start, uint8_t write0Size, void *write0Data,
uint8_t write1Start, uint8_t write1Size, void *write1Data,
uint8_t write2Start, uint8_t write2Size, void *write2Data,
uint8_t write3Start, uint8_t write3Size, void *write3Data,
uint8_t activationStart, uint32_t *deactivationData, uint32_t *activationData,
uint8_t authenticate, uint8_t activate,
NFCCallbackFn callback,
Expand Down
12 changes: 6 additions & 6 deletions include/nn/nfp/nfp_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ struct WUT_PACKED RegisterInfo
FFLStoreData mii;
//! The name of this amiibo
uint16_t name[11];
//! Flags (see \link RegisterInfoSet \endlink)
uint8_t flags;
//! Font region
uint8_t fontRegion;
//! Country code
uint8_t country;
//! The date when the amiibo was registered
Expand All @@ -193,7 +193,7 @@ struct WUT_PACKED RegisterInfo
};
WUT_CHECK_OFFSET(RegisterInfo, 0x0, mii);
WUT_CHECK_OFFSET(RegisterInfo, 0x60, name);
WUT_CHECK_OFFSET(RegisterInfo, 0x76, flags);
WUT_CHECK_OFFSET(RegisterInfo, 0x76, fontRegion);
WUT_CHECK_OFFSET(RegisterInfo, 0x77, country);
WUT_CHECK_OFFSET(RegisterInfo, 0x78, registerDate);
WUT_CHECK_OFFSET(RegisterInfo, 0x7C, reserved);
Expand Down Expand Up @@ -230,14 +230,14 @@ struct WUT_PACKED RegisterInfoSet
FFLStoreData mii;
//! The name of this amiibo
uint16_t name[11];
//! Flags (can be retrieved from \link RegisterInfo \endlink)
uint8_t flags;
//! Font region
uint8_t fontRegion;
//! reserved bytes, must be 0
uint8_t reserved[0x2d];
};
WUT_CHECK_OFFSET(RegisterInfoSet, 0x0, mii);
WUT_CHECK_OFFSET(RegisterInfoSet, 0x60, name);
WUT_CHECK_OFFSET(RegisterInfoSet, 0x76, flags);
WUT_CHECK_OFFSET(RegisterInfoSet, 0x76, fontRegion);
WUT_CHECK_OFFSET(RegisterInfoSet, 0x77, reserved);
WUT_CHECK_SIZE(RegisterInfoSet, 0xA4);

Expand Down
5 changes: 5 additions & 0 deletions include/ntag/ntag.dox
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* \defgroup ntag ntag
* Nintendo? Tag (NTAG).
* NFC library for Amiibo and Pokemon Rumble U.
*/
Loading