zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

int gap = carState.getCruiseState().pcmCruiseGap()

Browse Source
This commit is contained in:
机械小鸽 2025-03-04 08:52:15 +08:00 committed by GitHub
parent f70808df90
commit ca26232395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
selfdrive/ui/carrot.cc
View File

@ -2215,6 +2215,7 @@ public:
float setSpeed = carState.getCruiseState().getSpeed() * 3.6; // 转换为 km/h float setSpeed = carState.getCruiseState().getSpeed() * 3.6; // 转换为 km/h
sprintf(gap_str, "%.0f", setSpeed); sprintf(gap_str, "%.0f", setSpeed);
ui_draw_text(s, dx, dy, gap_str, 40, COLOR_WHITE, BOLD); ui_draw_text(s, dx, dy, gap_str, 40, COLOR_WHITE, BOLD);
int gap = carState.getCruiseState().pcmCruiseGap()
gap_last = gap; gap_last = gap;
dx = bx + 300 - 30; dx = bx + 300 - 30;
@ -2222,7 +2223,7 @@ public:
//float ddx = 70 / 4.; //float ddx = 70 / 4.;
float ddy = 80 / 4.; float ddy = 80 / 4.;
#ifdef __UI_TEST #ifdef __UI_TEST
gap = 3; gap = 4;
#endif #endif
for (int i = 0; i < gap; i++) { for (int i = 0; i < gap; i++) {
//ui_fill_rect(s->vg, { (int)(dx + i * ddx), (int)dy, (int)ddx - 2, 48 }, COLOR_GREEN_ALPHA(180), 4, 3); //ui_fill_rect(s->vg, { (int)(dx + i * ddx), (int)dy, (int)ddx - 2, 48 }, COLOR_GREEN_ALPHA(180), 4, 3);
@ -2344,7 +2345,7 @@ public:
} }
if (show_datetime == 1 || show_datetime == 3) { if (show_datetime == 1 || show_datetime == 3) {
//strftime(str, sizeof(str), "%m-%d-%a", local); //strftime(str, sizeof(str), "%m-%d-%a", local);
const char* weekdays_ko[] = { "일", "월", "화", "수", "목", "금", "토" }; const char* weekdays_ko[] = { "周日", "周一", "周二", "周三", "周四", "周五", "周六" };
strftime(str, sizeof(str), "%m-%d", local); // 날짜만 가져옴 strftime(str, sizeof(str), "%m-%d", local); // 날짜만 가져옴
int weekday_index = local->tm_wday; // tm_wday: 0=일, 1=월, ..., 6=토 int weekday_index = local->tm_wday; // tm_wday: 0=일, 1=월, ..., 6=토
snprintf(str + strlen(str), sizeof(str) - strlen(str), "(%s)", weekdays_ko[weekday_index]); snprintf(str + strlen(str), sizeof(str) - strlen(str), "(%s)", weekdays_ko[weekday_index]);