diff --git a/release/files_common b/release/files_common index a20f71018b..39b4460450 100644 --- a/release/files_common +++ b/release/files_common @@ -411,6 +411,7 @@ selfdrive/assets/images/* selfdrive/assets/offroad/* selfdrive/assets/sounds/* selfdrive/assets/training/* +selfdrive/assets/navigation/* third_party/.gitignore third_party/SConscript diff --git a/release/files_tici b/release/files_tici index b4e0c50516..892b7cd2f4 100644 --- a/release/files_tici +++ b/release/files_tici @@ -4,9 +4,6 @@ third_party/mapbox-gl-native-qt/include/* system/timezoned.py -selfdrive/assets/navigation/* -selfdrive/assets/training_wide/* - system/camerad/cameras/camera_qcom2.cc system/camerad/cameras/camera_qcom2.h system/camerad/cameras/camera_util.cc diff --git a/selfdrive/assets/compress-images.sh b/selfdrive/assets/compress-images.sh index 8601b2d61b..a1a4f8bb40 100755 --- a/selfdrive/assets/compress-images.sh +++ b/selfdrive/assets/compress-images.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "compressing training guide images" -optipng -o7 -strip all training/* training_wide/* +optipng -o7 -strip all training/* # This can sometimes provide smaller images -# mogrify -quality 100 -format jpg training_wide/* training/* +# mogrify -quality 100 -format jpg training/* diff --git a/selfdrive/assets/training/step0.png b/selfdrive/assets/training/step0.png index b362ea8669..fb869e317d 100644 --- a/selfdrive/assets/training/step0.png +++ b/selfdrive/assets/training/step0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ba69dd2458bb67f30189dc41f6ebb1d77079cf18efc14ab65a7d7329c046832 -size 1508871 +oid sha256:5da731d3b43d7203eda3828c72328e5164f3c5dc14881cee20b474f8a445790c +size 1605451 diff --git a/selfdrive/assets/training/step1.png b/selfdrive/assets/training/step1.png index 929e53d293..8bd9fbaa67 100644 --- a/selfdrive/assets/training/step1.png +++ b/selfdrive/assets/training/step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d5f69386d33431e5ae620cb627eb4b4547103875f40fc4fb58b7f42fde8dc1f -size 40667 +oid sha256:522d7c48937b5551313884051e1018f20d2fca86db31b587222867e86254f08a +size 51774 diff --git a/selfdrive/assets/training/step10.png b/selfdrive/assets/training/step10.png index beed03d823..da71f97e83 100644 --- a/selfdrive/assets/training/step10.png +++ b/selfdrive/assets/training/step10.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6cf7bf4aeb2be0b31a3231c5ed87d5d0f8cf4c46f2e804db69b0bc298d6d009 -size 936463 +oid sha256:fa3ab22eb5e4f1564f37df24a14b12c34b965cc8539b2df0fb6ae6d5c4ebc857 +size 1034167 diff --git a/selfdrive/assets/training/step11.png b/selfdrive/assets/training/step11.png index c0bc73453b..aa3791304e 100644 --- a/selfdrive/assets/training/step11.png +++ b/selfdrive/assets/training/step11.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:818fdf1be7eea3e2285ba0b3a02b2b4d702d6a16f993ecb03c4453fefe883365 -size 43526 +oid sha256:bad2dffbc75b502a713ceb718dceb5f3a5a2e34fcffc438ee8acfc6580bbc94f +size 53375 diff --git a/selfdrive/assets/training/step12.png b/selfdrive/assets/training/step12.png index 070f84593c..745a8d0553 100644 --- a/selfdrive/assets/training/step12.png +++ b/selfdrive/assets/training/step12.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e940f78e3936d4092db698307526923c4b777d64f656ec909fea4d02ac43c09a -size 969324 +oid sha256:aff8f1b35a29e7353a58ca6349ebe1c0faff162596a134fdd74b126b8c1cdd28 +size 1092478 diff --git a/selfdrive/assets/training/step13.png b/selfdrive/assets/training/step13.png index a651e558ed..68638ffec1 100644 --- a/selfdrive/assets/training/step13.png +++ b/selfdrive/assets/training/step13.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a8f8c4ed9215a4049db3e5bd4a0d24bf8ccf600a56fb65da1b0c4e7b36997be -size 30053 +oid sha256:d18847d47d963f2536a748ddfde1df4ef3d1dc2638af94974cd6af1539d9c18b +size 37382 diff --git a/selfdrive/assets/training/step14.png b/selfdrive/assets/training/step14.png index e2e8139adf..2f5956b1ff 100644 --- a/selfdrive/assets/training/step14.png +++ b/selfdrive/assets/training/step14.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:475a2719361e97ef6383520ca19da2c14322c1193ae1a2658965f209ff112901 -size 1606262 +oid sha256:be7402c00ea0e67b60394a5858976237af61cccec7068bee0c8ec6aae1385af4 +size 1879281 diff --git a/selfdrive/assets/training/step15.png b/selfdrive/assets/training/step15.png index 5a9bb095bf..798e01d00a 100644 --- a/selfdrive/assets/training/step15.png +++ b/selfdrive/assets/training/step15.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d8de06629394396cb71e4b6c89b35e32f85c5f2fe006facfeeef6375cc0e295 -size 940727 +oid sha256:8c7c981f2601607381a341da47bd044d24a8e301c91c5b7426cbce9570f5bad0 +size 1104967 diff --git a/selfdrive/assets/training/step16.png b/selfdrive/assets/training/step16.png index 7dd48639c2..2728814181 100644 --- a/selfdrive/assets/training/step16.png +++ b/selfdrive/assets/training/step16.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ecdc63da690af369c924d2c8c53916acaeab63d5ec0590e3954d0b5724c430b -size 29904 +oid sha256:12780d35798dfab1353bf428927e1c04ca88394675a63c134a0bbbd137201715 +size 35997 diff --git a/selfdrive/assets/training/step17.png b/selfdrive/assets/training/step17.png index 18704f8d9c..ab54f9c992 100644 --- a/selfdrive/assets/training/step17.png +++ b/selfdrive/assets/training/step17.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc430ace2b8880735738b27d1983f1a2670304a75843b1a37228c36388c72528 -size 36726 +oid sha256:cfb184957120901b5b803571fa14bd9e7ae98da0b46425e3b75b00a8a69e1246 +size 43545 diff --git a/selfdrive/assets/training/step18.png b/selfdrive/assets/training/step18.png index a1de8a7cd6..8149e79364 100644 --- a/selfdrive/assets/training/step18.png +++ b/selfdrive/assets/training/step18.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b177a701308e2a353d5d16ab3baf5d4ad79d6c23f08dd9d8652ee741af513952 -size 1485057 +oid sha256:a29dd3ee7abc5d338db395576e7765ba3d4d56568820f8dfbbe938c62fbee6de +size 1646908 diff --git a/selfdrive/assets/training/step2.png b/selfdrive/assets/training/step2.png index f90302aaa5..35d65c9b01 100644 --- a/selfdrive/assets/training/step2.png +++ b/selfdrive/assets/training/step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:270ea961f50b66d8ab659df9b3d2f59ef2f4b3267c6c76ea00c8ec9c1f15be48 -size 30417 +oid sha256:bdfa7fc67a0d89f5503bb30f1822fa72cbd140c84e14170957531c5166159519 +size 36869 diff --git a/selfdrive/assets/training/step3.png b/selfdrive/assets/training/step3.png index b470e3141b..0d3a6bbecb 100644 --- a/selfdrive/assets/training/step3.png +++ b/selfdrive/assets/training/step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c1c347c4d464b5498386a127b00aab623dffa2bcdf430307e97b7288b991d4e -size 812312 +oid sha256:c476251bb58200d008fc0aa172173983d9fb0b71ab860f199d9d431910bf5c61 +size 966466 diff --git a/selfdrive/assets/training/step4.png b/selfdrive/assets/training/step4.png index dd7452030d..1d4da570b1 100644 --- a/selfdrive/assets/training/step4.png +++ b/selfdrive/assets/training/step4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6e6dbdd66ca6c67a75683dd8512be737d2fb73f14eec4caa38a6d13e2654e57 -size 1085837 +oid sha256:95da2bda3ba1c046620a88b2caf77fd9a2b980b6b746e700d3574f4f1c0d6ce9 +size 1287393 diff --git a/selfdrive/assets/training/step5.png b/selfdrive/assets/training/step5.png index 79f48c32c9..1ce43e28dc 100644 --- a/selfdrive/assets/training/step5.png +++ b/selfdrive/assets/training/step5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9abefa4e4e47b44187918048cc904f41a8cb934de776c16a7e623ca3d05b6661 -size 33897 +oid sha256:886903bfaf0567939125daa0bc7fcaecd08c9f34f4e7c8b137a30986f80e4a6e +size 41823 diff --git a/selfdrive/assets/training/step6.png b/selfdrive/assets/training/step6.png index a000ac57a1..d0e06469c7 100644 --- a/selfdrive/assets/training/step6.png +++ b/selfdrive/assets/training/step6.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33301fa4a27e2a8d724ce3579fbf07c7c908a218518a6fb374f09c3f10433344 -size 1102561 +oid sha256:c8dc0b499b0c9dbf7e5e967ea2d55c7ed78f8e56f9055d98662f247de960eda4 +size 1231263 diff --git a/selfdrive/assets/training/step7.png b/selfdrive/assets/training/step7.png index 982d5e0711..63e6e27e07 100644 --- a/selfdrive/assets/training/step7.png +++ b/selfdrive/assets/training/step7.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54fded1cc49351f4e33458cc6f2bac0fc6995524eb52886a87f9fa7c7b38ce13 -size 837613 +oid sha256:690be96b7a3cacaeb8d11bbab043a3e6dd65710ce197a8c7d35a3124dce590d1 +size 936779 diff --git a/selfdrive/assets/training/step8.png b/selfdrive/assets/training/step8.png index 92fbab2938..7788dabcae 100644 --- a/selfdrive/assets/training/step8.png +++ b/selfdrive/assets/training/step8.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b577e0531165155b86179443025aeea3477649e82ff6076811b17634b0e5515e -size 723606 +oid sha256:89d27d040a04508f755741929158545f4d2780c728021bf02446eb0a2e38aaa6 +size 874812 diff --git a/selfdrive/assets/training/step9.png b/selfdrive/assets/training/step9.png index 69fadb4cf4..43ca1d03df 100644 --- a/selfdrive/assets/training/step9.png +++ b/selfdrive/assets/training/step9.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae4acbde22c45acd8b7ea6e709a8dc4cb3cf12ee330073051d8c106e71bdfadf -size 891677 +oid sha256:e48538287fc974e5ec97403ba05145c21035f50bdf28b6e00275a4b428643f09 +size 1024935 diff --git a/selfdrive/assets/training_wide/step0.png b/selfdrive/assets/training_wide/step0.png deleted file mode 100644 index fb869e317d..0000000000 --- a/selfdrive/assets/training_wide/step0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5da731d3b43d7203eda3828c72328e5164f3c5dc14881cee20b474f8a445790c -size 1605451 diff --git a/selfdrive/assets/training_wide/step1.png b/selfdrive/assets/training_wide/step1.png deleted file mode 100644 index 8bd9fbaa67..0000000000 --- a/selfdrive/assets/training_wide/step1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:522d7c48937b5551313884051e1018f20d2fca86db31b587222867e86254f08a -size 51774 diff --git a/selfdrive/assets/training_wide/step10.png b/selfdrive/assets/training_wide/step10.png deleted file mode 100644 index da71f97e83..0000000000 --- a/selfdrive/assets/training_wide/step10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa3ab22eb5e4f1564f37df24a14b12c34b965cc8539b2df0fb6ae6d5c4ebc857 -size 1034167 diff --git a/selfdrive/assets/training_wide/step11.png b/selfdrive/assets/training_wide/step11.png deleted file mode 100644 index aa3791304e..0000000000 --- a/selfdrive/assets/training_wide/step11.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bad2dffbc75b502a713ceb718dceb5f3a5a2e34fcffc438ee8acfc6580bbc94f -size 53375 diff --git a/selfdrive/assets/training_wide/step12.png b/selfdrive/assets/training_wide/step12.png deleted file mode 100644 index 745a8d0553..0000000000 --- a/selfdrive/assets/training_wide/step12.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aff8f1b35a29e7353a58ca6349ebe1c0faff162596a134fdd74b126b8c1cdd28 -size 1092478 diff --git a/selfdrive/assets/training_wide/step13.png b/selfdrive/assets/training_wide/step13.png deleted file mode 100644 index 68638ffec1..0000000000 --- a/selfdrive/assets/training_wide/step13.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d18847d47d963f2536a748ddfde1df4ef3d1dc2638af94974cd6af1539d9c18b -size 37382 diff --git a/selfdrive/assets/training_wide/step14.png b/selfdrive/assets/training_wide/step14.png deleted file mode 100644 index 2f5956b1ff..0000000000 --- a/selfdrive/assets/training_wide/step14.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be7402c00ea0e67b60394a5858976237af61cccec7068bee0c8ec6aae1385af4 -size 1879281 diff --git a/selfdrive/assets/training_wide/step15.png b/selfdrive/assets/training_wide/step15.png deleted file mode 100644 index 798e01d00a..0000000000 --- a/selfdrive/assets/training_wide/step15.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c7c981f2601607381a341da47bd044d24a8e301c91c5b7426cbce9570f5bad0 -size 1104967 diff --git a/selfdrive/assets/training_wide/step16.png b/selfdrive/assets/training_wide/step16.png deleted file mode 100644 index 2728814181..0000000000 --- a/selfdrive/assets/training_wide/step16.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12780d35798dfab1353bf428927e1c04ca88394675a63c134a0bbbd137201715 -size 35997 diff --git a/selfdrive/assets/training_wide/step17.png b/selfdrive/assets/training_wide/step17.png deleted file mode 100644 index ab54f9c992..0000000000 --- a/selfdrive/assets/training_wide/step17.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfb184957120901b5b803571fa14bd9e7ae98da0b46425e3b75b00a8a69e1246 -size 43545 diff --git a/selfdrive/assets/training_wide/step18.png b/selfdrive/assets/training_wide/step18.png deleted file mode 100644 index 8149e79364..0000000000 --- a/selfdrive/assets/training_wide/step18.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a29dd3ee7abc5d338db395576e7765ba3d4d56568820f8dfbbe938c62fbee6de -size 1646908 diff --git a/selfdrive/assets/training_wide/step2.png b/selfdrive/assets/training_wide/step2.png deleted file mode 100644 index 35d65c9b01..0000000000 --- a/selfdrive/assets/training_wide/step2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdfa7fc67a0d89f5503bb30f1822fa72cbd140c84e14170957531c5166159519 -size 36869 diff --git a/selfdrive/assets/training_wide/step3.png b/selfdrive/assets/training_wide/step3.png deleted file mode 100644 index 0d3a6bbecb..0000000000 --- a/selfdrive/assets/training_wide/step3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c476251bb58200d008fc0aa172173983d9fb0b71ab860f199d9d431910bf5c61 -size 966466 diff --git a/selfdrive/assets/training_wide/step4.png b/selfdrive/assets/training_wide/step4.png deleted file mode 100644 index 1d4da570b1..0000000000 --- a/selfdrive/assets/training_wide/step4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95da2bda3ba1c046620a88b2caf77fd9a2b980b6b746e700d3574f4f1c0d6ce9 -size 1287393 diff --git a/selfdrive/assets/training_wide/step5.png b/selfdrive/assets/training_wide/step5.png deleted file mode 100644 index 1ce43e28dc..0000000000 --- a/selfdrive/assets/training_wide/step5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:886903bfaf0567939125daa0bc7fcaecd08c9f34f4e7c8b137a30986f80e4a6e -size 41823 diff --git a/selfdrive/assets/training_wide/step6.png b/selfdrive/assets/training_wide/step6.png deleted file mode 100644 index d0e06469c7..0000000000 --- a/selfdrive/assets/training_wide/step6.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8dc0b499b0c9dbf7e5e967ea2d55c7ed78f8e56f9055d98662f247de960eda4 -size 1231263 diff --git a/selfdrive/assets/training_wide/step7.png b/selfdrive/assets/training_wide/step7.png deleted file mode 100644 index 63e6e27e07..0000000000 --- a/selfdrive/assets/training_wide/step7.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:690be96b7a3cacaeb8d11bbab043a3e6dd65710ce197a8c7d35a3124dce590d1 -size 936779 diff --git a/selfdrive/assets/training_wide/step8.png b/selfdrive/assets/training_wide/step8.png deleted file mode 100644 index 7788dabcae..0000000000 --- a/selfdrive/assets/training_wide/step8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89d27d040a04508f755741929158545f4d2780c728021bf02446eb0a2e38aaa6 -size 874812 diff --git a/selfdrive/assets/training_wide/step9.png b/selfdrive/assets/training_wide/step9.png deleted file mode 100644 index 43ca1d03df..0000000000 --- a/selfdrive/assets/training_wide/step9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e48538287fc974e5ec97403ba05145c21035f50bdf28b6e00275a4b428643f09 -size 1024935 diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc index f3e50b572b..622dcdd352 100644 --- a/selfdrive/ui/qt/offroad/onboarding.cc +++ b/selfdrive/ui/qt/offroad/onboarding.cc @@ -40,7 +40,6 @@ void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { } void TrainingGuide::showEvent(QShowEvent *event) { - img_path = width() == WIDE_WIDTH ? "../assets/training_wide/" : "../assets/training/"; boundingRect = width() == WIDE_WIDTH ? boundingRectWide : boundingRectStandard; currentIndex = 0; diff --git a/selfdrive/ui/qt/offroad/onboarding.h b/selfdrive/ui/qt/offroad/onboarding.h index 48f4094899..1be1d8f397 100644 --- a/selfdrive/ui/qt/offroad/onboarding.h +++ b/selfdrive/ui/qt/offroad/onboarding.h @@ -73,7 +73,7 @@ private: QRect(108, 804, 426, 164), }; - QString img_path; + const QString img_path = "../assets/training/"; QVector boundingRect; QElapsedTimer click_timer;