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

HKG: Car Port for Hyundai Palisade and Kia Telluride 2023-24 (non-HDA2) #27478

Closed
wants to merge 101 commits into from
Closed

HKG: Car Port for Hyundai Palisade and Kia Telluride 2023-24 (non-HDA2) #27478

wants to merge 101 commits into from

Commits on Mar 2, 2023

  1. HKG: Car Port for Hyundai Palisade 2023 and Kia Telluride 2023 (non-H… 

    …DA2)
    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    d634ddf View commit details
    Browse the repository at this point in the history

  2. don't forget dbc

    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    4356862 View commit details
    Browse the repository at this point in the history

  3. Don't forward

    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    95bee73 View commit details
    Browse the repository at this point in the history

  4. Revert "Don't forward" 

    This reverts commit 95bee73.
    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    19bd540 View commit details
    Browse the repository at this point in the history

  5. try not modifying checksum

    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    0eda669 View commit details
    Browse the repository at this point in the history

  6. forward counters

    @sunnyhaibin
    sunnyhaibin committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    0f7c065 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. try this?

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    c98ba3c View commit details
    Browse the repository at this point in the history

  2. fill it up

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    640786d View commit details
    Browse the repository at this point in the history

  3. limit it

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    8115513 View commit details
    Browse the repository at this point in the history

  4. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    dcd952f View commit details
    Browse the repository at this point in the history

  5. try this out

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    faa6c42 View commit details
    Browse the repository at this point in the history

  6. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    fc3678b View commit details
    Browse the repository at this point in the history

  7. pass through everything from cs

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    b5016f7 View commit details
    Browse the repository at this point in the history

  8. don't use

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7abebcf View commit details
    Browse the repository at this point in the history

  9. only modify these

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a2a651f View commit details
    Browse the repository at this point in the history

  10. wait, we weren't sending this?!

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    ca9bad0 View commit details
    Browse the repository at this point in the history

  11. Send LFA on this one too!

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    5722959 View commit details
    Browse the repository at this point in the history

  12. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    71b51c7 View commit details
    Browse the repository at this point in the history

  13. bump panda

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    fdac94b View commit details
    Browse the repository at this point in the history

  14. pass through LFAHDA_MPC and some modified

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7521b9c View commit details
    Browse the repository at this point in the history

  15. try sending these values now

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a16ad58 View commit details
    Browse the repository at this point in the history

  16. don't send this

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    dc62540 View commit details
    Browse the repository at this point in the history

  17. stop changing

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    aeeb9b9 View commit details
    Browse the repository at this point in the history

  18. try sending checksum and counter this way

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a99f8b4 View commit details
    Browse the repository at this point in the history

  19. some cleanup

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    ede8075 View commit details
    Browse the repository at this point in the history

  20. more cleanup

    @sunnyhaibin
    sunnyhaibin committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    4d88dbd View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. 6b checksum

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    38e5bdd View commit details
    Browse the repository at this point in the history

  2. should be byte 1-7

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    c9a0208 View commit details
    Browse the repository at this point in the history

  3. try this checksum

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    eb35f6c View commit details
    Browse the repository at this point in the history

  4. hmm

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    c97875a View commit details
    Browse the repository at this point in the history

  5. try the old one

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    78a79a7 View commit details
    Browse the repository at this point in the history

  6. suppress cluster error

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    3644a3c View commit details
    Browse the repository at this point in the history

  7. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    a6d087c View commit details
    Browse the repository at this point in the history

  8. match stock

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    a7f17ce View commit details
    Browse the repository at this point in the history

  9. small cleanup

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    549f51e View commit details
    Browse the repository at this point in the history

  10. lower delta up/down

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    0ae5ac4 View commit details
    Browse the repository at this point in the history

  11. some cleanup

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    44f141a View commit details
    Browse the repository at this point in the history

  12. add test route

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    01ed053 View commit details
    Browse the repository at this point in the history

  13. merge rx checks

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    5dd3927 View commit details
    Browse the repository at this point in the history

  14. bump panda

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    cf86db4 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'upstream/master' into palisade-2023-port-2

    @sunnyhaibin
    sunnyhaibin committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    f211b32 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. fix understeer

    @sunnyhaibin
    sunnyhaibin committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    71e151c View commit details
    Browse the repository at this point in the history

  2. Revert "fix understeer" 

    This reverts commit 71e151c.
    @sunnyhaibin
    sunnyhaibin committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    c9fb5e5 View commit details
    Browse the repository at this point in the history

  3. less oversteer

    @sunnyhaibin
    sunnyhaibin committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    ab8b5b4 View commit details
    Browse the repository at this point in the history

  4. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    db3c22f View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. lower friction to test torqued

    @sunnyhaibin
    sunnyhaibin committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    45538cb View commit details
    Browse the repository at this point in the history

  2. default values worked best

    @sunnyhaibin
    sunnyhaibin committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    08f6958 View commit details
    Browse the repository at this point in the history

  3. Revert "default values worked best" 

    This reverts commit 08f6958.
    @sunnyhaibin
    sunnyhaibin committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    61000d9 View commit details
    Browse the repository at this point in the history

  4. higher factor at init

    @sunnyhaibin
    sunnyhaibin committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    6ae76fe View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. add more FW

    @sunnyhaibin
    sunnyhaibin committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    21743b1 View commit details
    Browse the repository at this point in the history

  2. Revert "add more FW" 

    This reverts commit 21743b1.
    @sunnyhaibin
    sunnyhaibin committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    208e780 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. add more FW (mbbarnestn)

    @sunnyhaibin
    sunnyhaibin committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    4f0ac09 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge remote-tracking branch 'upstream/master' into palisade-2023-port-2 

    # Conflicts:
#	RELEASES.md
#	opendbc
#	panda
    @sunnyhaibin
    sunnyhaibin committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    da0ed5e View commit details
    Browse the repository at this point in the history

  2. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    ca843fa View commit details
    Browse the repository at this point in the history

  3. bump panda

    @sunnyhaibin
    sunnyhaibin committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    d3f0ec4 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2023

  1. Merge branch 'upstream/openpilot/master' into palisade-2023-port-2 

    # Conflicts:
#	RELEASES.md
#	docs/CARS.md
#	opendbc
#	panda
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/torque_data/override.yaml
    @sunnyhaibin
    sunnyhaibin committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    cdb227b View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. fix

    @sunnyhaibin
    sunnyhaibin committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    8aa2fa6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2
    @sunnyhaibin
    sunnyhaibin committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    5241883 View commit details
    Browse the repository at this point in the history

  3. Update CARS.md

    @sunnyhaibin
    sunnyhaibin committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    ac4f430 View commit details
    Browse the repository at this point in the history

  4. Fix

    @sunnyhaibin
    sunnyhaibin committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6e944e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	panda
#	selfdrive/car/hyundai/interface.py
    @sunnyhaibin
    sunnyhaibin committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    5fd43d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Sync with CanBus helper

    @sunnyhaibin
    sunnyhaibin committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    a887df0 View commit details
    Browse the repository at this point in the history

  2. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    6e72d77 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. Use generated DBC for common messages

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    8c20f19 View commit details
    Browse the repository at this point in the history

  2. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    ef63743 View commit details
    Browse the repository at this point in the history

  3. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    ac208d7 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	RELEASES.md
#	docs/CARS.md
#	panda
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/torque_data/override.yaml
    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    d776505 View commit details
    Browse the repository at this point in the history

  5. Cleanup and fixes

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    3b5d63a View commit details
    Browse the repository at this point in the history

  6. Should be here

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    cf1ae51 View commit details
    Browse the repository at this point in the history

  7. consolidate in method

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    aca2330 View commit details
    Browse the repository at this point in the history

  8. Gate the list

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    5a34070 View commit details
    Browse the repository at this point in the history

  9. Gate it by default

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    ee34c6e View commit details
    Browse the repository at this point in the history

  10. Update docs

    @sunnyhaibin
    sunnyhaibin committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    f324df0 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Revert for now

    @sunnyhaibin
    sunnyhaibin committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    51781a2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	opendbc
#	selfdrive/car/hyundai/carcontroller.py
    @sunnyhaibin
    sunnyhaibin committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    3abafb0 View commit details
    Browse the repository at this point in the history

  3. bump opendbc

    @sunnyhaibin
    sunnyhaibin committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    c38ac76 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Fix button method

    @sunnyhaibin
    sunnyhaibin committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    0cf6c5f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	opendbc
#	panda
    @sunnyhaibin
    sunnyhaibin committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    64cb137 View commit details
    Browse the repository at this point in the history

  3. try this

    @sunnyhaibin
    sunnyhaibin committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    5cbeeed View commit details
    Browse the repository at this point in the history

  4. flipped safety mode :p

    @sunnyhaibin
    sunnyhaibin committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    d2bad37 View commit details
    Browse the repository at this point in the history

  5. H7 reset

    @sunnyhaibin
    sunnyhaibin committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    9c16023 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	opendbc
#	panda
    @sunnyhaibin
    sunnyhaibin committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    2ee2bf0 View commit details
    Browse the repository at this point in the history

  2. This platform is radar SCC

    @sunnyhaibin
    sunnyhaibin committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    54e5f13 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	RELEASES.md
#	opendbc
#	panda
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/torque_data/override.yaml
    @sunnyhaibin
    sunnyhaibin committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    2384a52 View commit details
    Browse the repository at this point in the history

  4. fix

    @sunnyhaibin
    sunnyhaibin committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    c0955a2 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. bump safety param

    @sunnyhaibin
    sunnyhaibin committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    e14c5ba View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Merge remote-tracking branch 'upstream/master' into palisade-2023-port-2

    @sshane
    sshane committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    61a8219 View commit details
    Browse the repository at this point in the history

  2. lower lateral limits

    @sshane
    sshane committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    f1aebe5 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2

# Conflicts:
#	RELEASES.md
#	docs/CARS.md
#	opendbc
#	panda
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/interface.py
#	selfdrive/car/hyundai/values.py
#	selfdrive/car/torque_data/override.yaml
    @sunnyhaibin
    sunnyhaibin committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    e5c6e22 View commit details
    Browse the repository at this point in the history

  2. fix checksum arg

    @sunnyhaibin
    sunnyhaibin committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    ab0a211 View commit details
    Browse the repository at this point in the history

  3. remove unused

    @sunnyhaibin
    sunnyhaibin committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    b8074cf View commit details
    Browse the repository at this point in the history

  4. sync dbc with generator

    @sunnyhaibin
    sunnyhaibin committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a0d1d04 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Add more FW versions

    @sunnyhaibin
    sunnyhaibin authored Feb 8, 2024
    Configuration menu
    Copy the full SHA
    1792e9a View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge remote-tracking branch 'commaai/openpilot/master' into palisade… 

    …-2023-port-2
    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ff6f687 View commit details
    Browse the repository at this point in the history

  2. Missed

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c596a50 View commit details
    Browse the repository at this point in the history

  3. Update docs

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c311b6c View commit details
    Browse the repository at this point in the history

  4. Update RELEASES.md

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    0f66f91 View commit details
    Browse the repository at this point in the history

  5. Add back fingerprints from sync

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ae15252 View commit details
    Browse the repository at this point in the history

  6. Fix typo

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    6b8daf4 View commit details
    Browse the repository at this point in the history

  7. More

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    d54f695 View commit details
    Browse the repository at this point in the history

  8. Driver torque mismatch fix

    @sunnyhaibin
    sunnyhaibin committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    a49d4b9 View commit details
    Browse the repository at this point in the history