Cons-n-Stuff/aic_pico
1
0
Fork 0
mirror of https://github.com/whowechina/aic_pico.git synced 2024-11-12 00:40:47 +01:00
Code Releases Activity

Better timeout by ignoring some expected DTR line signal

Browse Source
This commit is contained in:
whowechina 2024-06-22 09:37:00 +08:00
parent 2ca994c3ee
commit 323f3b6053
6 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Production/Firmware/aic_pico.uf2
View File

Binary file not shown.

3
firmware/include/aime.h
View File

@ -23,8 +23,7 @@ bool aime_feed(int c);
/* if aime is currently active */
bool aime_is_active();
/* force fast expire */
void aime_fast_expire();
void aime_dtr_off();
uint32_t aime_led_color();

3
firmware/include/bana.h
View File

@ -19,8 +19,7 @@ bool bana_feed(int c);
/* if bana is currently active */
bool bana_is_active();
/* force fast expire */
void bana_fast_expire();
void bana_dtr_off();
const char *bana_get_led_pattern();

32
firmware/src/lib/aime.c
View File

@ -20,8 +20,8 @@
static bool debug = false;
#define DEBUG(...) if (nfc_runtime.debug) printf(__VA_ARGS__)
#define AIME_EXPIRE_SEC 7200
#define AIME_FAST_EXPIRE_SEC 10
#define AIME_EXPIRE_US (1200 * 1000000ULL)
#define AIME_FAST_EXPIRE_US (3 * 1000000ULL)
enum {
CMD_GET_FW_VERSION = 0x30,
@ -68,6 +68,8 @@ const char *fw_version[] = { "TN32MSEC003S F/W Ver1.2", "\x94" };
const char *hw_version[] = { "TN32MSEC003S H/W Ver3.0", "837-15396" };
const char *led_info[] = { "15084\xFF\x10\x00\x12", "000-00000\xFF\x11\x40" };
static int ver_mode = 1;
static bool expecting_dtr_off = false;
static uint64_t expected_dtr_off_time = 0;
static struct {
bool enabled;
@ -362,16 +364,24 @@ static void cmd_mifare_halt()
static void cmd_felica()
{
send_simple_response(STATUS_INVALID_COMMAND);
return;
expecting_dtr_off = true;
expected_dtr_off_time = time_us_64() + 50000ULL;
}
static uint32_t led_color;
static void cmd_led_rgb()
{
led_color = request.payload[0] << 16 | request.payload[1] << 8 | request.payload[2];
uint8_t r = request.payload[0];
uint8_t g = request.payload[1];
uint8_t b = request.payload[2];
led_color = r << 16 | g << 8 | b;
build_response(0);
send_response();
expecting_dtr_off = true;
expected_dtr_off_time = time_us_64() + 400000ULL;
}
static void handle_frame()
@ -502,7 +512,7 @@ bool aime_feed(int c)
if (req_ctx.check_sum == c) {
handle_frame();
req_ctx.active = false;
expire_time = time_us_64() + AIME_EXPIRE_SEC * 1000000ULL;
expire_time = time_us_64() + AIME_EXPIRE_US;
}
return true;
}
@ -519,12 +529,20 @@ bool aime_is_active()
return time_us_64() < expire_time;
}
void aime_fast_expire()
void aime_dtr_off()
{
if ((expecting_dtr_off) &&
(abs(time_us_64() - expected_dtr_off_time) < 70000ULL)) {
expecting_dtr_off = false;
return;
}
if (!aime_is_active()) {
return;
}
expire_time = time_us_64() + AIME_FAST_EXPIRE_SEC * 1000000ULL;
DEBUG("\nAIME: DTR_OFF delta: %lld", time_us_64() - expected_dtr_off_time);
expire_time = time_us_64() + AIME_FAST_EXPIRE_US;
}
uint32_t aime_led_color()

10
firmware/src/lib/bana.c
View File

@ -20,8 +20,8 @@
static bool debug = false;
#define DEBUG(...) if (nfc_runtime.debug) printf(__VA_ARGS__)
#define BANA_EXPIRE_SEC 7200
#define BANA_FAST_EXPIRE_SEC 10
#define BANA_EXPIRE_US (1200 * 1000000ULL)
#define BANA_FAST_EXPIRE_US (3 * 1000000ULL)
static void putc_trap(uint8_t byte)
{
@ -446,7 +446,7 @@ bool bana_feed(int c)
} else if (req_ctx.frame_len == request.hdr.len + 7) {
handle_frame();
req_ctx.frame_len = 0;
expire_time = time_us_64() + BANA_EXPIRE_SEC * 1000000ULL;
expire_time = time_us_64() + BANA_EXPIRE_US;
}
return true;
}
@ -456,12 +456,12 @@ bool bana_is_active()
return time_us_64() < expire_time;
}
void bana_fast_expire()
void bana_dtr_off()
{
if (!bana_is_active()) {
return;
}
expire_time = time_us_64() + BANA_FAST_EXPIRE_SEC * 1000000ULL;
expire_time = time_us_64() + BANA_FAST_EXPIRE_US;
}
static const struct {

4
firmware/src/main.c
View File

@ -485,7 +485,7 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
DEBUG("\nReader Line State: %d %d", dtr, rts);
if (!dtr) {
aime_fast_expire();
bana_fast_expire();
aime_dtr_off();
bana_dtr_off();
}
}