core upgrade to 3.0.2, support NFC status read

Author: z4yx

.gitignore

@@ -1,4 +1,5 @@
 build/
 armbuild/
+build-arm/
 cmake-build-*/
 Inc/git-rev.h

Inc/main.h

@@ -57,6 +57,7 @@ void Error_Handler(void);
 /* USER CODE BEGIN EFP */
 extern const char *fw_git_version;
 void SystemClock_CustomConfig(bool nfc_low_power, bool pll_reconfig);
+int check_is_nfc_en(void);
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/

Src/admin_vendor.c

@@ -56,11 +56,18 @@ int admin_vendor_version(const CAPDU *capdu, RAPDU *rapdu) {
   return 0;
 }
 
-int admin_vendor_nfc_enable(const CAPDU *capdu, RAPDU *rapdu) {
+int admin_vendor_nfc_enable(const CAPDU *capdu, RAPDU *rapdu, bool pin_validated) {
   if (P1 != 0x00 && P1 != 0x01) EXCEPT(SW_WRONG_P1P2);
   if (P2 != 0x00) EXCEPT(SW_WRONG_P1P2);
   if (LC != 0x00) EXCEPT(SW_WRONG_LENGTH);
 
+  if (P1 == 0x01 && !pin_validated) EXCEPT(SW_SECURITY_STATUS_NOT_SATISFIED);
+  if (P1 == 0x00) {
+    RDATA[0] = check_is_nfc_en();
+    LL = 1;
+    return 0;
+  }
+
   uint32_t magic = P1 * 0x50 + 0x100;
   FLASH_OBProgramInitTypeDef cfg = {
     .OptionType = OPTIONBYTE_PCROP,

Src/device.c

@@ -14,7 +14,7 @@
 
 const uint32_t UNTOUCHED_MAX_VAL = 40; /* Suitable for 56K pull-down resistor */
 const uint32_t CALI_TIMES = 4;
-const uint32_t TOUCH_GAP_TIME = 800; /* Gap period (in ms) between two consecutive touch events */
+const uint32_t TOUCH_GAP_TIME = TOUCH_EXPIRE_TIME; /* Gap period (in ms) between two consecutive touch events */
 const uint32_t MIN_LONG_TOUCH_TIME = 500;
 const uint32_t MIN_TOUCH_TIME = 20;
 
@@ -153,7 +153,7 @@ void device_periodic_task(void) {
     }
     break;
   case TOUCH_STATE_ASSERT:
-    if (tick - event_tick > TOUCH_GAP_TIME) {
+    if (tick - event_tick >= TOUCH_GAP_TIME) {
       set_touch_result(TOUCH_NO);
       fsm = TOUCH_STATE_DEASSERT;
       DBG_MSG("touch deassert, max value measured: %u\r\n", measure_touch);

Src/main.c

@@ -281,7 +281,7 @@ static void config_usb_mode(void) {
   device_loop_enable = 1;
 }
 
-static int check_is_nfc_en(void) {
+int check_is_nfc_en(void) {
   uint32_t *flash_loc = (uint32_t*) 0x1FFF7808U;
   uint32_t val = *flash_loc; //FLASH->PCROP1SR;
   DBG_MSG("%x\n", val);