Merged
Conversation
ajouatom
pushed a commit
that referenced
this pull request
Apr 3, 2026
Co-authored-by: jominki354 <jomin354@gmail.com>
happymaj11r
pushed a commit
to happymaj11r/openpilot
that referenced
this pull request
Apr 5, 2026
Co-authored-by: jominki354 <jomin354@gmail.com>
ajouatom
added a commit
that referenced
this pull request
Apr 14, 2026
* fix.. setting file. * can type hkg jerk. * fix.. webrtcd. * fix carrotweb * delete print. * fix branch list.. * fix... canfd counter * fix main_enabled.. * fix.. fake corner radar enable * carrot_man, carrot_server : set_core_affinity * disable proclogd * disable cb_upper/lower (can type ) * disable naviPaths * Revert "disable naviPaths" This reverts commit 98f3c26. * fix.. memory problem. * fix canfd carstate & safety. * fix.. laterltorque bug.. * use mdps steering angle deg... * LaneLineCheck 옵션: 차선변경 판단 및 HUD 색상 연동 (#251) * 차선변경 차선판단 설정 추가 (LaneLineCheck) 색상 오인식 문제 대응: 0=색상+타입(기존), 1=타입만(점선/실선) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * LaneLineCheck=2 옵션 추가: 실선에서 토크 override 허용 점선은 바로 차선변경, 실선은 토크 넣으면 override Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * LaneLineCheck=2 실선 토크 override 버그 수정 solid_line_blocked일 때 토크+BSD 체크 후 바로 laneChangeStarting으로 전환하도록 수정. 기존에는 이후 분기의 lane_change_available 체크에 걸려서 실선 토크 override가 동작하지 않았음. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * HUD 차선 색상 표시를 LaneLineCheck 옵션에 연동 LaneLineCheck>=1일 때 HUD 차선 색상을 색상 raw값 대신 타입(점선/실선) 기준으로 판단하도록 변경하여 차선변경 로직과 HUD 표시 간 불일치 해소 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * fix steering angle deg * use distance-based curvature for laneless. * fix distance-based curvature (lower dist limit) * fix.. blinker.. * 계기판 LFA 아이콘 표시(5W,CANFD,비롱컨) (#253) * fix.. setting file. * fix.. memory problem. * Simplify LFA and HDA icon handling in carcontroller LFA 아이콘: 모든 CANFD 차량에서 LFAHDA_CLUSTER 전송 - camera_scc/openpilotLongitudinalControl 조건 제거 - stock 롱컨(순정 크루즈) 차량에서도 LFA 아이콘 표시되도록 함 - panda safety TX 리스트에 LFAHDA_CLUSTER가 모든 설정에 포함되어 있어 안전 - CARROT_CANFD_FWD 메커니즘이 카메라와의 버스 충돌 자동 방지 LFA 아이콘: 비 camera SCC CANFD 차량에서 ADRV_0x161 LFA_ICON 전송 - create_lfa_icon_non_camera_scc 함수 추가 (hyundaicanfd.py) - 카메라의 ADRV_0x161 메시지를 복사하여 LFA_ICON/LKA_ICON 오버라이드 - LKAS 관련 알림/사운드 억제 (openpilot LFA 대체로 인한 오경보 방지) - carcontroller.py에서 비 camera SCC일 때 5프레임마다 호출 - CARROT_CANFD_FWD 메커니즘으로 카메라 원본 자동 차단 - GV70 등 HDA1 CANFD CCNC 차량에서 LFA 아이콘이 클러스터에 표시됨 LFA 아이콘: LFAHDA_CLUSTER 메시지를 카메라 원본에서 복사 + LFA_OptUsmSta 설정 - 5W 클러스터에서 LFA 아이콘이 안 나타나던 핵심 원인: 기존 코드가 빈 딕셔너리에서 메시지를 생성하여 LFA_OptUsmSta=0이 됨 → 클러스터가 'LFA 기능 없음'으로 판단하여 아이콘 미표시 - 카메라 원본 LFAHDA_CLUSTER 메시지가 있으면 복사하여 사용 (LFA_OptUsmSta, HDA_OptUsmSta 등 모든 필드 보존) - 원본이 없을 때는 LFA_OptUsmSta=2, HDA_OptUsmSta=2 직접 설정 - rx_counter 전달로 COUNTER/CHECKSUM 정합성 보장 Co-authored-by: boramee <boramee@users.noreply.github.com> * Refactor create_lfahda_cluster and add create_lfa_icon_non_camera_scc LFA 아이콘: 모든 CANFD 차량에서 LFAHDA_CLUSTER 전송 - camera_scc/openpilotLongitudinalControl 조건 제거 - stock 롱컨(순정 크루즈) 차량에서도 LFA 아이콘 표시되도록 함 - panda safety TX 리스트에 LFAHDA_CLUSTER가 모든 설정에 포함되어 있어 안전 - CARROT_CANFD_FWD 메커니즘이 카메라와의 버스 충돌 자동 방지 LFA 아이콘: 비 camera SCC CANFD 차량에서 ADRV_0x161 LFA_ICON 전송 - create_lfa_icon_non_camera_scc 함수 추가 (hyundaicanfd.py) - 카메라의 ADRV_0x161 메시지를 복사하여 LFA_ICON/LKA_ICON 오버라이드 - LKAS 관련 알림/사운드 억제 (openpilot LFA 대체로 인한 오경보 방지) - carcontroller.py에서 비 camera SCC일 때 5프레임마다 호출 - CARROT_CANFD_FWD 메커니즘으로 카메라 원본 자동 차단 - GV70 등 HDA1 CANFD CCNC 차량에서 LFA 아이콘이 클러스터에 표시됨 LFA 아이콘: LFAHDA_CLUSTER 메시지를 카메라 원본에서 복사 + LFA_OptUsmSta 설정 - 5W 클러스터에서 LFA 아이콘이 안 나타나던 핵심 원인: 기존 코드가 빈 딕셔너리에서 메시지를 생성하여 LFA_OptUsmSta=0이 됨 → 클러스터가 'LFA 기능 없음'으로 판단하여 아이콘 미표시 - 카메라 원본 LFAHDA_CLUSTER 메시지가 있으면 복사하여 사용 (LFA_OptUsmSta, HDA_OptUsmSta 등 모든 필드 보존) - 원본이 없을 때는 LFA_OptUsmSta=2, HDA_OptUsmSta=2 직접 설정 - rx_counter 전달로 COUNTER/CHECKSUM 정합성 보장 Co-authored-by: boramee <boramee@users.noreply.github.com> --------- Co-authored-by: ajouatom <ajouatom@gmail.com> Co-authored-by: boramee <boramee@users.noreply.github.com> * fix.. * remove carrot speed control.. * fix.. steering angle deg.. * carrot navi i/f 2603 * carrot navi 2603-4 * fix msgq poll * fix web * fix.. * Revert "fix.." This reverts commit 4148653. * Revert "fix msgq poll" This reverts commit e8b95c3. * fix msgq poll 2 * kia pv5, test * screen recorder button * fix screen recorder .. * fix.. carrot_serv.. limit_speed bug.. * fix.. * fix.. * fix sm poll 3 * remove timeout.. navi server * liveParameters revert.. * fix carrotweb... * fix.. * revert... * revert model dist... * liveCalibration. * check timing, carrot web * test. screen record. * test screen_recorder * fix.. * fix. screenrecorder.. * fix.. * carrot web: tmux send to server, settings restore, install flask. * cpu temp.. * http navi.. server * fix.. * show_debug.. * apply model speed. * fix... * fix.. * fix.. * add apply model speed. * fix t_follow * fix.. auto_speed_up * apply_model_speed (test experimental mode..) * limit roadlimitspeed, model speed... * remove timeout log * Revert "fix t_follow" This reverts commit 66177d3. * fix... t_follow * test t_follow apply drivingModeFactor... * fix.. apply model speed * K7 add kia_k7_pe 2020 * num_readers 20 disable print finger. add check timestamp.. * fix (#261) duplicate kia manufacturer * fix settings. * traffic event : 5sec * test * Revert "test" This reverts commit ce471f9. * Reapply "test" This reverts commit 593b286. * fix.. * camera yaw adjust. * fix.. calibrate.. * fix.. yaw comments * Revert "fix.. yaw comments" This reverts commit b787b0c. * rever yaw adjust * disable departure alarm. * virtual brake light signal for GV70 * fix.. lfahda_cluster. * fix scc_control * for corner radar test * match counter increment.. * Revert "match counter increment.." This reverts commit 1c938f8. * Reapply "match counter increment.." This reverts commit 02031bd. * fix.. * Revert "fix.." This reverts commit 2533ab3. * fix.. * Revert "fix.." This reverts commit e5accdd. * Revert "Reapply "match counter increment.."" This reverts commit 1423035. * Reapply "Reapply "match counter increment.."" This reverts commit 93ffb63. * fix.. tx counter.. * buffered tx canfd. * canfd buffered tx * locationd: cam odo delay compensation (#37543) * build carrot. * Revert "build carrot." This reverts commit e5ffe99. * fix.. v_cruise init * fix.. * traffic light comment. * front refactoring 1 (#264) Co-authored-by: jominki354 <jomin354@gmail.com> * POP model. * web improvements and fix (#266) * web improvements 1 * fix * fix * fix * fix * fix --------- Co-authored-by: jominki354 <jomin354@gmail.com> * Revert "POP model." This reverts commit 5cc8ba6. * t_follow: dist -> jLead * fix.. * fix safety 0x1aa,0x1cf * fix web carrot (#268) Co-authored-by: jominki354 <jomin354@gmail.com> * fix.. canfd * fix... route_speed. * fix.. dynamic TF * web improvement (#269) Co-authored-by: jominki354 <jomin354@gmail.com> * cruise button long delay. * fix.. decel boost tf * TF decel boost * fix.. decelBoost * lat suspend delay 1.0 -> 0.2 sec * web carrot fix (#270) Co-authored-by: jominki354 <jomin354@gmail.com> * remove comma long cruise option * offpolicy model & * fix.. lateralDelay.. * fix.. * disable LFA_BTN * branch list.. * 리모트 브랜치도 브랜치 목록 필터에 포함되도록 수정 (#272) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * mdps, cruise_buttons, tcs use queue * Revert "mdps, cruise_buttons, tcs use queue" This reverts commit b088e1e. * mdps, cruise_buttons, tcs use queue2 * web carrot prototype (#273) * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work --------- Co-authored-by: jominki354 <jomin354@gmail.com> * Revert "disable LFA_BTN" This reverts commit 966ebfc. * web (#275) * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web work * web HUD: camera alert blink, overlay transparency, 20% smaller overlay - Camera alert red blink (1.6s cycle CSS animation) when xSpdLimit > 0 - Overlay mode: semi-transparent background, no shadow, subtle border - Overlay size reduced ~20% (ratio, min/max all scaled down) - speedLimitBlink field added to HUD payload pipeline * web work --------- Co-authored-by: jominki354 <jomin354@gmail.com> * web work (#279) Co-authored-by: jominki354 <jomin354@gmail.com> * fix canfdHDA2 * web work (#280) Co-authored-by: jominki354 <jomin354@gmail.com> * ev4 * canfd debug.. * web (#281) * web work * web work * web work * web work --------- Co-authored-by: jominki354 <jomin354@gmail.com> * web work (#282) Co-authored-by: jominki354 <jomin354@gmail.com> * web work (#283) # Conflicts: # selfdrive/carrot/web/index.html # selfdrive/carrot/web/js/app_realtime.js # system/webrtc/device/video.py # teleoprtc_repo/teleoprtc/stream.py Co-authored-by: jominki354 <jomin354@gmail.com> * web (#286) * web work # Conflicts: # selfdrive/carrot/web/index.html # selfdrive/carrot/web/js/app_realtime.js # system/webrtc/device/video.py # teleoprtc_repo/teleoprtc/stream.py * web work * fix * web work * fix --------- Co-authored-by: jominki354 <jomin354@gmail.com> * fix.. hda2 msg * KIA K7: Add gearStep display for CLUSTER_GEARS using LVR11 (#285) * Add gearStep display for CLUSTER_GEARS (K7) using LVR11 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Restrict gearStep to KIA_K7 only in CLUSTER_GEARS path Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * kia ray ev * branch filter. --------- Co-authored-by: happymaj11r <64297417+happymaj11r@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: boramee <boramee0131@gmail.com> Co-authored-by: boramee <boramee@users.noreply.github.com> Co-authored-by: 「 crwusiz 」 <43285072+crwusiz@users.noreply.github.com> Co-authored-by: jominki354 <jominki354@gmail.com> Co-authored-by: jominki354 <jomin354@gmail.com> Co-authored-by: shake777 <69850594+shake777@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
d