This commit is contained in:
机械小鸽 2025-06-14 16:03:07 +08:00 committed by GitHub
parent 0f8a46cfd6
commit ea23209348
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 19 additions and 19 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -696,11 +696,11 @@ public:
else if (longActive) {
if (xState == 3 || xState == 5) { //XState.e2eStop, XState.e2eStopped
if (v_ego < 1.0) {
sprintf(str, "%s", (trafficState >= 1000) ? "신호오류" : "신호대기");
sprintf(str, "%s", (trafficState >= 1000) ? "信号错误" : "信号等待");
ui_draw_text(s, x, disp_y, str, disp_size, COLOR_WHITE, BOLD);
}
else {
ui_draw_text(s, x, disp_y, "신호감속중", disp_size, COLOR_WHITE, BOLD);
ui_draw_text(s, x, disp_y, "信号减速中", disp_size, COLOR_WHITE, BOLD);
}
#if 0
else if (getStopDist() > 0.5) {
@ -712,7 +712,7 @@ public:
#endif
}
else if (xState == 4) { //XState.e2ePrepare
ui_draw_text(s, x, disp_y, "E2E주행중", disp_size, COLOR_WHITE, BOLD);
ui_draw_text(s, x, disp_y, "E2E模式", disp_size, COLOR_WHITE, BOLD);
}
else if (xState == 0 || xState == 1 || xState == 2) { //XState.lead
draw_dist = true;
@ -1028,17 +1028,17 @@ protected:
ui_draw_text(s, bx, by + 25 * scale - 6 * (1 - scale), str, 60 * scale, COLOR_BLACK, BOLD, 0.0f, 0.0f);
}
}
}
}
int drawTurnInfoHud(const UIState* s) {
if (s->fb_w < 1200) return -1;
#ifdef __UI_TEST
active_carrot = 2;
nGoPosDist = 500000;
nGoPosTime = 4 * 60 * 60;
szSdiDescr = "어린이 보호구역(스쿨존 시작 구간)";
szSdiDescr = "儿童保护区域(学校区域起始路段)";
xTurnInfo = 1;
xDistToTurn = 1000;
szPosRoadName = "구문천 1길 17";
szPosRoadName = "九文川1街17号";
#endif
//if (active_carrot <= 1) return;
@ -1080,9 +1080,9 @@ protected:
case 4: ui_draw_image(s, { bx - icon_size / 2, by - icon_size / 2, icon_size, icon_size }, "ic_lane_change_r", 1.0f); break;
case 7: ui_draw_image(s, { bx - icon_size / 2, by - icon_size / 2, icon_size, icon_size }, "ic_turn_u", 1.0f); break;
case 6: ui_draw_text(s, bx, by + 20, "TG", 35, COLOR_WHITE, BOLD); break;
case 8: ui_draw_text(s, bx, by + 20, "목적지", 35, COLOR_WHITE, BOLD); break;
case 8: ui_draw_text(s, bx, by + 20, "目的地", 35, COLOR_WHITE, BOLD); break;
default:
sprintf(str, "감속:%d", xTurnInfo);
sprintf(str, "减速:%d", xTurnInfo);
ui_draw_text(s, bx, by + 20, str, 35, COLOR_WHITE, BOLD);
break;
}
@ -1111,7 +1111,7 @@ protected:
int remaining_minutes = (int)nGoPosTime / 60;
local->tm_min += remaining_minutes;
mktime(local);
sprintf(str, "도착: %.1f분(%02d:%02d)", (float)nGoPosTime / 60., local->tm_hour, local->tm_min);
sprintf(str, "到达: %.1f分(%02d:%02d)", (float)nGoPosTime / 60., local->tm_hour, local->tm_min);
ui_draw_text(s, tbt_x + 190, tbt_y + 80, str, 50, COLOR_WHITE, BOLD);
sprintf(str, "%.1fkm", nGoPosDist / 1000.);
ui_draw_text(s, tbt_x + 190 + 120, tbt_y + 130, str, 50, COLOR_WHITE, BOLD);
@ -2195,7 +2195,7 @@ public:
const SubMaster& sm = *(s->sm);
// draw gap info
char driving_mode_str[32] = "연비";
char driving_mode_str[32] = "经济";
int driving_mode = myDrivingMode;// params.getInt("MyDrivingMode");
NVGcolor mode_color = COLOR_GREEN_ALPHA(210);
NVGcolor text_color = COLOR_WHITE;
@ -2365,7 +2365,7 @@ public:
}
if (show_datetime == 1 || show_datetime == 3) {
//strftime(str, sizeof(str), "%m-%d-%a", local);
const char* weekdays_ko[] = { "", "", "", "", "", "", "" };
const char* weekdays_ko[] = { "", "", "", "", "", "", "" };
strftime(str, sizeof(str), "%m-%d", local); // 날짜만 가져옴
int weekday_index = local->tm_wday; // tm_wday: 0=일, 1=월, ..., 6=토
snprintf(str + strlen(str), sizeof(str) - strlen(str), "(%s)", weekdays_ko[weekday_index]);

View File

@ -130,7 +130,7 @@ class Soundd:
if self.lang == "main_ko":
wavefile = wave.open(BASEDIR + "/selfdrive/assets/sounds/" + filename, 'r')
else:
wavefile = wave.open(BASEDIR + "/selfdrive/assets/sounds_eng/" + filename, 'r')
wavefile = wave.open(BASEDIR + "/selfdrive/assets/sounds_chs/" + filename, 'r')
#assert wavefile.getnchannels() == 1
assert wavefile.getsampwidth() == 2