Compare commits

..

250 Commits

Author SHA1 Message Date
Rick Lan b2de3470b5 Merge branch 'devel-i18n' into devel-zhs 2020-04-10 09:15:33 +10:00
Rick Lan 5316ca562e re-add apks 2020-04-07 21:19:02 +10:00
Rick Lan ebc83086b7 Merge branch 'testing' into devel-zhs 2020-03-31 15:07:29 +10:00
Rick Lan ba11992845 Merge branch 'devel-i18n' into devel-zhs 2020-03-31 11:24:07 +10:00
Rick Lan 09e5039bf1 Merge branch 'devel-i18n' into devel-zhs 2020-03-28 12:16:19 +10:00
Rick Lan d253f6ea14 Merge branch 'devel-i18n' into devel-zhs 2020-03-27 12:51:50 +10:00
Rick Lan 667b2098d3 fix translation 2020-03-22 15:42:54 +10:00
Rick Lan 0f1882a34b Merge branch 'testing' into devel-zhs 2020-03-22 15:21:07 +10:00
dragonpilot c215d36589 sidebar translation 2020-03-17 16:20:20 +10:00
dragonpilot d0931c70e0 Merge branch 'devel-i18n' into devel-zhs 2020-03-17 16:18:28 +10:00
dragonpilot 6c248d2841 Merge branch 'devel-i18n' into devel-zhs 2020-03-14 11:32:08 +10:00
dragonpilot c866f0f408 Merge branch 'devel-i18n' into devel-zhs 2020-03-06 15:05:50 +10:00
dragonpilot beb29ba933 Merge branch 'devel-en' into devel-zhs 2020-03-04 13:32:52 +10:00
dragonpilot 0e87593094 Merge branch 'devel-en' into devel-zhs 2020-02-25 13:42:33 +10:00
dragonpilot 67cdf781a2 Merge branch 'devel-en' into devel-zhs 2020-02-21 14:09:52 +10:00
dragonpilot 90dea88f60 Merge branch 'devel-en' into devel-zhs 2020-02-14 11:24:14 +10:00
dragonpilot a483770f87 remove removed alerts 2020-02-08 13:42:57 +10:00
dragonpilot 8cc4a02495 fix up translation 2020-02-08 13:37:33 +10:00
dragonpilot f5a4f26bab Merge branch 'devel-en' into devel-zhs 2020-02-08 13:27:01 +10:00
dragonpilot baea7d84b6 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2020-01-31 17:29:05 +10:00
dragonpilot db857efa09 keep chinese fonts 2020-01-31 17:20:58 +10:00
dragonpilot 21191140dd Merge branch 'devel-en' into devel-zhs 2020-01-31 17:19:46 +10:00
dragonpilot fc679371e7 Merge branch 'devel-en' into devel-zhs 2020-01-29 22:03:52 +10:00
dragonpilot 5165d473c0 Merge branch 'devel-en' into devel-zhs 2020-01-23 15:07:30 +10:00
dragonpilot 59686cf715 add translations 2020-01-19 21:30:24 +10:00
dragonpilot dbc157a820 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2020-01-19 21:01:09 +10:00
dragonpilot dc06c1704b Merge branch 'devel-en' into devel-zhs 2020-01-19 21:00:49 +10:00
dragonpilot d126092246 Merge branch 'devel-en' into devel-zhs 2020-01-14 15:37:14 +10:00
dragonpilot d782fde947 Merge branch 'devel-en' into devel-zhs 2020-01-08 15:05:46 +10:00
dragonpilot bed5f9d26f Merge branch 'devel-en' into devel-zhs 2020-01-06 13:15:26 +10:00
dragonpilot a52d45cbeb re-add missing apks 2019-12-31 18:12:59 +10:00
dragonpilot 169fbbd035 Merge branch 'devel-en' into devel-zhs 2019-12-31 18:11:58 +10:00
Rick Lan 52c57c9b39 fix unable to launch app issue 2019-12-29 23:23:55 +10:00
Rick Lan 90757561fe Merge branch 'devel-en' into devel-zhs 2019-12-29 22:15:45 +10:00
dragonpilot 89d7f622c9 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-12-18 16:18:49 +10:00
dragonpilot f2d588acfc appless version 2019-12-18 16:18:31 +10:00
dragonpilot 9f91c828ab Merge branch 'devel-en' into devel-zhs 2019-12-18 14:42:24 +10:00
dragonpilot f7637f1184 Merge branch 'devel-en' into devel-zhs 2019-12-18 11:57:22 +10:00
dragonpilot 5ee14c6642 update translation 2019-12-17 12:54:25 +10:00
dragonpilot 6587be7037 Merge branch 'devel-en' into devel-zhs 2019-12-17 11:03:03 +10:00
dragonpilot 978a64b984 Merge branch 'devel-en' into devel-zhs 2019-12-17 11:01:56 +10:00
dragonpilot 3619494ec4 auto lane change send alerts 2019-12-17 11:01:48 +10:00
dragonpilot e3e7735493 update translation 2019-12-17 10:31:10 +10:00
dragonpilot 567ed531bf Merge branch 'devel-en' into devel-zhs 2019-12-17 10:08:25 +10:00
dragonpilot bc81e980d6 Merge branch 'devel-en' into devel-zhs 2019-12-10 11:41:32 +10:00
dragonpilot 8f26975a43 Merge branch 'devel-en' into devel-zhs 2019-11-21 09:23:02 +10:00
dragonpilot c048284f59 Merge branch 'devel-en' into devel-zhs 2019-11-19 16:04:30 +10:00
dragonpilot b40d633caa Merge branch 'devel-en' into devel-zhs 2019-11-19 10:12:04 +10:00
dragonpilot 794133c092 Merge branch 'devel-en' into devel-zhs 2019-11-18 08:02:21 +10:00
dragonpilot 2ea9730ec2 bug fix 2019-11-15 18:29:30 +10:00
dragonpilot acb965f089 Merge branch 'devel-en' into devel-zhs 2019-11-15 09:26:22 +10:00
dragonpilot efce59b7c3 Merge branch 'devel-en' into devel-zhs 2019-11-15 09:11:40 +10:00
dragonpilot 2e111341f7 Merge branch 'devel-en' into devel-zhs 2019-11-13 13:19:07 +10:00
dragonpilot 2588ecf77e Merge branch 'devel-en' into devel-zhs 2019-11-12 12:40:18 +10:00
dragonpilot 8f3044e266 Merge branch 'devel-en' into devel-zhs 2019-11-11 10:48:47 +10:00
dragonpilot b4f352b614 Merge branch 'devel-en' into devel-zhs 2019-11-08 13:11:20 +10:00
dragonpilot 82a4cefe2a Merge branch 'devel-en' into devel-zhs 2019-11-07 11:55:41 +10:00
dragonpilot 955aaf8b3a Merge branch 'devel-en' into devel-zhs 2019-11-07 11:42:52 +10:00
dragonpilot 8ec5db8e59 Merge branch 'devel-en' into devel-zhs 2019-11-06 16:45:04 +10:00
dragonpilot 6e33993c69 Merge branch 'devel-en' into devel-zhs 2019-11-06 16:34:31 +10:00
dragonpilot 13da193279 Merge branch 'devel-en' into devel-zhs 2019-11-06 15:22:00 +10:00
dragonpilot c667720312 Merge branch 'devel-en' into devel-zhs 2019-11-06 14:58:03 +10:00
dragonpilot 94ca4908f0 Merge branch 'devel-en' into devel-zhs 2019-11-06 14:51:29 +10:00
dragonpilot b00a6e346f Merge branch 'devel-en' into devel-zhs 2019-11-05 14:41:47 +10:00
dragonpilot e09b1f5173 Merge branch 'devel-en' into devel-zhs 2019-11-04 16:44:08 +10:00
dragonpilot 310d730381 Merge branch 'devel-en' into devel-zhs 2019-11-01 13:39:18 +10:00
dragonpilot ce5e6bff73 Merge branch 'devel-en' into devel-zhs 2019-11-01 13:35:46 +10:00
dragonpilot a7b17ec83c Merge branch 'devel-en' into devel-zhs 2019-11-01 11:11:39 +10:00
dragonpilot b47bc88d91 Merge branch 'devel-en' into devel-zhs 2019-10-31 11:25:29 +10:00
dragonpilot a0ebe813da Merge branch 'devel-en' into devel-zhs 2019-10-30 11:56:24 +10:00
dragonpilot 9f2810902b Merge branch 'devel-en' into devel-zhs 2019-10-30 10:37:42 +10:00
dragonpilot 2f0c4a343c Merge branch 'devel-en' into devel-zhs 2019-10-30 09:32:04 +10:00
dragonpilot 401dd06754 update APK 2019-10-29 10:17:41 +10:00
dragonpilot f6a6f09149 Merge branch 'devel-en' into devel-zhs 2019-10-29 10:04:16 +10:00
dragonpilot bd17323956 Merge branch 'devel-en' into devel-zhs 2019-10-28 12:34:23 +10:00
dragonpilot a5804647d3 Merge branch 'devel-en' into devel-zhs 2019-10-27 09:56:45 +10:00
dragonpilot f3476236db Merge branch 'devel-en' into devel-zhs 2019-10-25 09:18:19 +10:00
dragonpilot ce2676c3db Merge branch 'devel-en' into devel-zhs 2019-10-24 13:44:15 +10:00
dragonpilot a6c47612e8 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-10-22 16:54:10 +10:00
dragonpilot 989842f36c Merge branch 'devel-en' into devel-zhs 2019-10-22 16:53:48 +10:00
dragonpilot f0df652b77 Merge branch 'devel-en' into devel-zhs 2019-10-21 19:04:50 +10:00
dragonpilot 1f628db9e3 update APK 2019-10-21 11:23:59 +10:00
dragonpilot b6b0796059 Merge branch 'devel-en' into devel-zhs 2019-10-21 11:20:49 +10:00
dragonpilot cd3f477c34 Merge branch 'devel-en' into devel-zhs 2019-10-18 09:52:42 +10:00
dragonpilot 524d087992 Merge branch 'devel-en' into devel-zhs 2019-10-18 09:42:02 +10:00
dragonpilot 412ac923d6 update APK 2019-10-17 14:29:54 +10:00
dragonpilot a2ec1158ce Merge branch 'devel-en' into devel-zhs 2019-10-17 14:29:44 +10:00
dragonpilot b9500591c8 Merge branch 'devel-en' into devel-zhs 2019-10-17 13:35:17 +10:00
dragonpilot 7d153f558c update APK 2019-10-17 10:39:03 +10:00
dragonpilot 17ba9712c3 Merge branch 'devel-en' into devel-zhs 2019-10-17 10:37:34 +10:00
dragonpilot 012ad245f4 Merge branch 'devel-en' into devel-zhs 2019-10-16 17:22:31 +10:00
dragonpilot 056d3bafb8 Merge branch 'devel-en' into devel-zhs 2019-10-16 16:11:23 +10:00
dragonpilot 20215c5edc Merge branch 'devel-en' into devel-zhs 2019-10-16 11:58:03 +10:00
dragonpilot cb1c0cf041 Merge branch 'devel-en' into devel-zhs 2019-10-16 10:36:45 +10:00
dragonpilot fa452b9bdb Merge branch 'devel-en' into devel-zhs 2019-10-15 12:02:50 +10:00
dragonpilot 6358273b65 Update APK 2019-10-14 17:20:03 +10:00
dragonpilot e39f995c9e Merge branch 'devel-en' into devel-zhs 2019-10-14 17:19:03 +10:00
dragonpilot 95458011da Merge branch 'devel-en' into devel-zhs 2019-10-14 16:56:25 +10:00
dragonpilot 8ac8c27469 Merge branch 'devel-en' into devel-zhs 2019-10-14 16:04:14 +10:00
dragonpilot 11f049bb82 Merge branch 'devel-en' into devel-zhs 2019-10-14 13:59:49 +10:00
dragonpilot d60670cbef update APK 2019-10-14 13:51:23 +10:00
dragonpilot 11c9f05a41 Merge branch 'devel-en' into devel-zhs 2019-10-14 13:51:15 +10:00
dragonpilot 5430ce178a update APK 2019-10-14 12:37:36 +10:00
dragonpilot 12f1e93f05 Merge branch 'devel-en' into devel-zhs 2019-10-14 11:04:37 +10:00
dragonpilot 71e3b9a966 Merge branch 'devel-en' into devel-zhs 2019-10-13 10:37:31 +10:00
dragonpilot 8903731369 Merge branch 'devel-en' into devel-zhs 2019-10-11 13:44:32 +10:00
dragonpilot 8634c44c7f Update APK 2019-10-11 13:14:38 +10:00
dragonpilot f96fa69fd5 Merge branch 'devel-en' into devel-zhs 2019-10-11 13:14:08 +10:00
dragonpilot 8c6af53ea1 Merge branch 'devel-en' into devel-zhs 2019-10-10 23:24:14 +10:00
dragonpilot bba6b4a64d Merge branch 'devel-en' into devel-zhs 2019-10-09 14:46:35 +10:00
dragonpilot 57b115057a Merge branch 'devel-en' into devel-zhs 2019-10-08 14:43:33 +10:00
dragonpilot d0917afc54 Update APK 2019-10-08 11:21:22 +10:00
dragonpilot 8f3a70edde Merge branch 'devel-en' into devel-zhs 2019-10-08 10:50:08 +10:00
dragonpilot 9e81d14ffe Merge branch 'devel-en' into devel-zhs 2019-10-08 10:25:54 +10:00
dragonpilot ece399205f Merge branch 'devel-en' into devel-zhs 2019-10-07 21:11:53 +10:00
dragonpilot 4139904700 Merge branch 'devel-en' into devel-zhs 2019-10-06 20:20:20 +10:00
dragonpilot 06958d60d0 Merge branch 'devel-en' into devel-zhs 2019-10-01 12:18:30 +10:00
dragonpilot a75e8c378a Merge branch 'devel-en' into devel-zhs 2019-09-30 12:47:58 +10:00
dragonpilot 56c1b9851c Merge branch 'devel-en' into devel-zhs 2019-09-30 11:44:49 +10:00
dragonpilot 979e5055e5 Merge branch 'devel-en' into devel-zhs 2019-09-28 16:39:06 +10:00
dragonpilot 168107625a Merge branch 'devel-en' into devel-zhs 2019-09-27 15:11:51 +10:00
dragonpilot a536a2f91b Merge branch 'devel-en' into devel-zhs 2019-09-26 16:59:27 +10:00
dragonpilot cd6e20a4f9 Merge branch 'devel-en' into devel-zhs 2019-09-26 16:51:01 +10:00
dragonpilot cb731ec3f0 Update APK 2019-09-25 11:06:03 +10:00
dragonpilot 7702fcddbb Merge branch 'devel-en' into devel-zhs 2019-09-25 10:59:53 +10:00
dragonpilot 2c4336225f Merge branch 'devel-en' into devel-zhs 2019-09-23 14:44:33 +10:00
dragonpilot a5cf330dce Update APK 2019-09-23 14:29:17 +10:00
dragonpilot 4a8144374c Merge branch 'devel-en' into devel-zhs 2019-09-23 14:28:54 +10:00
dragonpilot 1ecbcd6c19 update APK 2019-09-23 13:46:45 +10:00
dragonpilot f7bb52fd1a Merge branch 'devel-en' into devel-zhs 2019-09-23 13:44:48 +10:00
dragonpilot f0d529e633 Merge branch 'devel-en' into devel-zhs 2019-09-23 12:38:14 +10:00
dragonpilot 17a3e0de48 update APK 2019-09-20 16:00:21 +10:00
dragonpilot 2051dc9f6c Merge branch 'devel-en' into devel-zhs 2019-09-20 16:00:10 +10:00
dragonpilot 1320e51e73 Merge branch 'devel-en' into devel-zhs 2019-09-20 15:24:48 +10:00
dragonpilot 8afc3660cb Merge branch 'devel-en' into devel-zhs 2019-09-19 16:40:03 +10:00
dragonpilot 684daccc00 Merge branch 'devel-en' into devel-zhs 2019-09-17 12:41:58 +10:00
dragonpilot c14b16d50b Merge branch 'devel-en' into devel-zhs 2019-09-14 18:20:34 +10:00
dragonpilot 44dc63663b Update APK 2019-09-13 23:11:38 +10:00
dragonpilot 5677d7427f Merge branch 'devel-en' into devel-zhs 2019-09-13 23:11:12 +10:00
dragonpilot 3c1b4f3976 Merge branch 'devel-en' into devel-zhs 2019-09-09 14:25:23 +10:00
dragonpilot e876f98917 Merge branch 'devel-en' into devel-zhs 2019-09-09 14:18:08 +10:00
dragonpilot 4f1ff0a7f8 更新APK 2019-09-09 13:03:50 +10:00
dragonpilot bb285b4f27 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
#	apk/ai.comma.plus.offroad.apk
2019-09-09 12:57:52 +10:00
dragonpilot 337debb930 Merge branch 'devel-en' into devel-zhs 2019-09-05 15:33:34 +10:00
dragonpilot cf30989e9e Merge branch 'devel-en' into devel-zhs 2019-09-05 11:16:27 +10:00
dragonpilot 4aa8bef68f Merge branch 'devel-en' into devel-zhs 2019-09-04 15:37:53 +10:00
dragonpilot 50a481abd6 Merge branch 'devel-en' into devel-zhs 2019-09-04 14:40:32 +10:00
dragonpilot dbe9714eaa Merge branch 'devel-zhs' of https://dragonpilot@github.com/dragonpilot-community/dragonpilot.git; branch 'devel-en' into devel-zhs 2019-09-04 12:23:40 +10:00
dragonpilot dbad60d49f Merge branch 'devel-en' into devel-zhs 2019-09-02 15:35:18 +10:00
dragonpilot 1e190ce69d Merge branch 'devel-en' into devel-zhs 2019-09-02 14:46:03 +10:00
dragonpilot d4c7cd6156 Merge branch 'devel-en' into devel-zhs 2019-09-02 13:24:29 +10:00
dragonpilot 926370d84a 更新APK 2019-09-02 11:58:08 +10:00
dragonpilot 7f4f1d5477 Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot into devel-zhs 2019-09-02 11:51:10 +10:00
dragonpilot 93f13c549a Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
2019-09-02 11:50:24 +10:00
dragonpilot 0988c7da8a Merge branch 'devel-en' into devel-zhs 2019-08-30 20:51:05 +10:00
dragonpilot 0965836b14 更新APK 2019-08-30 15:24:42 +10:00
dragonpilot 6a4dd5e509 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 15:19:45 +10:00
dragonpilot 36a099ee49 Merge branch 'devel-en' into devel-zhs 2019-08-30 14:14:08 +10:00
dragonpilot 29362f52f2 Merge branch 'devel-en' into devel-zhs 2019-08-30 13:56:55 +10:00
dragonpilot f4421854a8 更新APK 2019-08-30 13:41:03 +10:00
dragonpilot ce96907f77 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 13:36:52 +10:00
dragonpilot a6833a4fb7 更新APK 2019-08-30 12:04:49 +10:00
dragonpilot e29394dfa5 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-30 12:03:25 +10:00
dragonpilot 3ebfd5037a 更新APK 2019-08-28 16:22:25 +10:00
dragonpilot 8c958bd9ac Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-28 16:22:11 +10:00
dragonpilot ad0b137ebd Merge branch 'devel-en' into devel-zhs 2019-08-28 16:08:50 +10:00
dragonpilot 3e17597840 Merge branch 'devel-en' into devel-zhs 2019-08-28 16:06:50 +10:00
dragonpilot ec2ef3212d Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-28 11:23:51 +10:00
dragonpilot cd38322224 更新APK 2019-08-27 13:59:20 +10:00
dragonpilot fd3aa74d1a Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-27 13:59:11 +10:00
dragonpilot 9b8705d440 Merge branch 'devel-en' into devel-zhs 2019-08-23 01:26:06 +10:00
dragonpilot a0412b33df Merge branch 'devel-en' into devel-zhs 2019-08-23 01:15:50 +10:00
dragonpilot c017e1907e 更新APK 2019-08-23 00:43:50 +10:00
dragonpilot 6930e85eea Merge branch 'devel-en' into devel-zhs 2019-08-23 00:43:18 +10:00
dragonpilot 64a1662820 Merge branch 'devel-en' into devel-zhs 2019-08-22 18:05:37 +10:00
dragonpilot 82843fc2c1 更新APK 2019-08-22 16:28:43 +10:00
dragonpilot baf6b7bfda Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-22 16:27:24 +10:00
dragonpilot ebf4626f87 更新APK 2019-08-22 16:00:31 +10:00
dragonpilot 6e9581e956 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-22 16:00:00 +10:00
dragonpilot e6bd413a31 Merge branch 'devel-en' into devel-zhs 2019-08-22 00:11:59 +10:00
dragonpilot 84a14cc215 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-21 17:46:28 +10:00
dragonpilot e1993002c0 更新APK 2019-08-20 16:51:28 +10:00
dragonpilot 138a3e4789 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-20 16:49:20 +10:00
dragonpilot 5199889ff3 Merge branch 'devel-en' into devel-zhs 2019-08-19 16:50:11 +10:00
dragonpilot 5aa175292e Merge branch 'devel-en' into devel-zhs 2019-08-19 15:26:41 +10:00
dragonpilot bf70999eb4 Merge branch 'devel-en' into devel-zhs 2019-08-19 14:26:35 +10:00
dragonpilot ee3f1cded6 Merge branch 'devel-en' into devel-zhs 2019-08-19 12:49:09 +10:00
dragonpilot 627c949d3e Merge branch 'devel-en' into devel-zhs 2019-08-19 12:26:02 +10:00
dragonpilot 7ce0b82bb1 Merge branch 'devel-en' into devel-zhs 2019-08-19 12:12:03 +10:00
dragonpilot 6d1d8009a8 Merge branch 'devel-en' into devel-zhs 2019-08-19 12:10:06 +10:00
dragonpilot d6efb674bf 更新APK 2019-08-19 11:53:36 +10:00
dragonpilot fbaeb4af10 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.frame.apk
#	apk/ai.comma.plus.offroad.apk
2019-08-19 11:52:23 +10:00
dragonpilot 477ece8e21 Merge branch 'devel-en' into devel-zhs 2019-08-19 10:30:42 +10:00
dragonpilot 42ac9ef8ab Merge branch 'devel-en' into devel-zhs 2019-08-15 17:16:29 +10:00
dragonpilot eecd3804f3 Merge branch 'devel-en' into devel-zhs 2019-08-15 15:37:58 +10:00
dragonpilot b79595ce53 更新預設語系 2019-08-15 15:16:05 +10:00
dragonpilot 4c7bdc203d Merge branch 'devel-en' into devel-zhs 2019-08-15 15:15:37 +10:00
dragonpilot ac971485f6 Merge branch 'devel-en' into devel-zhs 2019-08-14 13:59:50 +10:00
dragonpilot 08bfb2f1c2 更新APK 2019-08-14 12:14:42 +10:00
dragonpilot 26dcca5ed0 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-14 12:12:59 +10:00
dragonpilot 6abf2f07a6 更新APK 2019-08-14 11:01:06 +10:00
dragonpilot 2b51f256dc Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-14 10:47:01 +10:00
dragonpilot 8e189d018d 更新APK 2019-08-12 23:15:53 +10:00
dragonpilot 4b4ef125aa conflict 2019-08-12 23:15:33 +10:00
dragonpilot 85155f4aaf 加入高德地圖 2019-08-11 08:08:24 +10:00
dragonpilot d03dd3d8b5 Merge branch 'devel-en' into devel-zhs 2019-08-11 02:06:53 +10:00
dragonpilot c98d855bf7 Merge branch 'devel-en' into devel-zhs 2019-08-06 15:43:33 +10:00
Dragonpilot 38faf37ba5 Merge branch 'devel-en' into devel-zhs 2019-08-02 09:18:26 +10:00
Dragonpilot b13bc8f612 Merge branch 'devel-en' into devel-zhs 2019-08-02 08:53:51 +10:00
Dragonpilot ba36c90214 更新 APK 2019-08-01 11:44:16 +10:00
Dragonpilot c7d36ccbbb Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-08-01 11:31:23 +10:00
dragonpilot e0451bc0be Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 23:22:10 +10:00
Dragonpilot 39b941917b 更新 APK 2019-07-31 11:31:16 +10:00
Dragonpilot 1dbf9391bf Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 11:28:48 +10:00
Dragonpilot cddb3ee77a 更新 APK 2019-07-31 09:38:03 +10:00
dragonpilot ea3f42fe52 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-31 08:37:43 +10:00
Dragonpilot 016d66fe9c Merge branch 'devel-en' into devel-zhs 2019-07-29 10:39:42 +10:00
dragonpilot 7e69643c23 Merge branch 'devel-en' into devel-zhs 2019-07-28 10:22:48 +10:00
Dragonpilot e4f6d4eead 更新 APK 2019-07-26 15:31:41 +10:00
Dragonpilot 048986d8de Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-26 15:29:03 +10:00
Dragonpilot 6924efb442 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-26 12:03:24 +10:00
dragonpilot bc701439af 更新 APK 2019-07-25 22:18:12 +10:00
dragonpilot d5447b82e5 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-25 22:01:27 +10:00
dragonpilot e6faf5d389 Merge branch 'devel-en' into devel-zhs 2019-07-24 00:29:25 +10:00
dragonpilot f028e841ad Merge branch 'devel-zhs' of https://github.com/dragonpilot-community/dragonpilot-dev into devel-zhs 2019-07-24 00:29:20 +10:00
Dragonpilot 834489a8e3 Merge branch 'devel-en' into devel-zhs 2019-07-23 15:52:07 +10:00
Dragonpilot 5f48c0141e Merge branch 'devel-en' into devel-zhs 2019-07-23 15:40:53 +10:00
Dragonpilot 19372d4cb4 更新 APK 2019-07-23 12:29:02 +10:00
Dragonpilot 2ee7398232 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-23 12:28:46 +10:00
Dragonpilot 80f6c95979 更新 APK 2019-07-23 11:01:13 +10:00
Dragonpilot 446c124b28 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-23 10:59:49 +10:00
Dragonpilot 456cae54ce Merge branch 'devel-en' into devel-zhs 2019-07-16 15:25:12 +10:00
Dragonpilot 3c43dfbe13 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-16 11:34:44 +10:00
Dragonpilot e7c99cb8cf 更新 APK 2019-07-15 11:44:15 +10:00
Dragonpilot 7d691c8f85 更新 APK 2019-07-15 11:33:44 +10:00
dragonpilot 22b5146f9c Merge branch 'devel-en' into devel-zhs 2019-07-13 22:47:19 +10:00
dragonpilot ff56a4abda Merge branch 'devel-en' into devel-zhs 2019-07-13 22:38:08 +10:00
dragonpilot e3a7d07759 更新 APK 2019-07-12 21:05:38 +10:00
dragonpilot fc779b1b7a Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-12 21:00:09 +10:00
dragonpilot 5ef4e588f1 Merge branch 'devel-en' into devel-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-12 20:23:46 +10:00
Dragonpilot b4624da47c 更新 APK 2019-07-12 13:27:53 +10:00
Dragonpilot 4ba5eb76f6 Merge branch 'dragonpilot-dev-en' of https://github.com/dragonpilot/dragonpilot-dev into dragonpilot-dev-zhs 2019-07-12 12:58:37 +10:00
Dragonpilot 0cab93ee14 更新 APK 2019-07-11 10:55:33 +10:00
Dragonpilot bde2ee82d1 Merge branch 'dragonpilot-dev' into dragonpilot-dev-zhs
# Conflicts:
#	apk/ai.comma.plus.offroad.apk
2019-07-11 10:54:52 +10:00
dragonpilot 4241acf3b2 Add zhs apks 2019-07-04 23:11:11 +10:00
Rick Lan cdde010587 Merge branch 'dragonpilot-dev-zhs' of https://github.com/dragonpilot-community/dragonpilot-dev into dragonpilot-dev-zhs 2019-07-04 21:32:24 +10:00
dragonpilot 4bad8b91f8 Merge pull request #3 from dingliangxue/devel
add support Simplified Chinese Language
2019-07-04 21:31:51 +10:00
dragonpilot 62e084bda1 Merge branch 'dragonpilot-dev-zhs' into devel 2019-07-04 21:31:31 +10:00
Rick Lan 7b14417c3a Merge branch 'devel' of https://github.com/dingliangxue/dragonpilot-dev into dragonpilot-dev-zhs
# Conflicts:
#	selfdrive/controls/lib/alerts.py
2019-07-04 21:24:53 +10:00
dinglx 1a55765eef add support Simplified Chinese Language 2019-07-04 15:19:07 +08:00
9 changed files with 237 additions and 236 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
# Android system locale, zh-TW = Traditional Chinese, zh-CN = Simplified Chinese
lang=zh-TW
lang=zh-CN
update_font=0
remove_old_font=0
+6 -6
View File
@@ -31,9 +31,9 @@ FRAMEBUFFER_LIBS = -lutils -lgui -lEGL
.PHONY: all
all: updater
OBJS = NotoSansCJKtc-Regular.otf.o \
NotoSansCJKtc-Medium.otf.o \
NotoSansCJKtc-Bold.otf.o \
OBJS = opensans_regular.ttf.o \
opensans_semibold.ttf.o \
opensans_bold.ttf.o \
../../selfdrive/common/touch.o \
../../selfdrive/common/framebuffer.o \
$(PHONELIBS)/json11/json11.o \
@@ -52,15 +52,15 @@ updater: updater.o $(OBJS)
-lcutils -lm -llog
strip updater
NotoSansCJKtc-Regular.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Regular.otf
opensans_regular.ttf.o: ../../selfdrive/assets/fonts/opensans_regular.ttf
@echo "[ bin2o ] $@"
cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'
NotoSansCJKtc-Bold.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Bold.otf
opensans_bold.ttf.o: ../../selfdrive/assets/fonts/opensans_bold.ttf
@echo "[ bin2o ] $@"
cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'
NotoSansCJKtc-Medium.otf.o: ../../selfdrive/assets/fonts/NotoSansCJKtc-Medium.otf
opensans_semibold.ttf.o: ../../selfdrive/assets/fonts/opensans_semibold.ttf
@echo "[ bin2o ] $@"
cd '$(dir $<)' && ld -r -b binary '$(notdir $<)' -o '$(abspath $@)'
Binary file not shown.
+37 -37
View File
@@ -43,12 +43,12 @@ const char *manifest_url = MANIFEST_URL_EON;
#define UPDATE_DIR "/data/neoupdate"
extern const uint8_t bin_opensans_regular[] asm("_binary_NotoSansCJKtc_Regular_otf_start");
extern const uint8_t bin_opensans_regular_end[] asm("_binary_NotoSansCJKtc_Regular_otf_end");
extern const uint8_t bin_opensans_semibold[] asm("_binary_NotoSansCJKtc_Medium_otf_start");
extern const uint8_t bin_opensans_semibold_end[] asm("_binary_NotoSansCJKtc_Medium_otf_end");
extern const uint8_t bin_opensans_bold[] asm("_binary_NotoSansCJKtc_Bold_otf_start");
extern const uint8_t bin_opensans_bold_end[] asm("_binary_NotoSansCJKtc_Bold_otf_end");
extern const uint8_t bin_opensans_regular[] asm("_binary_opensans_regular_ttf_start");
extern const uint8_t bin_opensans_regular_end[] asm("_binary_opensans_regular_ttf_end");
extern const uint8_t bin_opensans_semibold[] asm("_binary_opensans_semibold_ttf_start");
extern const uint8_t bin_opensans_semibold_end[] asm("_binary_opensans_semibold_ttf_end");
extern const uint8_t bin_opensans_bold[] asm("_binary_opensans_bold_ttf_start");
extern const uint8_t bin_opensans_bold_end[] asm("_binary_opensans_bold_ttf_end");
namespace {
@@ -322,18 +322,18 @@ struct Updater {
std::string stage_download(std::string url, std::string hash, std::string name) {
std::string out_fn = UPDATE_DIR "/" + util::base_name(url);
set_progress("下載 " + name + " 中...");
set_progress("Downloading " + name + "...");
bool r = download_file(url, out_fn);
if (!r) {
set_error("無法下載 " + name);
set_error("failed to download " + name);
return "";
}
set_progress("驗證 " + name + " 中...");
set_progress("Verifying " + name + "...");
std::string fn_hash = sha256_file(out_fn);
printf("得到 %s hash: %s\n", name.c_str(), hash.c_str());
printf("got %s hash: %s\n", name.c_str(), hash.c_str());
if (fn_hash != hash) {
set_error(name + " 已損壞");
set_error(name + " was corrupt");
unlink(out_fn.c_str());
return "";
}
@@ -357,7 +357,7 @@ struct Updater {
}
if (!check_space()) {
set_error("您需要至少 2GB 的空間進行升級");
set_error("2GB of free space required to update");
return;
}
@@ -365,7 +365,7 @@ struct Updater {
const int EON = (access("/EON", F_OK) != -1);
set_progress("尋找最新的版本...");
set_progress("Finding latest version...");
std::string manifest_s;
if (EON) {
manifest_s = download_string(curl, manifest_url);
@@ -374,12 +374,12 @@ struct Updater {
exit(0);
}
printf("宣示說明: %s\n", manifest_s.c_str());
printf("manifest: %s\n", manifest_s.c_str());
std::string err;
auto manifest = json11::Json::parse(manifest_s, err);
if (manifest.is_null() || !err.empty()) {
set_error("無法載入新的宣示說明");
set_error("failed to load update manifest");
return;
}
@@ -394,7 +394,7 @@ struct Updater {
// std::string installer_hash = manifest["installer_hash"].string_value();
if (ota_url.empty() || ota_hash.empty()) {
set_error("錯誤的宣示說明");
set_error("invalid update manifest");
return;
}
@@ -406,12 +406,12 @@ struct Updater {
std::string recovery_fn;
if (recovery_url.empty() || recovery_hash.empty() || recovery_len == 0) {
set_progress("跳過 recovery 更新...");
set_progress("Skipping recovery flash...");
} else {
// only download the recovery if it differs from what's flashed
set_progress("檢查 recovery...");
set_progress("Checking recovery...");
std::string existing_recovery_hash = sha256_file(RECOVERY_DEV, recovery_len);
printf("目前 recovery hash: %s\n", existing_recovery_hash.c_str());
printf("existing recovery hash: %s\n", existing_recovery_hash.c_str());
if (existing_recovery_hash != recovery_hash) {
recovery_fn = stage_download(recovery_url, recovery_hash, "recovery");
@@ -441,18 +441,18 @@ struct Updater {
if (!recovery_fn.empty()) {
// flash recovery
set_progress("刷新 recovery...");
set_progress("Flashing recovery...");
FILE *flash_file = fopen(recovery_fn.c_str(), "rb");
if (!flash_file) {
set_error("刷新 recovery 失敗");
set_error("failed to flash recovery");
return;
}
FILE *recovery_dev = fopen(RECOVERY_DEV, "w+b");
if (!recovery_dev) {
fclose(flash_file);
set_error("刷新 recovery 失敗");
set_error("failed to flash recovery");
return;
}
@@ -467,7 +467,7 @@ struct Updater {
if (bytes_read != bytes_written) {
fclose(recovery_dev);
fclose(flash_file);
set_error("刷新 recovery 失敗: 無法寫入");
set_error("failed to flash recovery: write failed");
return;
}
}
@@ -475,12 +475,12 @@ struct Updater {
fclose(recovery_dev);
fclose(flash_file);
set_progress("驗證新的 recovery...");
set_progress("Verifying flash...");
std::string new_recovery_hash = sha256_file(RECOVERY_DEV, recovery_len);
printf("新的 recovery hash: %s\n", new_recovery_hash.c_str());
printf("new recovery hash: %s\n", new_recovery_hash.c_str());
if (new_recovery_hash != recovery_hash) {
set_error("刷新 recovery 失敗");
set_error("recovery flash corrupted");
return;
}
@@ -489,13 +489,13 @@ struct Updater {
// write arguments to recovery
FILE *cmd_file = fopen(RECOVERY_COMMAND, "wb");
if (!cmd_file) {
set_error("無法重啟至 recovery");
set_error("failed to reboot into recovery");
return;
}
fprintf(cmd_file, "--update_package=%s\n", ota_fn.c_str());
fclose(cmd_file);
set_progress("重新啟動");
set_progress("Rebooting");
// remove the continue.sh so we come back into the setup.
// maybe we should go directly into the installer, but what if we don't come back with internet? :/
@@ -562,9 +562,9 @@ struct Updater {
}
void draw_battery_screen() {
low_battery_title = "電量過低";
low_battery_text = "請將您的 EON 充電。當電量達到 35% 時系統將會繼續更新。";
low_battery_context = "目前的電量為: " + battery_cap_text + "%";
low_battery_title = "Low Battery";
low_battery_text = "Please connect EON to your charger. Update will continue once EON battery reaches 35%.";
low_battery_context = "Current battery charge: " + battery_cap_text + "%";
nvgFillColor(vg, nvgRGBA(255,255,255,255));
nvgTextAlign(vg, NVG_ALIGN_CENTER | NVG_ALIGN_BASELINE);
@@ -601,7 +601,7 @@ struct Updater {
int powerprompt_y = 312;
nvgFontFace(vg, "opensans_regular");
nvgFontSize(vg, 64.0f);
nvgText(vg, fb_w/2, 740, "請確保您的 EON 已接上充電器。", NULL);
nvgText(vg, fb_w/2, 740, "Ensure EON is connected to power.", NULL);
NVGpaint paint = nvgBoxGradient(
vg, progress_x + 1, progress_y + 1,
@@ -635,10 +635,10 @@ struct Updater {
switch (state) {
case CONFIRMATION:
draw_ack_screen("NEOS 需要更新。",
"您的設備將在點擊繼續後開始更新。\n更新檔約為 1GB 我們建議您先連接至無線網路。\n設備上現有的檔案不會丟失。",
"繼續",
"連線至無線網路");
draw_ack_screen("An update to NEOS is required.",
"Your device will now be reset and upgraded. You may want to connect to wifi as download is around 1 GB. Existing data on device should not be lost.",
"Continue",
"Connect to WiFi");
break;
case LOW_BATTERY:
draw_battery_screen();
@@ -647,7 +647,7 @@ struct Updater {
draw_progress_screen();
break;
case ERROR:
draw_ack_screen("發生錯誤", (error_text).c_str(), NULL, "重新啟動");
draw_ack_screen("There was an error", (error_text).c_str(), NULL, "Reboot");
break;
}
+175 -174
View File
@@ -77,99 +77,99 @@ ALERTS = [
Alert(
"fcw",
"剎車!",
"有碰撞的風險",
"刹车!",
"有碰撞的风险",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.fcw, AudibleAlert.chimeWarningRepeat, 1., 2., 2.),
Alert(
"fcwStock",
"馬上剎車!",
"有碰撞風險",
"BRAKE!",
"Risk of Collision",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.fcw, AudibleAlert.none, 1., 2., 2.), # no EON chime for stock FCW
Alert(
"steerSaturated",
"接管控制",
"道超方向盤轉向限制",
"道超方向盘转向限制",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimePrompt, 1., 2., 3.),
Alert(
"steerTempUnavailable",
"接管控制",
"向控制暫時失效",
"向控制暂时失效",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning1, .4, 2., 3.),
Alert(
"steerTempUnavailableMute",
"接管控制",
"向控制暫時失效",
"向控制暂时失效",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .2, .2, .2),
Alert(
"preDriverDistracted",
"注意路況:駕駛分心",
"注意路况:驾驶出现分心",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"promptDriverDistracted",
"注意路",
"駕駛分心",
"注意路",
"驾驶出现分心",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"driverDistracted",
"立即解除",
"駕駛分心",
"驾驶出现分心",
AlertStatus.critical, AlertSize.full,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"preDriverUnresponsive",
"請觸碰方向盤:無駕駛監",
"碰方向盘:无驾驶监",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"promptDriverUnresponsive",
"請觸碰方向",
"駕駛沒有反",
"碰方向",
"驾驶没有反",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"driverUnresponsive",
"立即解除",
"駕駛沒有反",
"驾驶没有反",
AlertStatus.critical, AlertSize.full,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"driverMonitorLowAcc",
"請檢查駕駛面部的可見",
"駕駛監控模型出不明",
"检查驾驶面部能见",
"驾驶监控模型出不明",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .4, 0., 1.),
Priority.LOW, VisualAlert.none, AudibleAlert.none, .4, 0., 4.),
Alert(
"geofence",
"DISENGAGEMENT REQUIRED",
"不在地理圍欄區域之",
"请求解除",
"不在地理围栏区域之",
AlertStatus.userPrompt, AlertSize.mid,
Priority.HIGH, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, .1, .1),
Alert(
"startup",
"隨時準備好接管",
"請您將手放在方向盤上並持續注意路",
"随时准备好接管",
"请您将手放在方向盘上并持续注意路",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
@@ -182,169 +182,169 @@ ALERTS = [
Alert(
"startupNoControl",
"行車記錄模式",
"請您將手放在方向盤上並持續注意路",
"硬扯记录模式",
"请您将手放在方向盘上并持续注意路",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
Alert(
"startupNoCar",
"車記錄模式 (尚未支援車種)",
"請您將手放在方向盤上並持續注意路",
"车记录模式(为支持的车型)",
"请您将手放在方向盘上并持续注意路",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
Alert(
"ethicalDilemma",
"接管控制",
"Ethical Dilemma Detected",
"接管控制",
"检测到困难",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 1., 3., 3.),
Alert(
"steerTempUnavailableNoEntry",
"法使用 dragonpilot",
"向控制暫時失效",
"法使用 dragonpilot",
"向控制暂时失效",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"manualRestart",
"接管控制",
"自行恢復駕駛",
"自行恢复驾驶",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"resumeRequired",
"已停止",
"請按 RES 繼續",
"请按RES继续",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"belowSteerSpeed",
"接管控制",
"向控制暫時失效,速低",
"向控制暂时失效,速低",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.none, 0., 0.4, .3),
Alert(
"debugAlert",
"DEBUG ALERT",
"DEBUG提示",
"",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .1, .1, .1),
Alert(
"preLaneChangeLeft",
"往左打方向盤切換車",
"注意其它車輛",
"往左打方向盘开始切换车",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"preLaneChangeRight",
"往右打方向盤切換車",
"注意其它車輛",
"往右打方向盘开始切换车",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1, alert_rate=0.75),
Alert(
"laneChange",
"換車道中",
"注意其它車輛",
"换车道中",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.none, .0, .1, .1),
Alert(
"posenetInvalid",
"接管控制",
"視覺模型出不明",
"视觉模型出不明",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning1, .4, 2., 3.),
# Non-entry only alerts
Alert(
"wrongCarModeNoEntry",
"法使用 dragonpilot",
"開關關閉",
"法使用 dragonpilot",
"开关关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"dataNeededNoEntry",
"法使用 dragonpilot",
"需要更多的數據來協助校準,請將行車記錄上傳後再試",
"法使用 dragonpilot",
"需要更多的数据来协助校准,请将行车记录上传后再试",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"outOfSpaceNoEntry",
"法使用 dragonpilot",
"存空不足",
"法使用 dragonpilot",
"存空不足",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 0., 3.),
Alert(
"pedalPressedNoEntry",
"法使用 dragonpilot",
"Pedal Pressed During Attempt",
"法使用 dragonpilot",
"试踩踏板",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, "brakePressed", AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"speedTooLowNoEntry",
"法使用 dragonpilot",
"車速過",
"法使用 dragonpilot",
"车速过",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"brakeHoldNoEntry",
"法使用 dragonpilot",
"駐車煞車已啟",
"法使用 dragonpilot",
"驻车刹车已启",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"parkBrakeNoEntry",
"法使用 dragonpilot",
"電子駐車已啟動",
"法使用 dragonpilot",
"电车驻车已启动",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"lowSpeedLockoutNoEntry",
"法使用 dragonpilot",
"巡航系統錯誤:請重新發動車子",
"法使用 dragonpilot",
"巡航系统错误,请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"lowBatteryNoEntry",
"法使用 dragonpilot",
"電池電量過",
"法使用 dragonpilot",
"电池电量过",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"sensorDataInvalidNoEntry",
"法使用 dragonpilot",
"有收到任何來自裝置傳感器的資料",
"法使用 dragonpilot",
"有收到任何来自传感器的数据",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"soundsUnavailableNoEntry",
"法使用 dragonpilot",
"找不到音效",
"法使用 dragonpilot",
"找不到音效",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"tooDistractedNoEntry",
"法使用 dragonpilot",
"駕駛分心次數過高",
"法使用 dragonpilot",
"注意力高度不集中",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
@@ -352,84 +352,84 @@ ALERTS = [
Alert(
"overheat",
"即刻接管控制",
"統過熱",
"统过热",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"wrongGear",
"即刻接管控制",
"位不在 D 檔",
"位不在D档",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"calibrationInvalid",
"即刻接管控制",
"準無效:請將裝置放於新的位置重新校",
"准无效:请将传感器放于新的位置重新校",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"calibrationIncomplete",
"即刻接管控制",
"正在校準相機",
"正在校准相机",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"doorOpen",
"即刻接管控制",
"車門開啟",
"车门开启",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"seatbeltNotLatched",
"即刻接管控制",
"安全帶未繫",
"未系安全带",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"espDisabled",
"即刻接管控制",
"ESP 關閉",
"ESP关闭",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"lowBattery",
"即刻接管控制",
"電池電量過",
"电池电量过",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"commIssue",
"即刻接管控制",
"達訊號錯誤:請重新發動車子",
"达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarCommIssue",
"即刻接管控制",
"雷達通訊出現問題",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarCanError",
"即刻接管控制",
"雷達訊號錯誤:請重新發動車子",
"TAKE CONTROL IMMEDIATELY",
"Radar Communication Issue",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarFault",
"即刻接管控制",
"AI 模型錯誤:請檢查網路連線",
"雷达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
Alert(
"radarFault",
"即刻接管控制",
"雷达讯号错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
@@ -437,7 +437,7 @@ ALERTS = [
Alert(
"lowMemory",
"即刻接管控制",
"記憶體不足:請重啟您的裝",
"内存过低: 请重启装",
AlertStatus.critical, AlertSize.full,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, .1, 2., 2.),
@@ -445,7 +445,7 @@ ALERTS = [
Alert(
"controlsFailed",
"即刻接管控制",
"控制發生錯誤",
"控制错误",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
@@ -459,49 +459,49 @@ ALERTS = [
Alert(
"canError",
"即刻接管控制",
"CAN 訊號錯誤:請檢查接線",
"CAN错误:请检查连接",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"steerUnavailable",
"即刻接管控制",
"LKAS 錯誤:請重新發動車子",
"LKAS错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"brakeUnavailable",
"即刻接管控制",
"巡航系統錯誤:請重新發動車子",
"巡航系统错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"gasUnavailable",
"即刻接管控制",
"門錯誤:請重新發動車子",
"门错误:请重新发动车辆",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"reverseGear",
"即刻接管控制",
"至倒車檔",
"至倒车档",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"cruiseDisabled",
"即刻接管控制",
"巡航系統關閉",
"巡航系统关闭",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
Alert(
"plannerError",
"即刻接管控制",
"Planner Solution 錯誤",
"Planner Solution 错误",
AlertStatus.critical, AlertSize.full,
Priority.HIGHEST, VisualAlert.steerRequired, AudibleAlert.chimeWarningRepeat, 2.2, 3., 4.),
@@ -509,267 +509,267 @@ ALERTS = [
Alert(
"noTarget",
"dragonpilot 已取消",
"沒有偵測到前",
"没有侦测到前",
AlertStatus.normal, AlertSize.mid,
Priority.HIGH, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"speedTooLow",
"dragonpilot 已取消",
"車速過",
"车速过",
AlertStatus.normal, AlertSize.mid,
Priority.HIGH, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
# Cancellation alerts causing non-entry
Alert(
"overheatNoEntry",
"法使用 dragonpilot",
"統過熱",
"法使用 dragonpilot",
"统过热",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"wrongGearNoEntry",
"法使用 dragonpilot",
"車子不在 D 檔",
"法使用 dragonpilot",
"车辆不在D档",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"calibrationInvalidNoEntry",
"法使用 dragonpilot",
"準無效:請將裝置放於新的位置重新校",
"法使用 dragonpilot",
"准无效:请将传感器放于新的位置重新校",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"calibrationIncompleteNoEntry",
"法使用 dragonpilot",
"正在校準相機",
"法使用 dragonpilot",
"正在校准相机",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"doorOpenNoEntry",
"法使用 dragonpilot",
"車門未關",
"法使用 dragonpilot",
"车门开启",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"seatbeltNotLatchedNoEntry",
"法使用 dragonpilot",
"安全帶未繫",
"法使用 dragonpilot",
"未系安全带",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"espDisabledNoEntry",
"法使用 dragonpilot",
"ESP 關閉",
"法使用 dragonpilot",
"ESP关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"geofenceNoEntry",
"法使用 dragonpilot",
"不在地理圍欄區域之",
"法使用 dragonpilot",
"不在地理围栏区域之",
AlertStatus.normal, AlertSize.mid,
Priority.MID, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"radarCanErrorNoEntry",
"法使用 dragonpilot",
"達訊號錯誤:請重新發動車子",
"法使用 dragonpilot",
"达信号错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"radarFaultNoEntry",
"法使用 dragonpilot",
"達訊號錯誤:請重新發動車子",
"法使用 dragonpilot",
"达信号错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"posenetInvalidNoEntry",
"法使用 dragonpilot",
"視覺模型出不明",
"法使用 dragonpilot",
"视觉模型出不明",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"controlsFailedNoEntry",
"法使用 dragonpilot",
"控制發生錯誤",
"法使用 dragonpilot",
"控制发生错误",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"canErrorNoEntry",
"法使用 dragonpilot",
"CAN 訊號錯誤:請檢查接線",
"法使用 dragonpilot",
"CAN错误:请检查连接",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"steerUnavailableNoEntry",
"法使用 dragonpilot",
"LKAS 錯誤:請重新發動車子",
"法使用 dragonpilot",
"LKAS错误: 请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"brakeUnavailableNoEntry",
"法使用 dragonpilot",
"巡航系統錯誤:請重新發動車子",
"法使用 dragonpilot",
"巡航系统错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"gasUnavailableNoEntry",
"法使用 dragonpilot",
"門錯誤:請重新發動車子",
"法使用 dragonpilot",
"门错误:请重新发动车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"reverseGearNoEntry",
"法使用 dragonpilot",
"至倒車檔",
"法使用 dragonpilot",
"至倒车档",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"cruiseDisabledNoEntry",
"法使用 dragonpilot",
"巡航系統關閉",
"法使用 dragonpilot",
"巡航系统关闭",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"noTargetNoEntry",
"法使用 dragonpilot",
"沒有偵測到前",
"法使用 dragonpilot",
"没有侦测到前",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"plannerErrorNoEntry",
"法使用 dragonpilot",
"Planner Solution 錯誤",
"法使用 dragonpilot",
"Planner Solution 错误",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeError, .4, 2., 3.),
Alert(
"commIssueNoEntry",
"法使用 dragonpilot",
"行程出現通訊問題",
"法使用 dragonpilot",
"进程通讯异常",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"radarCommIssueNoEntry",
"法使用 dragonpilot",
"達通訊出現問題",
"法使用 dragonpilot",
"达通讯异常",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"internetConnectivityNeededNoEntry",
"法使用 dragonpilot",
"請連接網路",
"法使用 dragonpilot",
"需要连接到网络",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
Alert(
"lowMemoryNoEntry",
"法使用 dragonpilot",
"記憶體不足:請重啟您的裝",
"法使用 dragonpilot",
"内存过低: 请重启装",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.chimeDisengage, .4, 2., 3.),
# permanent alerts
Alert(
"steerUnavailablePermanent",
"LKAS 錯誤:請重新發動車子",
"LKAS错误: 请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"brakeUnavailablePermanent",
"巡航系統錯誤:請重新發動車子",
"巡航系统错误:请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"lowSpeedLockoutPermanent",
"巡航系統錯誤:請重新發動車子",
"巡航系统错误:请重新发动车辆",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"calibrationIncompletePermanent",
"正在校準相機中:",
"車速請高於 ",
"正在校准相机中 ",
"车速请高于",
AlertStatus.normal, AlertSize.mid,
Priority.LOWEST, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"invalidGiraffeToyotaPermanent",
"未支援的 Giraffe ",
"請查閱 comma.ai/tg",
"不支持的 Giraffe ",
"请查看 comma.ai/tg",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"internetConnectivityNeededPermanent",
"請連接網路",
"需檢查更新才能",
"需要连接到网络",
"查更新才能",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"communityFeatureDisallowedPermanent",
"偵測到社群開發功能",
"請至開發人員設定裡啟用社群開發功能",
"检测到社区功能",
"请在开发者设置中启用社区功能",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.none, AudibleAlert.none, 0., 0., .2), # LOW priority to overcome Cruise Error
Alert(
"sensorDataInvalidPermanent",
"有收到任何來自 EON 傳感器的資料",
"請重啟您的",
"有收到任何来自传感器的数据",
"请重启您的",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"soundsUnavailablePermanent",
"找不到音效",
"請重啟您的",
"找不到音效",
"请重启您的",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"lowMemoryPermanent",
"記憶體嚴重不足",
"請重啟您的",
"内存严重不足",
"请重启您的",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"carUnrecognizedPermanent",
"行車記錄模式",
"無法辨識您的車款",
"Dashcam Mode",
"Car Unrecognized",
AlertStatus.normal, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., .2),
Alert(
"vehicleModelInvalid",
"車子參數識別失敗",
"车辆参数识别失败",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOWEST, VisualAlert.steerRequired, AudibleAlert.none, .0, .0, .1),
@@ -778,53 +778,54 @@ ALERTS = [
Alert(
"ldwPermanent",
"接管控制",
"偵測到已偏離車道",
"检测到车道偏离",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimePrompt, 1., 2., 3.),
# dragonpilot
Alert(
"manualSteeringRequired",
"接管方向盤:車道維持關閉",
"接管控制: 车道保持关闭",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"manualSteeringRequiredBlinkersOn",
"接管方向盤:方向燈開啟",
"接管控制: 转向灯开启",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"leadCarMoving",
"車移動中,請開始加速",
"车移动中,请开始加速",
"",
AlertStatus.userPrompt, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Alert(
"leadCarDetected",
"偵測到前,等待中",
"侦测到前,等待中",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.none, .0, .1, .1, alert_rate=0.25),
Alert(
"preAutoLaneChangeLeft",
"在三秒後自動切至左車",
"注意其它車輛",
"在三秒后自动切入左",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1, alert_rate=0.75),
Alert(
"preAutoLaneChangeRight",
"在三秒後自動切至右車",
"注意其它車輛",
"在三秒后自动切入入右",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1, alert_rate=0.75),
Alert(
"autoLaneChange",
"換車道中",
"注意其它車輛",
"换车道中",
"注意其他车辆",
AlertStatus.normal, AlertSize.mid,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
]
+7 -7
View File
@@ -1,31 +1,31 @@
{
"Offroad_ChargeDisabled": {
"text": "因車輛已熄火超過 30 小時,系統將會停止 EON 充,再次發動車輛後 EON 會恢復充電",
"text": "车辆熄火 30 小时后将停止 EON 充,再次启动车辆后,EON 恢复充电。",
"severity": 0
},
"Offroad_TemperatureTooHigh": {
"text": "裝置溫度過高,系統暫時無法啟用。",
"text": "装置温度过高,系统暂不可用。",
"severity": 1
},
"Offroad_ConnectivityNeededPrompt": {
"text": "目前 dragonpilot 無法啟用,請馬上連網檢查更新。",
"text": "请立即连网检查更新,否则 dragonpilot 将不可用。",
"severity": 0,
"_comment": "Append the number of days at the end of the text"
},
"Offroad_ConnectivityNeeded": {
"text": "請連網檢查更新。不然 dragonpilot 將無法啟用。",
"text": "请连网并检查更新,连网更新后 dragonpilot 才能正常使用。",
"severity": 1
},
"Offroad_PandaFirmwareMismatch": {
"text": "Panda 的韌體版本出現異常,系統無法啟用。請重啟您的裝置以刷新 Panda 韌體。",
"text": "Panda 固件版本异常,系统无法启用,请重启装置并更新 Panda 固件。",
"severity": 1
},
"Offroad_InvalidTime": {
"text": "系統日期/時間設定錯誤,系統無法啟用。請連上網設定的時間。",
"text": "系统时间设置错误,系统无法启用。请连网更新时间设置。",
"severity": 1
},
"Offroad_IsTakingSnapshot": {
"text": "相機拍攝中,完成前系統無法啟用。",
"text": "相机拍摄中,完成前系统无法启动。",
"severity": 0
}
}
+4 -4
View File
@@ -973,7 +973,7 @@ static void bb_ui_draw_measures_left(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "-");
}
snprintf(uom_str, sizeof(uom_str), "m ");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "對距離",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "对距离",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1008,7 +1008,7 @@ static void bb_ui_draw_measures_left(UIState *s, int bb_x, int bb_y, int bb_w )
} else {
snprintf(uom_str, sizeof(uom_str), "mph");
}
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "速度",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "速度",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1053,7 +1053,7 @@ static void bb_ui_draw_measures_right(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "%.1f°",(scene->angleSteers));
snprintf(uom_str, sizeof(uom_str), "");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "實際轉",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "实际转",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
@@ -1077,7 +1077,7 @@ static void bb_ui_draw_measures_right(UIState *s, int bb_x, int bb_y, int bb_w )
snprintf(val_str, sizeof(val_str), "%.1f°",(scene->angleSteersDes));
snprintf(uom_str, sizeof(uom_str), "");
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "所需",
bb_h +=bb_ui_draw_measure(s, val_str, uom_str, "所需",
bb_rx, bb_ry, bb_uom_dx,
val_color, lab_color, uom_color,
value_fontSize, label_fontSize, uom_fontSize );
+5 -5
View File
@@ -216,7 +216,7 @@ static void ui_draw_sidebar_storage_metric(UIState *s, bool hasSidebar) {
snprintf(storage_value_str, sizeof(storage_value_str), "%d", (int)storage_pct);
snprintf(storage_value_unit, sizeof(storage_value_unit), "%s", "%");
snprintf(storage_label_str, sizeof(storage_label_str), "%s", "儲存空間");
snprintf(storage_label_str, sizeof(storage_label_str), "%s", "存储空间");
strcat(storage_value_str, storage_value_unit);
ui_draw_sidebar_metric(s, storage_label_str, storage_value_str, storage_severity, storage_y_offset, NULL, hasSidebar);
@@ -241,7 +241,7 @@ static void ui_draw_sidebar_temp_metric(UIState *s, bool hasSidebar) {
snprintf(temp_value_str, sizeof(temp_value_str), "%d", s->scene.paTemp);
snprintf(temp_value_unit, sizeof(temp_value_unit), "%s", "");
snprintf(temp_label_str, sizeof(temp_label_str), "%s", "");
snprintf(temp_label_str, sizeof(temp_label_str), "%s", "");
strcat(temp_value_str, temp_value_unit);
ui_draw_sidebar_metric(s, temp_label_str, temp_value_str, temp_severity, temp_y_offset, NULL, hasSidebar);
@@ -254,17 +254,17 @@ static void ui_draw_sidebar_panda_metric(UIState *s, bool hasSidebar) {
if (s->scene.hwType == cereal_HealthData_HwType_unknown) {
panda_severity = 2;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", " PANDA");
snprintf(panda_message_str, sizeof(panda_message_str), "%s", " PANDA");
} else if (s->scene.hwType == cereal_HealthData_HwType_whitePanda) {
panda_severity = 0;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "PANDA\n");
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "PANDA\n");
} else if (
(s->scene.hwType == cereal_HealthData_HwType_greyPanda) ||
(s->scene.hwType == cereal_HealthData_HwType_blackPanda) ||
(s->scene.hwType == cereal_HealthData_HwType_uno)) {
if (s->scene.satelliteCount == -1) {
panda_severity = 0;
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "PANDA\n已連");
snprintf(panda_message_str, sizeof(panda_message_str), "%s", "PANDA\nA已连");
} else {
if (s->scene.satelliteCount < 6) {
panda_severity = 1;
+2 -2
View File
@@ -1073,8 +1073,8 @@ int main(int argc, char* argv[]) {
if (s->status != STATUS_STOPPED) {
update_status(s, STATUS_ALERT);
}
snprintf(s->scene.alert_text1, sizeof(s->scene.alert_text1), "%s", "即刻接管控制");
snprintf(s->scene.alert_text2, sizeof(s->scene.alert_text2), "%s", "操控服務沒有反應");
snprintf(s->scene.alert_text1, sizeof(s->scene.alert_text1), "%s", "TAKE CONTROL IMMEDIATELY");
snprintf(s->scene.alert_text2, sizeof(s->scene.alert_text2), "%s", "Controls Unresponsive");
ui_draw_vision_alert(s, s->scene.alert_size, s->status, s->scene.alert_text1, s->scene.alert_text2);
s->alert_sound_timeout = 2 * UI_FREQ;