Skip to content

Commit 10a7950

Browse files
committed
June 21st, 2025 Update
1 parent d1257d8 commit 10a7950

1,434 files changed

Lines changed: 299406 additions & 737795 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/update_date

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025-04-26
1+
2025-06-21

.github/workflows/compile_frogpilot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ jobs:
8080
with:
8181
ref: ${{ needs.get_branch.outputs.branch }}
8282
sparse-checkout: |
83+
frogpilot/ui/
8384
selfdrive/controls/lib/alerts_offroad.json
84-
selfdrive/frogpilot/ui/
8585
selfdrive/ui/
8686
selfdrive/ui/update_translations.py
8787
selfdrive/ui/translations/

.github/workflows/update_pr_branch.yaml

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- FrogPilot-Staging
77

88
env:
9+
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
10+
911
SOURCE_BRANCH: FrogPilot-Staging
1012
TARGET_BRANCH: MAKE-PRS-HERE
1113

@@ -21,30 +23,25 @@ jobs:
2123
- name: Checkout ${{ env.SOURCE_BRANCH }}
2224
uses: actions/checkout@v3
2325
with:
24-
ref: "${{ env.SOURCE_BRANCH }}"
26+
persist-credentials: false
27+
2528
fetch-depth: 0
2629

30+
ref: ${{ env.SOURCE_BRANCH }}
31+
2732
- name: Find "Compile FrogPilot" Commit in ${{ env.SOURCE_BRANCH }}
2833
id: find_parent
2934
run: |
3035
COMMIT=$(git rev-list HEAD -n 1 --grep="Compile FrogPilot")
31-
if [ -z "$COMMIT" ]; then
32-
echo "Commit with message 'Compile FrogPilot' not found." >&2
33-
exit 1
34-
fi
36+
[ -z "$COMMIT" ] && echo "Compile commit not found." >&2 && exit 1
3537
3638
PARENT=$(git rev-list --parents -n 1 "$COMMIT" | awk '{print $2}')
37-
if [ -z "$PARENT" ]; then
38-
echo "Parent commit not found." >&2
39-
exit 1
40-
fi
39+
[ -z "$PARENT" ] && echo "Parent commit not found." >&2 && exit 1
4140
42-
echo "Compile commit: $COMMIT"
43-
echo "Parent commit: $PARENT"
4441
echo "parent_commit=$PARENT" >> "$GITHUB_OUTPUT"
4542
echo "compile_commit=$COMMIT" >> "$GITHUB_OUTPUT"
4643
47-
- name: Checkout ${{ env.TARGET_BRANCH }}
44+
- name: Fetch and Checkout ${{ env.TARGET_BRANCH }}
4845
run: |
4946
git fetch origin "${{ env.TARGET_BRANCH }}"
5047
git checkout "${{ env.TARGET_BRANCH }}"
@@ -53,17 +50,12 @@ jobs:
5350
run: |
5451
git rm -r --ignore-unmatch .
5552
git clean -fdx
56-
57-
PARENT_COMMIT="${{ steps.find_parent.outputs.parent_commit }}"
58-
git checkout "$PARENT_COMMIT" -- .
53+
git checkout "${{ steps.find_parent.outputs.parent_commit }}" -- .
5954
6055
COMPILE_COMMIT="${{ steps.find_parent.outputs.compile_commit }}"
6156
SOURCE_HEAD=$(git rev-parse "origin/${{ env.SOURCE_BRANCH }}")
6257
63-
if [ "$COMPILE_COMMIT" != "$SOURCE_HEAD" ]; then
64-
echo "Applying changes from '${{ env.SOURCE_BRANCH }}' branch..."
65-
git cherry-pick --no-commit "${COMPILE_COMMIT}".."$SOURCE_HEAD"
66-
fi
58+
[ "$COMPILE_COMMIT" != "$SOURCE_HEAD" ] && git cherry-pick --no-commit "${COMPILE_COMMIT}".."$SOURCE_HEAD"
6759
6860
rm -f .github/update_date
6961
@@ -72,28 +64,22 @@ jobs:
7264
- name: Commit and Push to ${{ env.TARGET_BRANCH }}
7365
run: |
7466
TZ_VALUE="America/Phoenix"
75-
current_day=$(TZ="$TZ_VALUE" date +"%-d")
67+
day=$(TZ="$TZ_VALUE" date +"%-d")
7668
month=$(TZ="$TZ_VALUE" date +"%B")
7769
year=$(TZ="$TZ_VALUE" date +"%Y")
7870
79-
if [[ "$current_day" =~ ^1[123]$ ]]; then
80-
suffix="th"
81-
else
82-
case $(($current_day % 10)) in
83-
1) suffix="st" ;;
84-
2) suffix="nd" ;;
85-
3) suffix="rd" ;;
86-
*) suffix="th" ;;
87-
esac
88-
fi
71+
case $day in
72+
11|12|13) s=th ;;
73+
*) case $((day % 10)) in 1) s=st ;; 2) s=nd ;; 3) s=rd ;; *) s=th ;; esac ;;
74+
esac
8975
90-
commit_message="${month} ${current_day}${suffix}, ${year} Update"
91-
echo "Commit message: $commit_message"
76+
commit_message="${month} ${day}${s}, ${year} Update"
9277
93-
if git log --oneline --format="%s" | grep -q "$commit_message"; then
94-
echo "Existing commit found with message: $commit_message"
78+
if git log -1 --pretty=%s | grep -q "$commit_message"; then
9579
git commit --amend --no-edit
9680
else
9781
git commit -m "$commit_message"
9882
fi
83+
84+
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}
9985
git push origin "${{ env.TARGET_BRANCH }}" --force

.github/workflows/update_release_branch.yaml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Update FrogPilot Branch
22

33
on:
44
schedule:
5-
- cron: "0 18 * * *"
5+
- cron: "0 18 * * 6"
66

77
env:
8+
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
9+
810
BRANCH_FROGPILOT: FrogPilot
911
BRANCH_PREVIOUS: FrogPilot-Previous
1012
BRANCH_STAGING: FrogPilot-Staging
@@ -20,7 +22,7 @@ jobs:
2022
update_due: ${{ steps.check_update.outputs.update_due }}
2123
scheduled_date: ${{ steps.check_update.outputs.scheduled_date }}
2224
steps:
23-
- name: Download the 'update_date' File
25+
- name: Download the "update_date" File
2426
id: download_update
2527
run: |
2628
curl -fLsS "https://raw.githubusercontent.com/FrogAi/FrogPilot/${{ env.BRANCH_STAGING }}/${{ env.UPDATE_FILE }}" -o update_date || touch update_date_missing
@@ -29,18 +31,14 @@ jobs:
2931
id: check_update
3032
run: |
3133
if [ -f update_date_missing ]; then
32-
echo "No update_date file found in FrogPilot-Staging."
3334
echo "update_due=false" >> "$GITHUB_OUTPUT"
3435
exit 0
3536
fi
3637
3738
SCHEDULED_DATE=$(cat update_date)
3839
CURRENT_DATE=$(TZ="${{ env.TZ }}" date +%F)
39-
echo "Scheduled Date: $SCHEDULED_DATE"
40-
echo "Current Date: $CURRENT_DATE"
4140
4241
if [ "$SCHEDULED_DATE" != "$CURRENT_DATE" ]; then
43-
echo "Update not due."
4442
echo "update_due=false" >> "$GITHUB_OUTPUT"
4543
exit 0
4644
fi
@@ -61,10 +59,17 @@ jobs:
6159
- name: Checkout ${{ env.BRANCH_STAGING }}
6260
uses: actions/checkout@v3
6361
with:
62+
persist-credentials: false
63+
6464
fetch-depth: 0
65+
6566
ref: ${{ env.BRANCH_STAGING }}
6667

67-
- name: Update README Date and Remove (${{ env.UPDATE_FILE }})
68+
- name: Authenticate with GITHUB_TOKEN
69+
run: |
70+
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}
71+
72+
- name: Update README Date and Remove update file
6873
run: |
6974
DAY=$(TZ="${{ env.TZ }}" date +'%d' | sed 's/^0//')
7075
case "$DAY" in
@@ -77,7 +82,6 @@ jobs:
7782
YEAR=$(TZ="${{ env.TZ }}" date +'%Y')
7883
NEW_DATE="**${MONTH} ${DAY}${SUFFIX}, ${YEAR}**"
7984
80-
echo "Updating README date to ${NEW_DATE}"
8185
sed -i "/FrogPilot was last updated on:/ { N; N; s/\(\n\)\n.*$/\1\n${NEW_DATE}/; }" README.md
8286
8387
git add README.md
@@ -102,18 +106,12 @@ jobs:
102106
run: |
103107
git fetch origin ${{ env.BRANCH_PREVIOUS }} ${{ env.BRANCH_FROGPILOT }}
104108
105-
- name: Wait Until Noon ${{ env.TZ }} Before Continuing
109+
- name: Wait Until Noon ${{ env.TZ }}
106110
run: |
107111
NOW=$(TZ="${{ env.TZ }}" date +%s)
108112
TARGET=$(TZ="${{ env.TZ }}" date -d "12:00" +%s)
109113
110-
if [ "$NOW" -lt "$TARGET" ]; then
111-
SLEEP_TIME=$((TARGET - NOW))
112-
echo "Sleeping for $SLEEP_TIME seconds until noon..."
113-
sleep $SLEEP_TIME
114-
else
115-
echo "It is already noon or past noon, proceeding immediately."
116-
fi
114+
[ "$NOW" -lt "$TARGET" ] && sleep $((TARGET - NOW))
117115
118116
- name: Push ${{ env.BRANCH_STAGING }}
119117
run: |

cereal/custom.capnp

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ using Car = import "car.capnp";
1010
# cereal, so use these if you want custom events in your fork.
1111

1212
# you can rename the struct, but don't change the identifier
13-
struct FrogPilotCarState @0x81c2f05a394cf4af {
13+
struct FrogPilotCarParams @0x81c2f05a394cf4af {
14+
fpFlags @0 :UInt32;
15+
isHDA2 @1 :Bool;
16+
openpilotLongitudinalControlDisabled @2 :Bool;
17+
}
18+
19+
struct FrogPilotCarState @0xaedffd8f31e7b55d {
1420
struct ButtonEvent {
1521
enum Type {
1622
lkas @0;
@@ -31,56 +37,55 @@ struct FrogPilotCarState @0x81c2f05a394cf4af {
3137
pauseLateral @11 :Bool;
3238
pauseLongitudinal @12 :Bool;
3339
sportGear @13 :Bool;
34-
trafficMode @14 :Bool;
40+
trafficModeEnabled @14 :Bool;
3541
}
3642

37-
struct FrogPilotDeviceState @0xaedffd8f31e7b55d {
43+
struct FrogPilotDeviceState @0xf35cc4560bbf6ec2 {
3844
freeSpace @0 :Int16;
3945
usedSpace @1 :Int16;
4046
}
4147

42-
struct FrogPilotNavigation @0xf35cc4560bbf6ec2 {
48+
struct FrogPilotNavigation @0xda96579883444c35 {
4349
approachingIntersection @0 :Bool;
4450
approachingTurn @1 :Bool;
4551
navigationSpeedLimit @2 :Float32;
4652
}
4753

48-
struct FrogPilotPlan @0xda96579883444c35 {
54+
struct FrogPilotPlan @0x80ae746ee2596b11 {
4955
accelerationJerk @0 :Float32;
5056
accelerationJerkStock @1 :Float32;
5157
dangerJerk @2 :Float32;
5258
desiredFollowDistance @3 :Int64;
5359
experimentalMode @4 :Bool;
54-
forcingStop @5 :Bool;
55-
forcingStopLength @6 :Float32;
56-
frogpilotEvents @7 :List(Car.CarEvent);
57-
lateralCheck @8 :Bool;
58-
laneWidthLeft @9 :Float32;
59-
laneWidthRight @10 :Float32;
60-
maxAcceleration @11 :Float32;
61-
minAcceleration @12 :Float32;
62-
mtscSpeed @13 :Float32;
63-
redLight @14 :Bool;
64-
roadCurvature @15 :Float32;
65-
slcMapSpeedLimit @16 :Float32;
66-
slcOverridden @17 :Bool;
67-
slcOverriddenSpeed @18 :Float32;
68-
slcSpeedLimit @19 :Float32;
69-
slcSpeedLimitOffset @20 :Float32;
70-
slcSpeedLimitSource @21 :Text;
71-
speedJerk @22 :Float32;
72-
speedJerkStock @23 :Float32;
73-
speedLimitChanged @24 :Bool;
74-
tFollow @25 :Float32;
75-
togglesUpdated @26 :Bool;
76-
unconfirmedSlcSpeedLimit @27 :Float32;
77-
upcomingSLCSpeedLimit @28 :Float32;
78-
vCruise @29 :Float32;
79-
vtscControllingCurve @30 :Bool;
80-
vtscSpeed @31 :Float32;
81-
}
82-
83-
struct CustomReserved4 @0x80ae746ee2596b11 {
60+
trackingLead @5 :Bool;
61+
forcingStop @6 :Bool;
62+
forcingStopLength @7 :Float32;
63+
frogpilotEvents @8 :List(Car.CarEvent);
64+
lateralCheck @9 :Bool;
65+
laneWidthLeft @10 :Float32;
66+
laneWidthRight @11 :Float32;
67+
maxAcceleration @12 :Float32;
68+
minAcceleration @13 :Float32;
69+
mtscSpeed @14 :Float32;
70+
redLight @15 :Bool;
71+
roadCurvature @16 :Float32;
72+
slcMapSpeedLimit @17 :Float32;
73+
slcMapboxSpeedLimit @18 :Float32;
74+
slcNextSpeedLimit @19 :Float32;
75+
slcOverriddenSpeed @20 :Float32;
76+
slcSpeedLimit @21 :Float32;
77+
slcSpeedLimitOffset @22 :Float32;
78+
slcSpeedLimitSource @23 :Text;
79+
speedJerk @24 :Float32;
80+
speedJerkStock @25 :Float32;
81+
speedLimitChanged @26 :Bool;
82+
tFollow @27 :Float32;
83+
themeUpdated @28 :Bool;
84+
togglesUpdated @29 :Bool;
85+
unconfirmedSlcSpeedLimit @30 :Float32;
86+
vCruise @31 :Float32;
87+
vtscControllingCurve @32 :Bool;
88+
vtscSpeed @33 :Float32;
8489
}
8590

8691
struct CustomReserved5 @0xa5cd762cd951a455 {

0 commit comments

Comments
 (0)