From d794acb7b715616cd3c75a57332300cd5e78dc50 Mon Sep 17 00:00:00 2001
From: KIT! <norththelittlefox@gmail.com>
Date: Mon, 26 Feb 2024 22:20:01 +0100
Subject: [PATCH] Enhanced polling

Previously, a card could be scanned twice in a row and it's state would be kept in memory so the card would be scanned again as soon as a credit ended.

Added debug strings
---
 readme.md      |  1 +
 src/aimeio.c   | 33 ++++++++++++++++++++++++++++++++-
 src/aimetest.c |  4 +---
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 6f4d4b0..cbba318 100644
--- a/readme.md
+++ b/readme.md
@@ -26,6 +26,7 @@ scan=0x0D     ;Sets the key which will be used to insert a card in game. The def
 ;aimePath=    ;Manually specify an aime.txt file
 ;felicaPath=  ;Manually specify a felica.txt file
 ;felicaGen=0  ;Generate a new random card if it's missing from the file
+;debug=0      ;Display function calls
 ```
 
 ## Scanning cards
diff --git a/src/aimeio.c b/src/aimeio.c
index 4ace591..9650816 100644
--- a/src/aimeio.c
+++ b/src/aimeio.c
@@ -18,11 +18,13 @@ static bool READER_RUNNER_INITIALIZED = false;
 static HANDLE READER_POLL_THREAD;
 static bool READER_POLL_STOP_FLAG;
 
+static bool polling = false;
 static bool HasCard = false;
 uint8_t UID[8] = {0};
 
 struct aime_io_config
 {
+    bool debug;
     wchar_t aime_path[MAX_PATH];
     wchar_t felica_path[MAX_PATH];
     bool felica_gen;
@@ -41,6 +43,12 @@ static void aime_io_config_read(struct aime_io_config *cfg, const wchar_t *filen
     assert(cfg != NULL);
     assert(filename != NULL);
 
+    cfg->debug = GetPrivateProfileIntW(
+        L"aimeio",
+        L"debug",
+        0,
+        filename);
+
     GetPrivateProfileStringW(
         L"aimeio",
         L"aimePath",
@@ -68,6 +76,9 @@ static void aime_io_config_read(struct aime_io_config *cfg, const wchar_t *filen
         L"scan",
         VK_RETURN,
         filename);
+
+    if (aime_io_cfg.debug)
+        printf("DEBUG: aime_io_config_read(filename : %ls). \r\n", filename);
 }
 
 static HRESULT aime_io_read_id_file(const wchar_t *path, uint8_t *bytes, size_t nbytes, int LineToRead)
@@ -182,9 +193,11 @@ static HRESULT aime_io_generate_felica(const wchar_t *path, uint8_t *bytes, size
 #pragma region READER SPECIFIC
 static unsigned int __stdcall reader_poll_thread_proc(void *ctx)
 {
+    if (aime_io_cfg.debug)
+        printf("DEBUG: reader_poll_thread_proc(). \r\n");
     while (!READER_POLL_STOP_FLAG)
     {
-        if (!HasCard)
+        if (!HasCard && polling)
         {
             uint8_t _UID[8] = {0};
             scard_update(_UID);
@@ -212,6 +225,7 @@ uint16_t aime_io_get_api_version(void)
 
 HRESULT aime_io_init(void)
 {
+
     // At init we want to open a console...
     int ret = AllocConsole();
     FILE *fp;
@@ -222,6 +236,9 @@ HRESULT aime_io_init(void)
     // We then read the segatools config file to get settings.
     aime_io_config_read(&aime_io_cfg, L".\\segatools.ini");
 
+    if (aime_io_cfg.debug)
+        printf("DEBUG: aime_io_init(). \r\n");
+
     //  Find and initialize reader(s)
     if (!READER_RUNNER_INITIALIZED)
     {
@@ -252,9 +269,14 @@ HRESULT aime_io_init(void)
 
 HRESULT aime_io_nfc_poll(uint8_t unit_no)
 {
+    if (aime_io_cfg.debug)
+        printf("\n\nDEBUG: aime_io_nfc_poll(unit_no %d). \r\n", unit_no);
+
     if (unit_no != 0)
         return S_OK;
 
+    polling = true;
+
     bool sense;
     HRESULT hr;
 
@@ -326,6 +348,9 @@ HRESULT aime_io_nfc_poll(uint8_t unit_no)
 
 HRESULT aime_io_nfc_get_aime_id(uint8_t unit_no, uint8_t *luid, size_t luid_size)
 {
+    if (aime_io_cfg.debug)
+        printf("DEBUG: aime_io_nfc_get_aime_id(unit_no : %d). \r\n", unit_no);
+
     assert(luid != NULL);
     assert(luid_size == sizeof(aime_io_aime_id));
 
@@ -347,6 +372,9 @@ HRESULT aime_io_nfc_get_aime_id(uint8_t unit_no, uint8_t *luid, size_t luid_size
 
 HRESULT aime_io_nfc_get_felica_id(uint8_t unit_no, uint64_t *IDm)
 {
+    if (aime_io_cfg.debug)
+        printf("DEBUG: aime_io_nfc_get_felica_id(unit_no : %d). \r\n", unit_no);
+
     uint64_t val;
     size_t i;
 
@@ -368,6 +396,7 @@ HRESULT aime_io_nfc_get_felica_id(uint8_t unit_no, uint64_t *IDm)
 
     if (HasCard)
     {
+        polling = false;
         HasCard = false;
 
         uint64_t val;
@@ -385,5 +414,7 @@ HRESULT aime_io_nfc_get_felica_id(uint8_t unit_no, uint64_t *IDm)
 
 void aime_io_led_set_color(uint8_t unit_no, uint8_t r, uint8_t g, uint8_t b)
 {
+    if (aime_io_cfg.debug)
+        printf("DEBUG: aime_io_led_set_color(unit_no : %d, r : %d, g : %d, b : %d). \r\n", unit_no, r, g, b);
 }
 #pragma endregion
\ No newline at end of file
diff --git a/src/aimetest.c b/src/aimetest.c
index a845c0b..c080c17 100644
--- a/src/aimetest.c
+++ b/src/aimetest.c
@@ -48,12 +48,10 @@ int main()
     {
         if (aime_io_nfc_poll(0) == S_OK)
         {
-            Sleep(500);
             if (aime_io_nfc_get_felica_id(0, &IDm) == S_OK)
             {
                 // aime_io_led_set_color(0, 0, 255, 0);
                 printf("Found FeliCa card with uid %llx\r\n\n", IDm);
-                continue;
             }
             if (aime_io_nfc_get_aime_id(0, luid, 10) == S_OK)
             {
@@ -64,8 +62,8 @@ int main()
                     printf("%02x ", luid[i]);
                 }
                 printf("\r\n\n");
-                continue;
             }
+            Sleep(500);
             // printf("poll ok but no card?!\r\n");
         }
         // Sleep(300);