Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NFC: Add support for Gen4 "ultimate card" in Magic app #2238

Merged
merged 25 commits into from
May 25, 2023
Merged

NFC: Add support for Gen4 "ultimate card" in Magic app #2238

merged 25 commits into from
May 25, 2023

Commits on Dec 31, 2022

  1. NFC: gen4 gtu detect in magic app

    @nullableVoidPtr
    nullableVoidPtr committed Dec 31, 2022
    Configuration menu
    Copy the full SHA
    54f42e5 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2023

  1. NFC: more support for GTU card

    @nullableVoidPtr
    nullableVoidPtr committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    e38fe37 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    1774300 View commit details
    Browse the repository at this point in the history

  3. NFC: Fix Gen1 in Magic

    @nullableVoidPtr
    nullableVoidPtr committed Jan 2, 2023
    Configuration menu
    Copy the full SHA
    2ae8279 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Merge branch 'dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    10d6d1a View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Merge branch 'dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    1302146 View commit details
    Browse the repository at this point in the history

  2. Allow double UIDs for MFClassic on GTU cards

    @nullableVoidPtr
    nullableVoidPtr committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    d47c94c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2023

  1. NFC: Small magic app tweaks

    @nullableVoidPtr
    nullableVoidPtr committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    dc79046 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Feb 4, 2023
    Configuration menu
    Copy the full SHA
    cccb3fa View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. nfc magic: notify card event on wiping

    @nullableVoidPtr
    nullableVoidPtr committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    bec9358 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. WIP: [UNTESTED] merge from dev

    @nullableVoidPtr
    nullableVoidPtr committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    64d96b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge branch 'dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    7fa5033 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. Merge remote-tracking branch 'upstream/dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    c92bbea View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Merge remote-tracking branch 'upstream/dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    6f06758 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. nfc magic: fix power consumption

    @nullableVoidPtr
    nullableVoidPtr committed May 7, 2023
    Configuration menu
    Copy the full SHA
    fa84573 View commit details
    Browse the repository at this point in the history

  2. nfc magic: disable i2c writing and fix wipe loop

    @nullableVoidPtr
    nullableVoidPtr committed May 7, 2023
    Configuration menu
    Copy the full SHA
    773ac0b View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Merge branch 'dev' into gtu-magic

    @skotopes
    skotopes authored May 9, 2023
    Configuration menu
    Copy the full SHA
    966829b View commit details
    Browse the repository at this point in the history

  2. NfcMagic: correct formatting in printf

    @skotopes
    skotopes committed May 9, 2023
    Configuration menu
    Copy the full SHA
    f13e160 View commit details
    Browse the repository at this point in the history

  3. NfcMagic: correct formatting in printf, proper version

    @skotopes
    skotopes committed May 9, 2023
    Configuration menu
    Copy the full SHA
    92d46bd View commit details
    Browse the repository at this point in the history

  4. Format sources

    @skotopes
    skotopes committed May 9, 2023
    Configuration menu
    Copy the full SHA
    87fe26a View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. nfc_magic: rework card found notification and gen4 wiping

    @nullableVoidPtr
    nullableVoidPtr committed May 15, 2023
    Configuration menu
    Copy the full SHA
    c3c6191 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/dev' into gtu-magic

    @nullableVoidPtr
    nullableVoidPtr committed May 15, 2023
    Configuration menu
    Copy the full SHA
    0a01107 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge branch 'dev' into gtu-magic

    @skotopes
    skotopes authored May 24, 2023
    Configuration menu
    Copy the full SHA
    94ecf4a View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge branch 'dev' into gtu-magic

    @skotopes
    skotopes authored May 25, 2023
    Configuration menu
    Copy the full SHA
    8030c40 View commit details
    Browse the repository at this point in the history

  2. Fix PVS warnings

    @skotopes
    skotopes committed May 25, 2023
    Configuration menu
    Copy the full SHA
    5db6d62 View commit details
    Browse the repository at this point in the history