refactor structure

This commit is contained in:
2026-08-30 16:27:44 +08:00
parent 8f65670a8f
commit da83ff6f94
31 changed files with 314 additions and 290 deletions
+9 -9
View File
@@ -88,7 +88,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Read the PN532 firmware version and ID.
pub fn get_firmware_version(&mut self) -> Result<u32, Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_GETFIRMWAREVERSION;
self.buffer[0] = pn532::GETFIRMWAREVERSION;
self.send(1)?;
let len = self.read()?;
if len < 4 {
@@ -104,7 +104,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Read a 16-bit PN532 register.
pub fn read_register(&mut self, reg: u16) -> Result<u8, Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_READREGISTER;
self.buffer[0] = pn532::READREGISTER;
self.buffer[1] = (reg >> 8) as u8;
self.buffer[2] = reg as u8;
self.send(3)?;
@@ -117,7 +117,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Write to a 16-bit PN532 register.
pub fn write_register(&mut self, reg: u16, val: u8) -> Result<(), Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_WRITEREGISTER;
self.buffer[0] = pn532::WRITEREGISTER;
self.buffer[1] = (reg >> 8) as u8;
self.buffer[2] = reg as u8;
self.buffer[3] = val;
@@ -129,7 +129,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Set the PN532's GPIO pins (see the PN532 user manual for valid pins).
pub fn write_gpio(&mut self, pinstate: u8) -> Result<(), Error<B::TransportError>> {
let pinstate = pinstate | (1 << PN532_GPIO_P32) | (1 << PN532_GPIO_P34);
self.buffer[0] = PN532_COMMAND_WRITEGPIO;
self.buffer[0] = pn532::WRITEGPIO;
self.buffer[1] = PN532_GPIO_VALIDATIONBIT | pinstate;
self.buffer[2] = 0x00;
self.send(3)?;
@@ -142,7 +142,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Read the state of the PN532's GPIO pins.
pub fn read_gpio(&mut self) -> Result<u8, Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_READGPIO;
self.buffer[0] = pn532::READGPIO;
self.send(1)?;
self.read()?;
Ok(self.buffer[0])
@@ -150,7 +150,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Configure the SAM (Secure Access Module) in normal mode.
pub fn sam_config(&mut self) -> Result<(), Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_SAMCONFIGURATION;
self.buffer[0] = pn532::SAMCONFIGURATION;
self.buffer[1] = 0x01; // normal mode
self.buffer[2] = 0x14; // timeout 50 ms * 20 = 1 second
self.buffer[3] = 0x01; // use IRQ pin
@@ -164,7 +164,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
&mut self,
max_retries: u8,
) -> Result<(), Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_RFCONFIGURATION;
self.buffer[0] = pn532::RFCONFIGURATION;
self.buffer[1] = 5;
self.buffer[2] = 0xFF;
self.buffer[3] = 0x01;
@@ -180,7 +180,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
auto_rfca: u8,
rf_on_off: u8,
) -> Result<(), Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_RFCONFIGURATION;
self.buffer[0] = pn532::RFCONFIGURATION;
self.buffer[1] = 1;
self.buffer[2] = 0x00 | auto_rfca | rf_on_off;
self.send(3)?;
@@ -201,7 +201,7 @@ impl<B: Interface, const N: usize> Pn532<B, N> {
/// Release the card.
pub fn release(&mut self) -> Result<(), Error<B::TransportError>> {
self.buffer[0] = PN532_COMMAND_INRELEASE;
self.buffer[0] = pn532::INRELEASE;
self.buffer[1] = 0x00;
self.send(2)?;