Skip to content

Commit

Permalink
Merge pull request #53 from The-White-Fox/FixComments
Browse files Browse the repository at this point in the history
Fix mandarin chinese comments
  • Loading branch information
iceman1001 authored Nov 27, 2020
2 parents 3ace917 + 1c6e23b commit 93d4ee1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Firmware/Chameleon-Mini/Application/MifareClassic.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Author: skuser
*
* ChangeLog
* 2019-09-22 willok 加入了UID模式开关,加入了SAK模式开关
* 2019-10-05 Willok 将侦测卡功能整合进来,以减少程序大小
* 2019-09-22 willok Added UID mode switch and SAK mode switch
* 2019-10-05 Willok Integrate detection card function to reduce program size
*
*/

Expand Down Expand Up @@ -82,7 +82,7 @@
#define CMD_TRANSFER 0xB0
#define CMD_TRANSFER_FRAME_SIZE 2 /* Bytes without CRCA */

// 白卡相关的指令
// White card related instructions
#define CMD_CHINESE_UNLOCK 0x40
#define CMD_CHINESE_WIPE 0x41
#define CMD_CHINESE_UNLOCK_RW 0x43
Expand Down Expand Up @@ -454,7 +454,7 @@ void DetectionInit(void) {

// Download log
bool RfLogMemLoadBlock(void *Buffer, uint32_t BlockAddress, uint16_t ByteCount) {
// 位置超出尾部了,结束
// The position is beyond the end
if (BlockAddress < (DetectionLogPtr - FRAM_DETECTION_START_ADDR)) {
MemoryReadBlock(Buffer, BlockAddress + FRAM_DETECTION_START_ADDR, ByteCount);
if (0 == BlockAddress)
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Chameleon-Mini/Codec/Codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

uint16_t Reader_FWT = ISO14443A_RX_PENDING_TIMEOUT;

// 这个是从开启到准备好的时间间隔,之前不能发送数据
// This is the time interval from start to ready, data cannot be sent before
#define READER_FIELD_MINIMUM_WAITING_TIME 70 // ms

static uint16_t ReaderFieldStartTimestamp = 0;
Expand Down

0 comments on commit 93d4ee1

Please sign in to comment.