fromost/lora-card-reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix heapless vec

Browse Source 
Removed unused lorawan patch
This commit is contained in:
fromost
2026-09-15 18:32:56 +08:00
parent 48dd2bff23
commit e3055f0829
3 changed files with 15 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pn532/src/protocol/felica/felica_lite_s/mod.rs
+12 -11
View File
@@ -76,22 +76,23 @@ where
let mut wcnt = [0u8; 3];
wcnt.copy_from_slice(&wcnt_block[0][0..3]);
let block_code: u16 = block_code.into();
let maca_block_code: u16 = FelicaLiteSBlock::MACA.clone().into();
let mut plain = heapless::Vec::<u8, 24>::new();
plain.extend(wcnt);
plain.push(block_code.clone().into() as u8).unwrap();
plain.push(maca_block_code as u8).unwrap();
plain.extend(*data);
let mut plain = [0u8; 24];
plain[0..3].copy_from_slice(&wcnt);
plain[4] = block_code as u8;
plain[6] = maca_block_code as u8;
plain[8..24].copy_from_slice(data);
let mac = self.compute_write_mac(session, plain.into_array().unwrap());
let mac = self.compute_write_mac(session, plain);
let mut mac_a = heapless::Vec::<u8, 16>::new();
mac_a.extend(mac);
mac_a.extend(wcnt);
let mut mac_a = [0u8; 16];
mac_a[0..8].copy_from_slice(&mac);
mac_a[8..11].copy_from_slice(&wcnt);
let block_list = [block_code.into(), FelicaLiteSBlock::MACA as u16];
let block_data = [*data, mac_a.into_array().unwrap()];
let block_list = [block_code, FelicaLiteSBlock::MACA as u16];
let block_data = [*data, mac_a];
self.write_block(card, block_list, &block_data)
}