From 865fd4ce752c98371cff3b8820ee26a2a6d762c2 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Sat, 28 Mar 2026 18:54:17 -0500 Subject: [PATCH] where is rockhopper --- panda/board/obj/body_h7.bin.signed | Bin 76344 -> 76344 bytes panda/board/obj/body_h7/bootstub.elf | Bin 112692 -> 112692 bytes panda/board/obj/body_h7/main.bin | Bin 76208 -> 76208 bytes panda/board/obj/body_h7/main.elf | Bin 367008 -> 367008 bytes panda/board/obj/bootstub.body_h7.bin | Bin 12644 -> 12644 bytes panda/board/obj/bootstub.panda.bin | Bin 11068 -> 11068 bytes panda/board/obj/bootstub.panda_h7.bin | Bin 18784 -> 18784 bytes panda/board/obj/bootstub.panda_h7_remote.bin | Bin 18784 -> 18784 bytes panda/board/obj/bootstub.panda_jungle_h7.bin | Bin 13956 -> 13956 bytes panda/board/obj/bootstub.panda_remote.bin | Bin 11068 -> 11068 bytes panda/board/obj/gitversion.h | 2 +- panda/board/obj/panda.bin.signed | Bin 68604 -> 68604 bytes panda/board/obj/panda/bootstub.elf | Bin 100760 -> 100760 bytes panda/board/obj/panda/main.bin | Bin 68468 -> 68468 bytes panda/board/obj/panda/main.elf | Bin 332676 -> 332676 bytes panda/board/obj/panda_h7.bin.signed | Bin 84284 -> 84284 bytes panda/board/obj/panda_h7/bootstub.elf | Bin 152728 -> 152728 bytes panda/board/obj/panda_h7/main.bin | Bin 84148 -> 84148 bytes panda/board/obj/panda_h7/main.elf | Bin 410332 -> 410332 bytes panda/board/obj/panda_h7_remote.bin.signed | Bin 84228 -> 84228 bytes panda/board/obj/panda_h7_remote/bootstub.elf | Bin 152736 -> 152736 bytes panda/board/obj/panda_h7_remote/main.bin | Bin 84092 -> 84092 bytes panda/board/obj/panda_h7_remote/main.elf | Bin 410256 -> 410256 bytes panda/board/obj/panda_jungle_h7.bin.signed | Bin 78192 -> 78192 bytes panda/board/obj/panda_jungle_h7/bootstub.elf | Bin 123936 -> 123936 bytes panda/board/obj/panda_jungle_h7/main.bin | Bin 78056 -> 78056 bytes panda/board/obj/panda_jungle_h7/main.elf | Bin 375076 -> 375076 bytes panda/board/obj/panda_remote.bin.signed | Bin 68560 -> 68560 bytes panda/board/obj/panda_remote/bootstub.elf | Bin 100768 -> 100768 bytes panda/board/obj/panda_remote/main.bin | Bin 68424 -> 68424 bytes panda/board/obj/panda_remote/main.elf | Bin 332688 -> 332688 bytes panda/board/obj/version | 2 +- .../ui/layouts/settings/starpilot/sounds.py | 8 ++++---- selfdrive/ui/mici/onroad/starpilot_status.py | 3 ++- selfdrive/ui/qt/onroad/buttons.cc | 4 ++-- selfdrive/ui/ui | Bin 4268856 -> 4268856 bytes selfdrive/ui/ui.cc | 4 ++-- starpilot/common/starpilot_variables.py | 2 +- .../components/tools/device_settings.js | 2 +- .../tools/device_settings_layout.json | 2 +- starpilot/ui/qt/offroad/sounds_settings.cc | 6 +++--- .../qt/onroad/starpilot_annotated_camera.cc | 6 +++--- 42 files changed, 21 insertions(+), 20 deletions(-) diff --git a/panda/board/obj/body_h7.bin.signed b/panda/board/obj/body_h7.bin.signed index e52fd2c9e2ea412b4d83d5cf8c2bba8e2f955e28..bee3f771e8149e108c9a9f05fe17fa02674d14d9 100644 GIT binary patch delta 153 zcmV;K0A~NV)C9QH1h5FI2sJo0Ff?N|VY3jbsDFQB*K3f(S#Ars%rcMidz*z09w9`% zbK?d=1H_=#Xk#*~EwwrRk>lk>MMS&TEK2eCa?Z|c5(l3;&(u0ZrM0uTe7Hk^(n4^< zo~LAwME;>%36FJWl4vXcJ2O-Nk;q*B zPbAS>a;ksTF#yU4rQ@x93}v6;HO&|Gj8?Fgro!;ik(DXTp*Ah*$HB#ag^{FB!Qi8?s3~@^jjx H4x|C1Utdfg diff --git a/panda/board/obj/body_h7/bootstub.elf b/panda/board/obj/body_h7/bootstub.elf index 73c3286444743e76b38bf77cadd15e1a08840406..86fca1358ba2ff9257308fe3b9361a8dbd235662 100755 GIT binary patch delta 27 jcmdn;fo;nNwhgW}9Hthg1}4d-iOs$?+kI^qpH~9_m!Jwf delta 27 jcmdn;fo;nNwhgW}97g8mNk&Gdrp>-K+kI^qpH~9_mKh2S diff --git a/panda/board/obj/body_h7/main.bin b/panda/board/obj/body_h7/main.bin index e89c5228ecc575dcee31f5a543ca0352a59e85dd..a56c9564f61577799068ecb8cf5ef925f190c791 100755 GIT binary patch delta 23 dcmdmRnPmeIajfDnwJNj6Q~EU;=pJpgb$2?PKD delta 23 dcmdmRnPmeIajfDnGB-~$GBP#YEU;=pJpgZV2-N@p diff --git a/panda/board/obj/body_h7/main.elf b/panda/board/obj/body_h7/main.elf index 940ee36a53771a7d8741ee3a5345868418f0e8dd..7dfa39ee9b8f0686f63218d34360bbc30010f9b1 100755 GIT binary patch delta 39 scmZ3mS!}^(u?-x%I7}@}4NQ_v6PpEgwF~TG1Y#y2X5KEai)F%n03W~(h5!Hn delta 39 scmZ3mS!}^(u?-x%IE>8AlZ=c^O`8RFwF~TG1Y#y2X5KEai)F%n02~DlR{#J2 diff --git a/panda/board/obj/bootstub.body_h7.bin b/panda/board/obj/bootstub.body_h7.bin index b9ae1e6eb203d49a5807823119caeebcfd35cb74..79946cc7b2f1e3b8e5df8a0bf5a491e0f5984e81 100755 GIT binary patch delta 21 ccmaEo^dxD6s}6^$g{gr_vT5RGUmbB)09?!l{Qv*} delta 21 ccmaEo^dxD6s}6^exp|V2k*VosUmbB)09*kE&Hw-a diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin index dfe4a7cad8d02cc8111507490c0cd5078e54080e..0501ae3b983d408b7cf85f75bce77bca11208e4c 100755 GIT binary patch delta 34 qcmdlJwkK?ZubQB#g{gr_vT35Oi>p(pJ3|A*Zo9oo}u>b(Y@(S(% delta 34 qcmdlJwkK?ZubQBdxp|V2k*TS!i>p(pJ3|A*Zo9oo}u>b(V#0tLv diff --git a/panda/board/obj/bootstub.panda_h7.bin b/panda/board/obj/bootstub.panda_h7.bin index a35aee7323a3792f6da61102620728ab33eeef31..7a5c7390a5d1989667b9e9fd9d0b99b85bc4ad74 100755 GIT binary patch delta 23 fcmaDbiSfZC#tog$9Hthg1}4d-iJK=npJxRCa487I delta 23 fcmaDbiSfZC#tog$97g8mNk&Gdrkf`^pJxRCZ(azN diff --git a/panda/board/obj/bootstub.panda_h7_remote.bin b/panda/board/obj/bootstub.panda_h7_remote.bin index a35aee7323a3792f6da61102620728ab33eeef31..7a5c7390a5d1989667b9e9fd9d0b99b85bc4ad74 100755 GIT binary patch delta 23 fcmaDbiSfZC#tog$9Hthg1}4d-iJK=npJxRCa487I delta 23 fcmaDbiSfZC#tog$97g8mNk&Gdrkf`^pJxRCZ(azN diff --git a/panda/board/obj/bootstub.panda_jungle_h7.bin b/panda/board/obj/bootstub.panda_jungle_h7.bin index d1a40e8460d7b67ec15beb1ea395f902b6ca88ed..ebea708ec030bbf494e0609f66bd12adcfd875bb 100755 GIT binary patch delta 21 ccmZq4ZOPrR*MP&+!qmVd*)(zUQG@-g09s}T^8f$< delta 21 ccmZq4ZOPrR*MP&w+&sz1$kcT6QG@-g09l&{!~g&Q diff --git a/panda/board/obj/bootstub.panda_remote.bin b/panda/board/obj/bootstub.panda_remote.bin index dfe4a7cad8d02cc8111507490c0cd5078e54080e..0501ae3b983d408b7cf85f75bce77bca11208e4c 100755 GIT binary patch delta 34 qcmdlJwkK?ZubQB#g{gr_vT35Oi>p(pJ3|A*Zo9oo}u>b(Y@(S(% delta 34 qcmdlJwkK?ZubQBdxp|V2k*TS!i>p(pJ3|A*Zo9oo}u>b(V#0tLv diff --git a/panda/board/obj/gitversion.h b/panda/board/obj/gitversion.h index 79320e7b..8ff2431d 100644 --- a/panda/board/obj/gitversion.h +++ b/panda/board/obj/gitversion.h @@ -1,2 +1,2 @@ extern const uint8_t gitversion[19]; -const uint8_t gitversion[19] = "DEV-277b2255-DEBUG"; +const uint8_t gitversion[19] = "DEV-58504c5a-DEBUG"; diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed index 09588377532f17fb7f6e85978ff175936ad6e8c7..866f92da5538029825a7fda47920f805281f24ba 100644 GIT binary patch delta 153 zcmV;K0A~OEmjwKm1hDX$2sJo0Ff?N|VYB#}gm8a^PJ6ISob65_Qeo0GXHt@X-rA)G zWU3=U(_yTGaLkuy#k9Wmq}Q+zX&Gim?Bn HQDgxKMZ`?% delta 153 zcmV;K0A~OEmjwKm1hDX$2r@S}Vlpx{HM97dgm8a8KFX6P`KOPPF;-*PsN;hj=*b1S z8DmXY diff --git a/panda/board/obj/panda/bootstub.elf b/panda/board/obj/panda/bootstub.elf index 83d4547f0f8c61925ad5fa81848eb1347f199dee..5175fe18866600490edc931e2794c74fd940b514 100755 GIT binary patch delta 40 wcmbO+nQg{owhg{!f~FRx1}4d-iMlSXPND7$4GfbfnkqEcnQgB#W0VR800O)WLjV8( delta 40 wcmbO+nQg{owhg{!f=1@%Nk&Gdrn)Y!PND7$4GfbfnkqEcnQgB#W0VR80RF=a6aWAK diff --git a/panda/board/obj/panda/main.bin b/panda/board/obj/panda/main.bin index 0f1a544587ba278c1868ce1af800506561b1651d..a59feb7a00236a70de36f55f5fe7601095a868e2 100755 GIT binary patch delta 23 fcmew|jpfTUmJJ_fahO_|8ki)TCT{*QtEK<|f{hA~ delta 23 fcmew|jpfTUmJJ_faTuAKCm9);nr{9vtEK<|fx-%4 diff --git a/panda/board/obj/panda/main.elf b/panda/board/obj/panda/main.elf index 0b724e2c569dbcfb9025b2315c4a4a35f3bfd173..3eef13a519baa36ec3f4111452a1df3db390dc39 100755 GIT binary patch delta 39 scmZo!F4D4GWW$G59Hthg1}4d-iOoM&wf|Vf2*gZ4%)I@_DwduM0AzC##{d8T delta 39 scmZo!F4D4GWW$G597g8mNk&Gdrp-TAwf|Vf2*gZ4%)I@_DwduM0ARQhm;e9( diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed index 3007ab6fb8d1742baf0899cc717799517c0f8c5a..765eee17b6db9ca91e261675261454948f622ce1 100644 GIT binary patch delta 152 zcmV;J0B8Tak_Ehy1)#S?brBpFDAs=3(^THky^n?`(i# zGguN1Q64J4nK)&fE1=1-hEXg8vfWKql&M#Kax4{YzUfLR=c%QlEIqmNh4OxE*Qh&< z3f9Xja`tCX4DPi_@Pr?k>kLrJO;*=t4ZY4a4$g G83F5M^GZ$t delta 152 zcmV;J0B8Tak_Ehy1)#fL&` z(b@($EIqRvy0mTsN6be*G7iZM#DmQ3u07AyyPTJP*Cd($<}7UwxALZ9{U^DMcR@$5Y=C^;}-Ee--yq@aw-b> GX94;^FHN@q diff --git a/panda/board/obj/panda_h7/bootstub.elf b/panda/board/obj/panda_h7/bootstub.elf index 280fcf29c4b124482e17b4572a7bcb3420b6d670..f3b15eaee9c5e5a1498cbe7d565532ed48e4a809 100755 GIT binary patch delta 31 ncmbQSl5@sN&JCTx9Hthg1}4d-iOmy(+b0GyZl4&;#Lfr+xqAwr delta 31 ncmbQSl5@sN&JCTx97g8mNk&Gdrp*(B+b0GyZl4&;#Lfr+w>S!M diff --git a/panda/board/obj/panda_h7/main.bin b/panda/board/obj/panda_h7/main.bin index 730439eb7de1d0f73144a2399ad7ce75b088b231..bc6228475810c825430c295d6771e36eb9eead17 100755 GIT binary patch delta 22 ecmdlok#);N)&<8nOf5_eOp;9#H**|Y(*yuxtO&6H delta 22 ecmdlok#);N)&<8njLglGjEqc8H**|Y(*yuw;Ru2N diff --git a/panda/board/obj/panda_h7/main.elf b/panda/board/obj/panda_h7/main.elf index 53294827e5e52288d75a60cce813a01fb3310fb2..aa294e33ebf30b5a955289d49ca38df00f1a3bf1 100755 GIT binary patch delta 42 tcmcc9DtV_>a=|qYQwviAlVsDxW{zv^9M>3uma=|qYBXjd4BO_DOW{zv^9M>3um)(t0)a+q3}8ki)TCT_lPbWIZggKi4l delta 23 fcmew}f%VS>)(t0)au}JLCm9);nr^;ubWIZgf};wq diff --git a/panda/board/obj/panda_h7_remote/main.elf b/panda/board/obj/panda_h7_remote/main.elf index d25cc91c742d2b852ec6134fcce2366b22daaed2..cfa59b2c158c76f268ba16750eb889b1481f2506 100755 GIT binary patch delta 43 vcmbQxDmkH5a>I$M9Hthg1}4d-iOm*YJ&*$cu^Sa2 delta 43 vcmbQxDmkH5a>I$M97g8mNk&Gdrp*_wwqLl)2*gZ4%nZaV+b>*YJ&*$ctfUn2 diff --git a/panda/board/obj/panda_jungle_h7.bin.signed b/panda/board/obj/panda_jungle_h7.bin.signed index 68b3c5560e9650cca0c0805a08f63ad41c14d6dd..e2ddcc050758677f6e9ad4191ebe68b91b3544ee 100644 GIT binary patch delta 153 zcmV;K0A~O2;so&G1hBQP2sJo0Ff?N|VY9uiGlGACN_|csdFKq`1p=E_ll+=HmJD0Y z3O7H8jMQ+B*dhp(w~5nMyeW&y^Uz^+Y_Lma+sy7{&}X=&gm;e%fyTV*!hR)T&iKSn z@QLaprHvv_2CdJ+w+M4J5emi_f38xmLLhe?mZYePpVz%oY)(~O@bLii*}%=yM~^Md HTuT8`eZNc| delta 153 zcmV;K0A~O2;so&G1hBQP2r@S}Vlpx{HM700GlG9WiKU|fNEN|e_*#vznbJbLz&@u1 z{I!9+gVy&FM`zIr2I(=?ciTHDL1AyoaQ8& zrjT3-cMhj8IQc$U<@CILM)Ww`c0vvtoIF2HZ9lejno!j?y)Owc-`w^RLpNV$m!=*B H8qWb@+9yfC diff --git a/panda/board/obj/panda_jungle_h7/bootstub.elf b/panda/board/obj/panda_jungle_h7/bootstub.elf index 52d626beba75c63af11337354761d253117a3892..7b3c32b48fbc653afc92277bbab5cafa2db1dd2d 100755 GIT binary patch delta 27 jcmZ2*f_=dW_6>U-I7}@}4NQ_v6Pu4ZY(MJ27`+$(n=1;| delta 27 jcmZ2*f_=dW_6>U-IE>8AlZ=c^O`DH8Y(MJ27`+$(nWPG* diff --git a/panda/board/obj/panda_jungle_h7/main.bin b/panda/board/obj/panda_jungle_h7/main.bin index 7e9a04074fb1bb0654d6b2930830fdc5ff4a2787..6a141a5b9743c2a9f942ab726a572a0599e9a544 100755 GIT binary patch delta 23 fcmaFykmbcgmJM6iahO_|8ki)TCT`xlPP+*Jh{y_n delta 23 fcmaFykmbcgmJM6iaTuAKCm9);nr_~^PP+*Jhy4ms diff --git a/panda/board/obj/panda_jungle_h7/main.elf b/panda/board/obj/panda_jungle_h7/main.elf index cc1fdbf42974749b71c7333e5300fd6e41bf8e38..6f8af8f51a304077bc305d63a1a02ebf332a9cbc 100755 GIT binary patch delta 39 tcmZ4TNo>g{u?<`IahO_|8ki)TCN}Tg*S>cjBM>tIG4uAl`&iO{0RVLL6C?lt delta 39 tcmZ4TNo>g{u?<`IaTuAKCm9);nl|s<*S>cjBM>tIG4uAl`&iO{0RVA167>K8 diff --git a/panda/board/obj/panda_remote.bin.signed b/panda/board/obj/panda_remote.bin.signed index 5ad16f1d78268f76c9f4ab3620cabffa958dd05c..bfb044af59506c72d75446d37c7b9d3beb178389 100644 GIT binary patch delta 153 zcmV;K0A~Ntmjuw41hB-K2sJo0Ff?N|VYAGdgm8Z|gmGN?Vh5NQzL~}gb0#&QEal=^ ztl0|pGA`$SPf7;t?DfKBHDG!wPm2JO`Q2d5RF{P^g;N4u@F1zlIqTb$H4g^Hk2)S* zXx7du&FAz{Pn{yiSdSK9NN2KSFC!l H@5=!e2~xjpf8NmJLT{ahO_|8ki)TCT>16tEK<|cex4Q delta 23 fcmX>xjpf8NmJLT{aTuAKCm9);nr=QbtEK<|cJ2wV diff --git a/panda/board/obj/panda_remote/main.elf b/panda/board/obj/panda_remote/main.elf index 5fa18e4f4afe2ec7449b9bd8648396e99f6b9f1f..07de0ca925f1ebc3611eb62efa186580a2ff9cfd 100755 GIT binary patch delta 39 tcmbQRTx7y>kqt*yahO_|8ki)TCN`g0)qZ9bBM>tIG4u8_t5}X?0039#5)S|X delta 39 tcmbQRTx7y>kqt*yaTuAKCm9);nl_(V)qZ9bBM>tIG4u8_t5}X?002}h5#Rs- diff --git a/panda/board/obj/version b/panda/board/obj/version index 7d2e710b..b10a7128 100644 --- a/panda/board/obj/version +++ b/panda/board/obj/version @@ -1 +1 @@ -DEV-277b2255-DEBUG \ No newline at end of file +DEV-58504c5a-DEBUG \ No newline at end of file diff --git a/selfdrive/ui/layouts/settings/starpilot/sounds.py b/selfdrive/ui/layouts/settings/starpilot/sounds.py index bfc0db2d..e6dc2f66 100644 --- a/selfdrive/ui/layouts/settings/starpilot/sounds.py +++ b/selfdrive/ui/layouts/settings/starpilot/sounds.py @@ -72,7 +72,7 @@ class StarPilotSoundsLayout(StarPilotPanel): panel.refresh_visibility() class StarPilotVolumeControlLayout(StarPilotPanel): - COOLDOWN_INFO = {"title": tr_noop("Switchback Mode Cooldown"), "icon": "toggle_icons/icon_mute.png", "min": 0, "max": 60} + COOLDOWN_INFO = {"title": tr_noop("Switchback Mode Cooldown"), "icon": "toggle_icons/icon_mute.png", "min": 0, "max": 30} VOLUME_INFO = { "BelowSteerSpeedVolume": {"title": tr_noop("Min Steer Speed Alert"), "icon": "toggle_icons/icon_mute.png", "min": 0}, "DisengageVolume": {"title": tr_noop("Disengage Volume"), "icon": "toggle_icons/icon_mute.png", "min": 0}, @@ -117,8 +117,8 @@ class StarPilotVolumeControlLayout(StarPilotPanel): if v == 0: return tr("Off") if v == 1: - return tr("1 second") - return f"{v} {tr('seconds')}" + return tr("1 minute") + return f"{v} {tr('minutes')}" self.CATEGORIES.append({ "title": self.COOLDOWN_INFO["title"], @@ -158,7 +158,7 @@ class StarPilotVolumeControlLayout(StarPilotPanel): gui_app.set_modal_overlay(SliderDialog( tr(self.COOLDOWN_INFO["title"]), 0, self.COOLDOWN_INFO["max"], 1, current_v, on_close, - unit=" s", labels={0: tr("Off")}, color="#FF0097" + unit=" min", labels={0: tr("Off")}, color="#FF0097" )) @classmethod diff --git a/selfdrive/ui/mici/onroad/starpilot_status.py b/selfdrive/ui/mici/onroad/starpilot_status.py index 564adfb9..20e1744c 100644 --- a/selfdrive/ui/mici/onroad/starpilot_status.py +++ b/selfdrive/ui/mici/onroad/starpilot_status.py @@ -17,9 +17,10 @@ TRAFFIC_COLOR = rl.Color(201, 34, 49, 255) def get_border_color(state: UIState): enabled = state.sm["selfdriveState"].enabled + lateral_active = enabled or state.always_on_lateral_active if state.status == UIStatus.OVERRIDE: return OVERRIDE_COLOR - if state.switchback_mode_enabled and enabled: + if state.switchback_mode_enabled and lateral_active: return SWITCHBACK_COLOR if state.traffic_mode_enabled and enabled: return TRAFFIC_COLOR diff --git a/selfdrive/ui/qt/onroad/buttons.cc b/selfdrive/ui/qt/onroad/buttons.cc index c5f79582..329c2acc 100644 --- a/selfdrive/ui/qt/onroad/buttons.cc +++ b/selfdrive/ui/qt/onroad/buttons.cc @@ -92,14 +92,14 @@ void ExperimentalButton::showEvent(QShowEvent *event) { void ExperimentalButton::updateBackgroundColor() { if (isDown() || !engageable) { background_color = QColor(0, 0, 0, 166); + } else if (starpilot_scene.switchback_mode_enabled) { + background_color = bg_colors[STATUS_SWITCHBACK_MODE_ENABLED]; } else if (starpilot_scene.always_on_lateral_active) { background_color = bg_colors[STATUS_ALWAYS_ON_LATERAL_ACTIVE]; } else if (starpilot_scene.conditional_status == 1) { background_color = bg_colors[STATUS_CEM_DISABLED]; } else if (experimental_mode) { background_color = bg_colors[STATUS_EXPERIMENTAL_MODE_ENABLED]; - } else if (starpilot_scene.switchback_mode_enabled) { - background_color = bg_colors[STATUS_SWITCHBACK_MODE_ENABLED]; } else if (starpilot_scene.traffic_mode_enabled) { background_color = bg_colors[STATUS_TRAFFIC_MODE_ENABLED]; } else { diff --git a/selfdrive/ui/ui b/selfdrive/ui/ui index 87f7f44ff405ffac07e28f0e17dcc170441db9d1..080573835afe8385ba4ec5c8801daaac2875ac58 100755 GIT binary patch delta 1373 zcmY+?e@q*76aet|y`#NyEl?<23v9Ifa>8)X*?~oDkIBM_pjc)iMiy|eG1)MLEx}}w z4j9Mi#(D|nEB_eKZIKQV;!LiLL}dPs{(&*dk{RV!CJ8DdLm9$~?=S}Z zzTe;%9ZV37)H1QT`j+mu$2V#wGz+JdR*aqT5SNazE08k907;*5Hz&|99h(hYYpL| zvjHH__nPQj1aN!fEQwkviCN~1MTo#trViu7^}}Z)ET0GvXH69vzKV7PoKcvJ*uTwN)7SkDxJ8+ zo5H5DG`-Y+OCOu|fQ5is`Q@b$RsXCS_v1ugXcH%z0*|~QDv4t}(j$W+jzxSvRCZ5v zcHw$wVqr45JWN(sUVnQ>&d4k4o+3 zA35bg9!4^%>{9DS6f!EU8_~bJxq)!J6lwWVb3u&KTwpru;Yc|6F{3Q?nB;J7MhExR zNP5R~(Wpj~YPEULq?iX|;>ThAztO{ zPT>J#hk3{*lY5fB+UxZ&#(hcGa2xmLINWVqV3sup=2%N$o{bIsio3=$7#*g|7llMN zvVq-NarBgLoz8HDYtz_srZq%wP-nMbjplmS>3FMaaGbS11mgAN(UaXmHd&;7-9jom z`#MWs7}Cdw-N0^I-66yo4Mb+a8&9_G`fb=e!;bwflq<`kAPe5j5QHFf+@-=3~N!|8@%iMVlZu4b3{ay_Q)WDXn zoYXiB%+{*9Z#ZfmYP_C{l^2F(O#5=oD_X;E9C$gu)Y0}N?Pzm+ zobB+|f!|#K@U2_7QA_T)Z9i3lSJX{bLYH_Bprf#KvJMss%lj)Kc(7V(YImRmC>Q0S grt<8 delta 1369 zcmY+?e@q)y902flcl~i(`BB#P3I!<$Z2a1wTY(iBy&?-+WRn$)VqifB8;)&CUZU&GgXwYk!*~WB6;y*Qun=wmV!y-i77#R)_Z2cZebboyE?)&cE z_kHjCp6^>H=>y{pq;_xIXBXu^mtJjq`OpV$%dN7EU*5^@X(#!1k^s_30U3}31yBMS zM2PJq^V0-7Mvw5qVbdpT3C80_c|2#sK~h0GK93Q*EvgeBr-Q6haI>1m@?u| z?DsL{gcB2fCNGge)x*ToDef%Dz4Sir?R|L4$LOP!kR?bNvpSEG77hn}jFG6vf}hEW zmp{Gki+|V6k@#JaVav3z(6|@1e2q}GtCzF55HioJxYgze&hn`W6}tL4OEZJa(l;|u z$L6~i7*sG1JCRMsBsOV#;db6Tt!dPX4YUUx46~^zOx;-#HrqHOAaC#twN%&hS9)yk0g~G70 zW;E;wVPi7&qlD+KFhB(&Mea(}&9RIdoTU$X64atViiZ+(kfEuB^Bd);r3-f7m=91w z47N2zYql`b>tFx3q>{HcMT_>Pm{c#5QY1_>XgqV(!gsF60JYe;9{a$m?23SUQETE` zi?@ia#hTN0WspW5m=PD;8X-bCMWaVj#J{IGtCpgG^tFCOBkD)A@qNk&8nV`z_(GFT zEHtqnRuNC|Z717IRuqZPpJC4s#Gp9c%RVOK=!3&{bRXrC>K#c0u`THmG~&B#xOIWE ztd@au@y|m0#ybA#eN;2G(fiojt~DG~+E(w)D23L}5FW+({j4!o;a$VmI!i{bQN|TS zIP3+uv7gP2`t3O74YqQtU-l%eEaRc!Xgw7?PT?2FRPnM=$b{>itPVfuXI1hPyoRsi zzxvtKC_Own6v&J^9CjJr?qZK=?TRp7K5}p*OvcUI2vofby33EbSfB@S;+QL5xJ1Sk zVXMh-PB|opHZEE4Eh*@df>%u9v7H8Y7SWBL)EZJ{o+v?wO?3wS))+|DS5mfdwnPkk zs*V<5fyt8{3c6OVu=I(YhBCoX=p@5ZMZy@eklke6bCr1Zr&;ZwgP@k=s*kEO$;4G{1k*0*b(Mpcw1{CBQ1~U*r}{e*@ap B_|*Ua diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 51efb364..7fe1d664 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -97,10 +97,10 @@ void UIState::updateStatus(StarPilotUIState *fs) { if (state == cereal::SelfdriveState::OpenpilotState::PRE_ENABLED || state == cereal::SelfdriveState::OpenpilotState::OVERRIDING) { status = STATUS_OVERRIDE; + } else if (starpilot_scene.switchback_mode_enabled && (ss.getEnabled() || starpilot_scene.always_on_lateral_active)) { + status = STATUS_SWITCHBACK_MODE_ENABLED; } else if (starpilot_scene.always_on_lateral_active) { status = STATUS_ALWAYS_ON_LATERAL_ACTIVE; - } else if (starpilot_scene.switchback_mode_enabled && ss.getEnabled()) { - status = STATUS_SWITCHBACK_MODE_ENABLED; } else if (starpilot_scene.traffic_mode_enabled && ss.getEnabled()) { status = STATUS_TRAFFIC_MODE_ENABLED; } else { diff --git a/starpilot/common/starpilot_variables.py b/starpilot/common/starpilot_variables.py index 43f1dc93..bb5232fa 100644 --- a/starpilot/common/starpilot_variables.py +++ b/starpilot/common/starpilot_variables.py @@ -548,7 +548,7 @@ class StarPilotVariables: toggle.alert_volume_controller = self.get_value("AlertVolumeControl") toggle.below_steer_speed_volume = self.get_value("BelowSteerSpeedVolume", cast=float, condition=toggle.alert_volume_controller) - toggle.switchback_mode_cooldown = self.get_value("SwitchbackModeCooldown", cast=float, min=0, max=60) + toggle.switchback_mode_cooldown = self.get_value("SwitchbackModeCooldown", cast=float, conversion=60, min=0, max=1800) toggle.disengage_volume = self.get_value("DisengageVolume", cast=float, condition=toggle.alert_volume_controller) toggle.engage_volume = self.get_value("EngageVolume", cast=float, condition=toggle.alert_volume_controller) toggle.prompt_volume = self.get_value("PromptVolume", cast=float, condition=toggle.alert_volume_controller) diff --git a/starpilot/system/the_pond/assets/components/tools/device_settings.js b/starpilot/system/the_pond/assets/components/tools/device_settings.js index 8148f05b..f09b975d 100644 --- a/starpilot/system/the_pond/assets/components/tools/device_settings.js +++ b/starpilot/system/the_pond/assets/components/tools/device_settings.js @@ -202,7 +202,7 @@ function formatSliderValue(val, stepStr, precisionInt, key) { if (key === "SwitchbackModeCooldown") { if (v === 0) return "Off" - return v === 1 ? "1 sec" : `${v} sec` + return v === 1 ? "1 min" : `${v} min` } const volumeKeys = [ diff --git a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json index 1eaa9d2e..c3b39606 100644 --- a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json +++ b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json @@ -1534,7 +1534,7 @@ "data_type": "int", "ui_type": "numeric", "min": 0.0, - "max": 60.0, + "max": 30.0, "step": 1.0, "parent_key": "AlertVolumeControl" }, diff --git a/starpilot/ui/qt/offroad/sounds_settings.cc b/starpilot/ui/qt/offroad/sounds_settings.cc index 08592f99..959354a6 100644 --- a/starpilot/ui/qt/offroad/sounds_settings.cc +++ b/starpilot/ui/qt/offroad/sounds_settings.cc @@ -52,10 +52,10 @@ StarPilotSoundsPanel::StarPilotSoundsPanel(StarPilotSettingsWindow *parent, bool soundsToggle = alertVolumeControlToggle; } else if (alertCooldownKeys.contains(param)) { std::map cooldownLabels; - for (int i = 0; i <= 60; ++i) { - cooldownLabels[i] = i == 0 ? tr("Off") : i == 1 ? tr("1 second") : QString::number(i) + tr(" seconds"); + for (int i = 0; i <= 30; ++i) { + cooldownLabels[i] = i == 0 ? tr("Off") : i == 1 ? tr("1 minute") : QString::number(i) + tr(" minutes"); } - soundsToggle = new StarPilotParamValueControl(param, title, desc, icon, 0, 60, QString(), cooldownLabels, 1); + soundsToggle = new StarPilotParamValueControl(param, title, desc, icon, 0, 30, QString(), cooldownLabels, 1); } else if (alertVolumeControlKeys.contains(param)) { std::map volumeLabels; for (int i = 0; i <= 101; ++i) { diff --git a/starpilot/ui/qt/onroad/starpilot_annotated_camera.cc b/starpilot/ui/qt/onroad/starpilot_annotated_camera.cc index 1048a002..c47e3b9f 100644 --- a/starpilot/ui/qt/onroad/starpilot_annotated_camera.cc +++ b/starpilot/ui/qt/onroad/starpilot_annotated_camera.cc @@ -738,14 +738,14 @@ void StarPilotAnnotatedCameraWidget::paintPathEdges(QPainter &p, int height) { gradient.setColorAt(1.0f, QColor(baseColor.red(), baseColor.green(), baseColor.blue(), 255.0f * 0.0f)); }; - if (starpilot_scene.always_on_lateral_active) { + if (starpilot_scene.switchback_mode_enabled) { + setPathEdgeColors(bg_colors[STATUS_SWITCHBACK_MODE_ENABLED]); + } else if (starpilot_scene.always_on_lateral_active) { setPathEdgeColors(bg_colors[STATUS_ALWAYS_ON_LATERAL_ACTIVE]); } else if (starpilot_scene.conditional_status == 1) { setPathEdgeColors(bg_colors[STATUS_CEM_DISABLED]); } else if (experimentalMode) { setPathEdgeColors(bg_colors[STATUS_EXPERIMENTAL_MODE_ENABLED]); - } else if (starpilot_scene.switchback_mode_enabled) { - setPathEdgeColors(bg_colors[STATUS_SWITCHBACK_MODE_ENABLED]); } else if (starpilot_scene.traffic_mode_enabled) { setPathEdgeColors(bg_colors[STATUS_TRAFFIC_MODE_ENABLED]); } else if (starpilot_toggles.value("color_scheme").toString() != "stock") {