initial gpio for nfc and reader

solosky · Feb 25, 2024 · 9ceda3b · 9ceda3b
1 parent a268db4
commit 9ceda3b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,11 @@ fw/.settings
 fw/_build
 fw/.idea
 
+
+fw/application/.settings
+fw/application/_build
+fw/application/.idea
+
 fw/src/amiibo_private.c
 fw/src/version.inc.h
 fw/src/version.json

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -24,7 +24,7 @@
                 "DEBUG_NRF",
                 "M_USE_THREAD_BACKEND=0"
             ],
-            "compilerPath": "D:/dev/SDKs/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc.exe",
+            "compilerPath": "arm-none-eabi-gcc",
             "cStandard": "c11",
             "cppStandard": "c++17",
             "intelliSenseMode": "windows-gcc-arm"

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
       "name": "Pixl.js JLink Debug",
       "cwd": "${workspaceRoot}",
       "executable": "fw/_build/pixljs.out",
-      "armToolchainPath": "D:/dev/SDKs/gcc-arm-none-eabi-10-2020-q4-major/bin",
+      "armToolchainPath": "",
       "request": "launch",
       "type": "cortex-debug",
       "servertype": "jlink",
@@ -22,7 +22,7 @@
       "name": "Pixl.js Pyocd Debug",
       "cwd": "${workspaceRoot}",
       "executable": "fw/_build/pixljs.out",
-      "armToolchainPath": "D:/dev/SDKs/gcc-arm-none-eabi-10-2020-q4-major/bin",
+      "armToolchainPath": "",
       "request": "launch",
       "type": "cortex-debug",
       "servertype": "pyocd",
@@ -52,7 +52,7 @@
       "name": "Pixl.js BL JLink Debug",
       "cwd": "${workspaceRoot}",
       "executable": "fw/_build/bootloader.out",
-      "armToolchainPath": "D:/dev/SDKs/gcc-arm-none-eabi-10-2020-q4-major/bin",
+      "armToolchainPath": "",
       "request": "launch",
       "type": "cortex-debug",
       "servertype": "jlink",

diff --git a/fw/application/Makefile b/fw/application/Makefile
@@ -9,7 +9,7 @@ U8G2_ROOT := ../components/u8g2/csrc
 CHAMELEON_ROOT :=$(COMP_DIR)/chameleon-ultra/firmware
 
 APP_VERSION ?= 1
-RELEASE ?= 1
+RELEASE ?= 0
 BOARD ?= NEO
 
 

diff --git a/fw/application/src/app/reader/nfc/nfc_reader.c b/fw/application/src/app/reader/nfc/nfc_reader.c
@@ -8,6 +8,7 @@
 #include "rc522.h"
 
 void nfc_reader_enter() {
+
     nrf_gpio_pin_set(HF_ANT_SEL);
     nrf_gpio_pin_set(RD_PWR);
     bsp_timer_init();
@@ -26,6 +27,13 @@ void nfc_reader_exit() {
     bsp_timer_uninit();
     pcd_14a_reader_uninit();
 
+    nrf_gpio_pin_clear(HF_ANT_SEL);
+    nrf_gpio_pin_clear(RD_PWR);
+}
+
+void nfc_reader_init(){
+    nrf_gpio_cfg_output(HF_ANT_SEL);
+    nrf_gpio_cfg_output(RD_PWR);
     nrf_gpio_pin_clear(HF_ANT_SEL);
     nrf_gpio_pin_clear(RD_PWR);
 }
diff --git a/fw/application/src/app/reader/nfc/nfc_reader.h b/fw/application/src/app/reader/nfc/nfc_reader.h
@@ -5,6 +5,7 @@
 #include "app_status.h"
 
 
+void nfc_reader_init();
 void nfc_reader_enter();
 void nfc_reader_exit();
 

diff --git a/fw/application/src/main.c b/fw/application/src/main.c
@@ -272,7 +272,7 @@ int main(void) {
 
 #ifdef RC522
     //nfc initialized as emulator mode
-    //nfc_reader_exit();
+    nfc_reader_init();
 #endif
 
     chrg_init();