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.

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

Merge with upstream #3

Merged
merged 22 commits into from
Oct 13, 2023
Merged

Conversation

devtekve
Copy link
Collaborator

@devtekve devtekve commented Oct 12, 2023

This is bringing cereal up to speed with the latest master changes

adeebshihadeh and others added 20 commits September 12, 2023 16:30
Co-authored-by: adeebshihadeh <adeebshihadeh@users.noreply.github.com>
Update pre-commit hook versions

Co-authored-by: adeebshihadeh <adeebshihadeh@users.noreply.github.com>
* rename services

* keep more unique name

* type this
* 10 Hz

* constant

* fix

* revert

* fix peripheralState freq

* revert peripheral
# Conflicts:
#	.pre-commit-config.yaml
#	car.capnp
Refactored service list naming convention in messaging/init.py and services.py for consistency, changing `service_list` to `SERVICE_LIST`. Additionally, fields as `laneWidth`, `lProb`, `rProb`, `dProb` in `LateralPlan` struct and `brakeLights` in `CarEvent.EventName` have been marked as DEPRECATED as part of an ongoing effort for codebase clean-up. Changes also include updating the frequency of `pandaStates` service and commenting out a debug statement in msgq.cc, enhancing overall system performance.
Update pre-commit hook versions

Co-authored-by: adeebshihadeh <adeebshihadeh@users.noreply.github.com>
* Added bodyReserved0-2 text fields

* Added bodyReserved0 to services list

* add more bodyReserved to servcies py

* bodyReserved -> customReservedText

* :Text -> :Data

---------

Co-authored-by: Kacper Rączy <gfw.kra@gmail.com>
Enforce the same PID in ZMQ pub sockets
Update pre-commit hook versions

Co-authored-by: adeebshihadeh <adeebshihadeh@users.noreply.github.com>
Refactored service list naming convention in messaging/init.py and services.py for consistency, changing `service_list` to `SERVICE_LIST`. Additionally, fields as `laneWidth`, `lProb`, `rProb`, `dProb` in `LateralPlan` struct and `brakeLights` in `CarEvent.EventName` have been marked as DEPRECATED as part of an ongoing effort for codebase clean-up. Changes also include updating the frequency of `pandaStates` service and commenting out a debug statement in msgq.cc, enhancing overall system performance.
…with-sunny

# Conflicts:
#	car.capnp
#	services.py
@devtekve devtekve marked this pull request as ready for review October 12, 2023 10:26
log.capnp Outdated Show resolved Hide resolved
car.capnp Show resolved Hide resolved
Co-authored-by: Jason Wen <haibin.wen3@gmail.com>
@sunnyhaibin sunnyhaibin changed the title Master with sunny sunnypilot: Merge with upstream Oct 13, 2023
@sunnyhaibin sunnyhaibin changed the title sunnypilot: Merge with upstream Merge with upstream Oct 13, 2023
@sunnyhaibin sunnyhaibin merged commit 67d104c into sunnypilot:master Oct 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants