diff --git a/selfdrive/assets/sounds_chs/audio_1.wav b/selfdrive/assets/sounds_chs/audio_1.wav new file mode 100644 index 0000000..b3c7d6a Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_1.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_10.wav b/selfdrive/assets/sounds_chs/audio_10.wav new file mode 100644 index 0000000..7ed5e62 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_10.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_2.wav b/selfdrive/assets/sounds_chs/audio_2.wav new file mode 100644 index 0000000..50348e9 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_2.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_3.wav b/selfdrive/assets/sounds_chs/audio_3.wav new file mode 100644 index 0000000..fe24ab0 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_3.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_4.wav b/selfdrive/assets/sounds_chs/audio_4.wav new file mode 100644 index 0000000..94f1be9 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_4.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_5.wav b/selfdrive/assets/sounds_chs/audio_5.wav new file mode 100644 index 0000000..73bbae2 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_5.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_6.wav b/selfdrive/assets/sounds_chs/audio_6.wav new file mode 100644 index 0000000..e566b56 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_6.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_7.wav b/selfdrive/assets/sounds_chs/audio_7.wav new file mode 100644 index 0000000..18a6651 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_7.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_8.wav b/selfdrive/assets/sounds_chs/audio_8.wav new file mode 100644 index 0000000..0fd4df9 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_8.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_9.wav b/selfdrive/assets/sounds_chs/audio_9.wav new file mode 100644 index 0000000..55ba2ed Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_9.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_auto_hold.wav b/selfdrive/assets/sounds_chs/audio_auto_hold.wav new file mode 100644 index 0000000..ae4a2dd Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_auto_hold.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_car_watchout.wav b/selfdrive/assets/sounds_chs/audio_car_watchout.wav new file mode 100644 index 0000000..03ba1e6 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_car_watchout.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_disengage.wav b/selfdrive/assets/sounds_chs/audio_disengage.wav new file mode 100644 index 0000000..e5a318e Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_disengage.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_engage.wav b/selfdrive/assets/sounds_chs/audio_engage.wav new file mode 100644 index 0000000..97a718f Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_engage.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_lane_change.wav b/selfdrive/assets/sounds_chs/audio_lane_change.wav new file mode 100644 index 0000000..888a989 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_lane_change.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_lanechange.wav b/selfdrive/assets/sounds_chs/audio_lanechange.wav new file mode 100644 index 0000000..c27cb9e Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_lanechange.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_speed_down.wav b/selfdrive/assets/sounds_chs/audio_speed_down.wav new file mode 100644 index 0000000..c43694d Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_speed_down.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_stopping.wav b/selfdrive/assets/sounds_chs/audio_stopping.wav new file mode 100644 index 0000000..0b4e957 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_stopping.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_stopstop.wav b/selfdrive/assets/sounds_chs/audio_stopstop.wav new file mode 100644 index 0000000..23d9647 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_stopstop.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_traffic_error.wav b/selfdrive/assets/sounds_chs/audio_traffic_error.wav new file mode 100644 index 0000000..7daf661 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_traffic_error.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_turn.wav b/selfdrive/assets/sounds_chs/audio_turn.wav new file mode 100644 index 0000000..b60d1d3 Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_turn.wav differ diff --git a/selfdrive/assets/sounds_chs/audio_turn2.wav b/selfdrive/assets/sounds_chs/audio_turn2.wav new file mode 100644 index 0000000..825150a Binary files /dev/null and b/selfdrive/assets/sounds_chs/audio_turn2.wav differ diff --git a/selfdrive/assets/sounds_chs/disengage.wav b/selfdrive/assets/sounds_chs/disengage.wav new file mode 100644 index 0000000..ba583c4 Binary files /dev/null and b/selfdrive/assets/sounds_chs/disengage.wav differ diff --git a/selfdrive/assets/sounds_chs/engage.wav b/selfdrive/assets/sounds_chs/engage.wav new file mode 100644 index 0000000..41e9b2d Binary files /dev/null and b/selfdrive/assets/sounds_chs/engage.wav differ diff --git a/selfdrive/assets/sounds_chs/nnff.wav b/selfdrive/assets/sounds_chs/nnff.wav new file mode 100644 index 0000000..3379414 Binary files /dev/null and b/selfdrive/assets/sounds_chs/nnff.wav differ diff --git a/selfdrive/assets/sounds_chs/prompt.wav b/selfdrive/assets/sounds_chs/prompt.wav new file mode 100644 index 0000000..1ae7705 Binary files /dev/null and b/selfdrive/assets/sounds_chs/prompt.wav differ diff --git a/selfdrive/assets/sounds_chs/prompt_distracted.wav b/selfdrive/assets/sounds_chs/prompt_distracted.wav new file mode 100644 index 0000000..c3d4475 Binary files /dev/null and b/selfdrive/assets/sounds_chs/prompt_distracted.wav differ diff --git a/selfdrive/assets/sounds_chs/refuse.wav b/selfdrive/assets/sounds_chs/refuse.wav new file mode 100644 index 0000000..0e80f7d Binary files /dev/null and b/selfdrive/assets/sounds_chs/refuse.wav differ diff --git a/selfdrive/assets/sounds_chs/reverse_gear.wav b/selfdrive/assets/sounds_chs/reverse_gear.wav new file mode 100644 index 0000000..3858dda Binary files /dev/null and b/selfdrive/assets/sounds_chs/reverse_gear.wav differ diff --git a/selfdrive/assets/sounds_chs/tici_disengaged.wav b/selfdrive/assets/sounds_chs/tici_disengaged.wav new file mode 100644 index 0000000..1aa5f28 Binary files /dev/null and b/selfdrive/assets/sounds_chs/tici_disengaged.wav differ diff --git a/selfdrive/assets/sounds_chs/tici_engaged.wav b/selfdrive/assets/sounds_chs/tici_engaged.wav new file mode 100644 index 0000000..72fc06e Binary files /dev/null and b/selfdrive/assets/sounds_chs/tici_engaged.wav differ diff --git a/selfdrive/assets/sounds_chs/traffic_sign_changed.wav b/selfdrive/assets/sounds_chs/traffic_sign_changed.wav new file mode 100644 index 0000000..2047247 Binary files /dev/null and b/selfdrive/assets/sounds_chs/traffic_sign_changed.wav differ diff --git a/selfdrive/assets/sounds_chs/traffic_sign_green.wav b/selfdrive/assets/sounds_chs/traffic_sign_green.wav new file mode 100644 index 0000000..2f4c209 Binary files /dev/null and b/selfdrive/assets/sounds_chs/traffic_sign_green.wav differ diff --git a/selfdrive/assets/sounds_chs/warning_immediate.wav b/selfdrive/assets/sounds_chs/warning_immediate.wav new file mode 100644 index 0000000..b1815a9 Binary files /dev/null and b/selfdrive/assets/sounds_chs/warning_immediate.wav differ diff --git a/selfdrive/assets/sounds_chs/warning_soft.wav b/selfdrive/assets/sounds_chs/warning_soft.wav new file mode 100644 index 0000000..261c7e1 Binary files /dev/null and b/selfdrive/assets/sounds_chs/warning_soft.wav differ diff --git a/selfdrive/ui/carrot.cc b/selfdrive/ui/carrot.cc index 638c8ff..9d1353f 100644 --- a/selfdrive/ui/carrot.cc +++ b/selfdrive/ui/carrot.cc @@ -219,8 +219,8 @@ static inline void fill_rect(NVGcontext* vg, const Rect1& r, const NVGcolor* col if (stroke_width > 0) { nvgStrokeWidth(vg, stroke_width); if (stroke_color) nvgStrokeColor(vg, *stroke_color); - else nvgStrokeColor(vg, nvgRGB(0, 0, 0)); - nvgStroke(vg); + else nvgStrokeColor(vg, nvgRGB(0, 0, 0)); + nvgStroke(vg); } } @@ -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); @@ -1127,7 +1127,7 @@ public: return -1; } const auto carrot_man = sm["carrotMan"].getCarrotMan(); - + active_carrot = carrot_man.getActiveCarrot(); if (active_carrot > 1) { @@ -1151,7 +1151,7 @@ public: szSdiDescr = QString::fromStdString(carrot_man.getSzSdiDescr()); szPosRoadName = QString::fromStdString(carrot_man.getSzPosRoadName()); szTBTMainText = QString::fromStdString(carrot_man.getSzTBTMainText()); - + } else { //xTurnInfo = -1; @@ -1930,7 +1930,7 @@ public: int max_z = lane_lines[2].getZ().size(); float z_offset = 0.0; foreach(const QString & pair, pairs) { - QStringList xy = pair.split(","); // ","로 x와 y 구분 + QStringList xy = pair.split(","); // ","로 x와 y 구분 if (xy.size() == 3) { //printf("coords = x: %.1f, y: %.1f, d:%.1f\n", xy[0].toFloat(), xy[1].toFloat(), xy[2].toFloat()); float x = xy[0].toFloat(); @@ -2114,7 +2114,7 @@ public: void drawHud(UIState* s) { int show_device_state = params.getInt("ShowDeviceState"); blink_timer = (blink_timer + 1) % 16; - disp_timer = (disp_timer + 1) % 64; + disp_timer = (disp_timer + 1) % 64; nvgTextAlign(s->vg, NVG_ALIGN_CENTER | NVG_ALIGN_BOTTOM); int x = 140;// 120; @@ -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]); @@ -2663,7 +2663,7 @@ void ui_draw(UIState *s, ModelRenderer* model_renderer, int w, int h) { int path_x = drawPathEnd.getPathX(); int path_y = drawPathEnd.getPathY(); drawDesire.draw(s, path_x, path_y - 135); - + drawPlot.draw(s); diff --git a/selfdrive/ui/soundd.py b/selfdrive/ui/soundd.py index 661da6c..f002055 100644 --- a/selfdrive/ui/soundd.py +++ b/selfdrive/ui/soundd.py @@ -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