Skip to content

Commit

Permalink
Merge branch 'commaai:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rav4kumar authored Feb 26, 2024
2 parents fd30164 + a425510 commit 92cc6b3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ env:
RUN: docker run -e PYTHONWARNINGS=error --shm-size 1G --name cereal cereal /bin/sh -c
RUN_NAMED: docker run -e PYTHONWARNINGS=error --shm-size 1G --rm cereal /bin/sh -c
CI_RUN: docker run -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID --rm cerealci /bin/bash -c
BUILD: |
docker pull $(grep -ioP '(?<=^from)\s+\S+' Dockerfile) || true
docker pull $DOCKER_REGISTRY/cereal:latest || true
docker build --cache-from $DOCKER_REGISTRY/cereal:latest -t cereal -f Dockerfile .
BUILD: docker buildx build --pull --load --cache-to type=inline --cache-from $DOCKER_REGISTRY/cereal:latest -t cereal -f Dockerfile .
PYTHONWARNINGS: error

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
hooks:
- id: mypy
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
rev: v0.2.2
hooks:
- id: ruff
- repo: local
Expand Down
1 change: 1 addition & 0 deletions car.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ struct CarParams {
body @27;
hyundaiCanfd @28;
volkswagenMqbEvo @29;
chryslerCusw @30;
}

enum SteerControlType {
Expand Down
3 changes: 2 additions & 1 deletion log.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ struct InitData {
tici @4;
pc @5;
tizi @6;
mici @7;
}

struct PandaInfo {
Expand Down Expand Up @@ -357,7 +358,6 @@ struct DeviceState @0xa4d8b5af2aa492eb {
cpuTempC @26 :List(Float32);
gpuTempC @27 :List(Float32);
memoryTempC @28 :Float32;
ambientTempC @30 :Float32;
nvmeTempC @35 :List(Float32);
modemTempC @36 :List(Float32);
pmicTempC @39 :List(Float32);
Expand Down Expand Up @@ -430,6 +430,7 @@ struct DeviceState @0xa4d8b5af2aa492eb {
chargingErrorDEPRECATED @17 :Bool;
chargingDisabledDEPRECATED @18 :Bool;
usbOnlineDEPRECATED @12 :Bool;
ambientTempCDEPRECATED @30 :Float32;
}

struct PandaState @0xa7649e2575e4591e {
Expand Down

0 comments on commit 92cc6b3

Please sign in to comment.