diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk index 349330e..a4c9f4c 100644 --- a/Aerodactyl-vendor.mk +++ b/Aerodactyl-vendor.mk @@ -354,6 +354,8 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/smartpa_param/tfa98xx_voice.bin:$(TARGET_COPY_OUT_VENDOR)/etc/smartpa_param/tfa98xx_voice.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/smsdbvisitor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/smsdbvisitor.xml \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/special_pws_channel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/special_pws_channel.xml \ + vendor/nothing/Aerodactyl/proprietary/vendor/etc/st21nfc_conf.txt:$(TARGET_COPY_OUT_VENDOR)/etc/st21nfc_conf.txt \ + vendor/nothing/Aerodactyl/proprietary/vendor/etc/st54j_conf.txt:$(TARGET_COPY_OUT_VENDOR)/etc/st54j_conf.txt \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/thermal/disable_skin_control.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal/disable_skin_control.conf \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/thermal/disable_thermal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal/disable_thermal.conf \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/thermal/disable_thermal_temp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal/disable_thermal_temp.conf \ @@ -406,7 +408,6 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/mt6635_fm_v1_coeff.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/mt6635_fm_v1_coeff.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/mt6635_fm_v1_patch.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/mt6635_fm_v1_patch.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/remoteproc_scp:$(TARGET_COPY_OUT_VENDOR)/firmware/remoteproc_scp \ - vendor/nothing/Aerodactyl/proprietary/vendor/firmware/st21nfc_fw.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/st21nfc_fw.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/st21nfc_fw7.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/st21nfc_fw7.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/st54j_fw.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/st54j_fw.bin \ vendor/nothing/Aerodactyl/proprietary/vendor/firmware/tfa98xx.cnt:$(TARGET_COPY_OUT_VENDOR)/firmware/tfa98xx.cnt \ diff --git a/proprietary/vendor/etc/libnfc-hal-st-st54j.conf b/proprietary/vendor/etc/libnfc-hal-st-st54j.conf index dc3cef3..c9236fb 100644 --- a/proprietary/vendor/etc/libnfc-hal-st-st54j.conf +++ b/proprietary/vendor/etc/libnfc-hal-st-st54j.conf @@ -16,7 +16,7 @@ NFC_DEBUG_ENABLED=0 ############################################################################### # Vendor specific mode to enable FW (RF & SWP) traces. # use value 5 to enable CLT mode logging -- for debug only. -STNFC_FW_DEBUG_ENABLED=1 +STNFC_FW_DEBUG_ENABLED=0 # STNFC_FW_SWP_LOG_SIZE=30 # STNFC_FW_RF_LOG_SIZE=15 @@ -103,8 +103,8 @@ STNFC_FW_PATH_STORAGE="/vendor/firmware/" # Folder of the firmware configuration STNFC_FW_CONF_STORAGE="/vendor/etc/" -# STNFC_FW_BIN_NAME="st54j_fw.bin" -# STNFC_FW_CONF_NAME="st54j_conf.txt" +STNFC_FW_BIN_NAME="st54j_fw.bin" +STNFC_FW_CONF_NAME="st54j_conf.txt" ############################################################################### # Default off-host route for Felica. diff --git a/proprietary/vendor/etc/libnfc-hal-st.conf b/proprietary/vendor/etc/libnfc-hal-st.conf index c4ab93c..7e473af 100644 --- a/proprietary/vendor/etc/libnfc-hal-st.conf +++ b/proprietary/vendor/etc/libnfc-hal-st.conf @@ -16,7 +16,7 @@ NFC_DEBUG_ENABLED=0 ############################################################################### # Vendor specific mode to enable FW (RF & SWP) traces. # use value 5 to enable CLT mode logging -- for debug only. -STNFC_FW_DEBUG_ENABLED=1 +STNFC_FW_DEBUG_ENABLED=0 # STNFC_FW_SWP_LOG_SIZE=30 # STNFC_FW_RF_LOG_SIZE=15 @@ -103,8 +103,8 @@ STNFC_FW_PATH_STORAGE="/vendor/firmware/" # Folder of the firmware configuration STNFC_FW_CONF_STORAGE="/vendor/etc/" -# STNFC_FW_BIN_NAME="st21nfc_fw7.bin" -# STNFC_FW_CONF_NAME="st21nfc_conf.txt" +STNFC_FW_BIN_NAME="st21nfc_fw7.bin" +STNFC_FW_CONF_NAME="st21nfc_conf.txt" ############################################################################### # Default off-host route for Felica. diff --git a/proprietary/vendor/etc/st21nfc_conf.txt b/proprietary/vendor/etc/st21nfc_conf.txt new file mode 100644 index 0000000..d5d2935 --- /dev/null +++ b/proprietary/vendor/etc/st21nfc_conf.txt @@ -0,0 +1,44 @@ +REM CONFIG CRC IS BCBB +HW_RESET_I2C,00, +SLEEP,00,2000, +NCI_CORE_RESET,00, +NCI_CORE_INIT,0000, +SLEEP,00,200 +REM RESET THE CUSTOMER FIELD +NCI_SEND_PROP,0F,02,040006010008000000000000a5a5 +SLEEP,00,200 +REM HARDWARE CONFIGURATION +NCI_SEND_PROP,0F,02,040002010024201204138801F401000404FF08020305C600000500000000000000A00404530000000009 +SLEEP,00,200 +REM Writing CustomA RF Parameters +NCI_SEND_PROP,0F,02,0400100100DCC059804AA90C00D50000FFAF0000FFAF075F600702010103000000000000000000000000EA004929870F000000000000880000008800000088000000880000008800000078787858980101010101FEFEFEFEFE1010101010F3F3F3F3F3F4F4F4F4F400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001010101010202020202030303030303030303030505050505050505050507070707070707070707070707070702E2E2E2E2EFFFFFFFFFF0000 +REM Writing CustomB RF Parameters +NCI_SEND_PROP,0F,02,040010010154C05999C608040242040402420303142D3D3D3D3D3D3D3D2C2C2CFC00000000000000FCFC000000000000000000000000404040E04040404040404011949444959595450000000000000000000000000000000000 +REM Set DPC table +NCI_DIRECT_CTRL,2F,02,04000301004A6F0CBB0CFF0C540D9F0DEB0D360E7F0ECD0E170F5F0F9F0FC70FEE0FFF0FFF0FFF08FF08FF08FF08FF08FF085B09B209050A530A9F0AEF0A3B0B8A0BD30B0D0CFF0FFF0FFF0FFFFFFF1F +SLEEP,00,200 +REM UICC CONFIG +NCI_DIRECT_CTRL,2F,02,04000A01001A40043C3C04B027100AF007D003E807D00064271003E832C81964 +SLEEP,00,200 +REM SE CONFIG +NCI_DIRECT_CTRL,2F,02,04000B01001A40041E1E04B027100AF007D003E807D00064271003E832C81964 +SLEEP,00,200 +REM IOT CONFIG +NCI_DIRECT_CTRL,2F,02,04000801000CDF01A3000000C1C2C3003DC0 +SLEEP,00,200 +REM ANTENNA CONFIG +NCI_DIRECT_CTRL,2F,02,0400090100200000E10BB801B5FFEC0000000000000000000000000000000000000000000000 +SLEEP,00,200 +REM NFCC CONFIG +NCI_DIRECT_CTRL,2F,02,0400010100050053000606 +SLEEP,00,200 +REM WRITE CONFIGURATION CRC IN THE CUSTOMER FIELD +NCI_SEND_PROP,0F,02,040006010008000000000000BCBB +SLEEP,00,200 +HW_RESET_I2C,00, +SLEEP,00,2000, +NCI_CORE_RESET,00, +NCI_CORE_INIT,0000, +REM MATCHING ;86.6;2.54;60.47;Differential;Yes;15;560;No;No;ANT;1500;4.7;77;100;2200;77;2200;150 +REM CONFIGURATION ;1442.15452755905;693.561990314352;4.869890487187;No;No;Differential;Yes;77;560;180;184.7;DNP;2200;ANT;150;22;4.7;100;4.5 +REM TOOL VERSION 3.4 diff --git a/proprietary/vendor/etc/st54j_conf.txt b/proprietary/vendor/etc/st54j_conf.txt new file mode 100644 index 0000000..8dc33de --- /dev/null +++ b/proprietary/vendor/etc/st54j_conf.txt @@ -0,0 +1,64 @@ +REM CONFIG CRC IS 1E3B +HW_RESET_I2C,00, +SLEEP,00,2000, +NCI_CORE_RESET,00, +NCI_CORE_INIT,0000, +SLEEP,00,200 +REM RESET THE CUSTOMER FIELD +NCI_SEND_PROP,0F,02,040006010008000000000000a5a5 +SLEEP,00,200 +REM HARDWARE CONFIGURATION +NCI_SEND_PROP,0F,02,040002010024805204138801F404000A0AFF080203020407000200000000000000000000000400080709 +SLEEP,00,200 +REM RF Parameters +REM Writing CFG STATIC CUSTOM Parameters +NCI_SEND_PROP,0F,02, 04001001 00 20 4400CE4C 803E80038209480537408058000000000000000000000000E02EB000 +SLEEP,00,200 +REM Writing CFG DYNAMIC CUSTOM Parameters +NCI_SEND_PROP,0F,02, 04001001 01 78 44005EF6 8700000087000000870000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 02 D0 4400BC2E 0000FC0800E1980300A0610500A061050001982E0001982E0001982E0001982E00009C2E00E1982E00A0992E00A0992E0000FC0800E1980300A0610500A061050001982E0001982E0001982E0001982E00009C2E00E1982E00A0992E00A0992E0000FC0800E1980300A0610500A061050001982E0001982E0001982E0001982E00009C2E00E1982E00A0992E00A0992E00001700000017000000170079797A7A000010100000101079797A7A202010102020101079797A7A5656101056561010A3056D00A3056D00A3056D00 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 03 AC 44009A91 FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000FF7F0000A5800200A5800200A5800200FFFFFF00FFFFFF00FFFFFF00 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 04 94 44009A97 0821800308A1830308A1830308A18303630C8003630C8003630C8003630C8003630C8003638C830342888303428883030821800308A1830308A1830308A18303630C8003630C8003630C8003630C8003630C8003638C830342888303428883030821800308A1830308A1830308A18303630C8003630C8003630C8003630C8003630C8003638C83034288830342888303 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 05 94 44004A78 638C3106638C3106638C3106638C3106091D5308091D5308648C3106648C3106091D5308091D5308A5142104A5142104638C3106638C3106638C3106638C3106091D5308091D5308648C3106648C3106091D5308091D5308A5142104A5142104638C3106638C3106638C3106638C3106091D5308091D5308648C3106648C3106091D5308091D5308A5142104A5142104 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 06 94 4400FF1F 6BAD740A6BAD740AE79C4206E79C42064A29A5144A29A5148CA994108CA994104A29A5144A29A5148CA994108CA994106BAD740A6BAD740AE79C4206E79C42064A29A5144A29A5148CA994108CA994104A29A5144A29A5148CA994108CA994106BAD740A6BAD740AE79C4206E79C42064A29A5144A29A5148CA994108CA994104A29A5144A29A5148CA994108CA99410 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 07 94 4400DCE7 104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000104200001042000010420000 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 08 94 44002752 10420821104208211042082110420821BA420821104208211042082110420821BA42082110420821104208211042082110420821104208211042082110420821BA420821104208211042082110420821BA42082110420821104208211042082110420821104208211042082110420821BA420821104208211042082110420821BA420821104208211042082110420821 +SLEEP,00,200 +NCI_SEND_PROP,0F,02, 04001001 09 94 44005263 10420821104208211042782F1042782FFFFFFF3F104208211042002110420021FFFFFF3F10420821104200211042002110420821104208211042782F1042782FFFFFFF3F104208211042002110420021FFFFFF3F10420821104200211042002110420821104208211042782F1042782FFFFFFF3F104208211042002110420021FFFFFF3F104208211042002110420021 +SLEEP,00,200 +REM Set DPC table +NCI_DIRECT_CTRL,2F,02,0400030100259B292FFFD0FFD0FFD0003000300030FFD0FFD0FFD000300030003033333308080801010100 +SLEEP,00,200 +REM UICC1 CONFIG +NCI_DIRECT_CTRL,2F,02,04000A01001A40003C3C04B027100AF007D003E807D00064271003E832C81964 +SLEEP,00,200 +REM UICC2 CONFIG +NCI_DIRECT_CTRL,2F,02,04000C01001A40003C3C04B027100AF007D003E807D00064271003E832C81964 +SLEEP,00,200 +REM SE CONFIG +NCI_DIRECT_CTRL,2F,02,04000B01001A40003C3C04B027100AF007D003E807D00064271003E832C81964 +SLEEP,00,200 +REM IOT CONFIG +NCI_DIRECT_CTRL,2F,02,04000801000C1F0006000000C1C2C3000000 +SLEEP,00,200 +REM NFCC CONFIG +NCI_DIRECT_CTRL,2F,02,04000101000820570606060C8888 +SLEEP,00,200 +REM WRITE CONFIGURATION CRC IN THE CUSTOMER FIELD +NCI_SEND_PROP,0F,02,0400060100080000000000001E3B +SLEEP,00,200 +HW_RESET_I2C,00, +SLEEP,00,2000, +NCI_CORE_RESET,00, +NCI_CORE_INIT,0000, +REM MATCHING ;84.9;3.06;62.2;Differential;Yes;15;560;No;No;100;77;560;2200 +REM CONFIGURATION ;1267.38679738562;713.145618909043;4.92772728023146;No;No;Differential;Yes;77;560;195;159;DNP;2200;100;4.5 +REM APPLICATION TOOL VERSION 2.23 +REM RF CRC DCBF diff --git a/proprietary/vendor/firmware/st21nfc_fw.bin b/proprietary/vendor/firmware/st21nfc_fw.bin deleted file mode 100644 index 35bc02f..0000000 Binary files a/proprietary/vendor/firmware/st21nfc_fw.bin and /dev/null differ