Skip to content

Commit e6c7144

Browse files
authored
Merge pull request #20 from HighCodeh/dev
ST25 NFC Driver
2 parents 68e3164 + 6d41131 commit e6c7144

108 files changed

Lines changed: 22233 additions & 188 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.releaserc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
"changelogFile": "CHANGELOG.md"
2121
}],
2222
["@semantic-release/exec", {
23-
"prepareCmd": "sed -i 's/\"version\": *\"[^\"]*\"/\"version\": \"${nextRelease.version}\"/' firmware_p4/assets/config/OTA/firmware.json firmware_c5/assets/config/OTA/firmware.json"
23+
"prepareCmd": "sed -i 's/\"version\": *\"[^\"]*\"/\"version\": \"${nextRelease.version}\"/' firmware_p4/assets/config/OTA/firmware.json firmware_c5/assets/config/OTA/firmware.json && sed -i 's/#define FIRMWARE_VERSION \"[^\"]*\"/#define FIRMWARE_VERSION \"${nextRelease.version}\"/' firmware_p4/components/Service/ota/include/ota_version.h"
2424
}],
2525
["@semantic-release/git", {
2626
"assets": [
2727
"CHANGELOG.md",
2828
"firmware_p4/assets/config/OTA/firmware.json",
29-
"firmware_c5/assets/config/OTA/firmware.json"
29+
"firmware_c5/assets/config/OTA/firmware.json",
30+
"firmware_p4/components/Service/ota/include/ota_version.h"
3031
],
3132
"message": "chore(release): v${nextRelease.version}"
3233
}],

commitlint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ module.exports = {
88
]],
99
'scope-case': [0],
1010
'subject-case': [0],
11+
'header-max-length': [2, 'always', 200],
1112
},
1213
};

firmware_p4/components/Applications/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ file(GLOB_RECURSE SUBGHZ_APP_SRCS "SubGhz/*.c")
6161
file(GLOB_RECURSE BLE_APP_SRCS "bluetooth/*.c")
6262
file(GLOB_RECURSE BADUSB_APP_SRCS "bad_usb/*.c")
6363
file(GLOB_RECURSE WIFI_APP_SRCS "wifi/*.c")
64+
file(GLOB_RECURSE NFC_APP_SRCS "nfc/*.c")
6465

6566
idf_component_register(SRCS
6667
"play/play.c"
6768
${UI_SRCS}
6869
${WIFI_APP_SRCS}
70+
${NFC_APP_SRCS}
6971
${BADUSB_APP_SRCS}
7072
${BLE_APP_SRCS}
7173
"ui/ui_manager.c"
@@ -96,6 +98,17 @@ idf_component_register(SRCS
9698
INCLUDE_DIRS
9799
"play/include"
98100
"wifi/include"
101+
"nfc/include"
102+
"nfc/protocols/common/include"
103+
"nfc/protocols/emv/include"
104+
"nfc/protocols/felica/include"
105+
"nfc/protocols/iso14443a/include"
106+
"nfc/protocols/iso14443b/include"
107+
"nfc/protocols/iso15693/include"
108+
"nfc/protocols/llcp/include"
109+
"nfc/protocols/mifare/include"
110+
"nfc/protocols/t1t/include"
111+
"nfc/protocols/t2t/include"
99112
"ui/include"
100113
"ui/screens/SubGhz/include"
101114
"ui/screens/bluetooth/include"
@@ -136,6 +149,7 @@ idf_component_register(SRCS
136149
esp_common
137150
esp_wifi
138151
esp_tinyusb
152+
mbedtls
139153
bt
140154
)
141155
target_link_libraries(${COMPONENT_LIB} -Wl,-zmuldefs)

0 commit comments

Comments
 (0)