From a9ba3193e2eb8c49ace6999927c27168da7be931 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Tue, 22 Aug 2023 14:36:12 -0700 Subject: [PATCH] dragonpilot beta3 date: 2023-08-22T14:36:40 commit: 6882c14d98c8759148d4c762fbffd3e254d2d34a --- body/board/obj/body.bin | Bin 25308 -> 25308 bytes body/board/obj/body.bin.signed | Bin 25444 -> 25444 bytes body/board/obj/body.elf | Bin 416388 -> 416388 bytes body/board/obj/bootstub.body.bin | Bin 9500 -> 9500 bytes body/board/obj/bootstub.body.elf | Bin 264960 -> 264960 bytes body/board/obj/gitversion.h | 2 +- .../jungle/obj/bootstub.panda_jungle.bin | Bin 11192 -> 11192 bytes .../jungle/obj/bootstub.panda_jungle.elf | Bin 221092 -> 221092 bytes .../jungle/obj/bootstub.panda_jungle_h7.bin | Bin 13616 -> 13616 bytes .../jungle/obj/bootstub.panda_jungle_h7.elf | Bin 233340 -> 233340 bytes panda/board/jungle/obj/panda_jungle.bin | Bin 49720 -> 49720 bytes .../board/jungle/obj/panda_jungle.bin.signed | Bin 49856 -> 49856 bytes panda/board/jungle/obj/panda_jungle.elf | Bin 322716 -> 322716 bytes panda/board/jungle/obj/panda_jungle_h7.bin | Bin 56052 -> 56052 bytes .../jungle/obj/panda_jungle_h7.bin.signed | Bin 56188 -> 56188 bytes panda/board/jungle/obj/panda_jungle_h7.elf | Bin 419352 -> 419352 bytes panda/board/obj/bootstub.panda.bin | Bin 15964 -> 15964 bytes panda/board/obj/bootstub.panda.elf | Bin 251344 -> 251344 bytes panda/board/obj/bootstub.panda_h7.bin | Bin 17400 -> 17400 bytes panda/board/obj/bootstub.panda_h7.elf | Bin 258916 -> 258916 bytes panda/board/obj/gitversion.h | 2 +- panda/board/obj/panda.bin | Bin 59324 -> 59324 bytes panda/board/obj/panda.bin.signed | Bin 59460 -> 59460 bytes panda/board/obj/panda.elf | Bin 374436 -> 374436 bytes panda/board/obj/panda_h7.bin | Bin 64620 -> 64620 bytes panda/board/obj/panda_h7.bin.signed | Bin 64756 -> 64756 bytes panda/board/obj/panda_h7.elf | Bin 465076 -> 465076 bytes panda/board/obj/version | 2 +- panda/board/pedal/obj/bootstub.pedal.bin | Bin 14020 -> 14020 bytes panda/board/pedal/obj/bootstub.pedal.elf | Bin 147004 -> 147004 bytes panda/board/pedal/obj/bootstub.pedal_usb.bin | Bin 14020 -> 14020 bytes panda/board/pedal/obj/bootstub.pedal_usb.elf | Bin 147008 -> 147008 bytes selfdrive/car/toyota/carstate.py | 8 +---- selfdrive/controls/lib/road_edge_detector.py | 31 ++++++++++++++++++ 34 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 selfdrive/controls/lib/road_edge_detector.py diff --git a/body/board/obj/body.bin b/body/board/obj/body.bin index f23a2edd8ff5dee9b8bfd68bbac0f14ec998bfef..56bb06368782b449605799d838ce264ba58472b3 100755 GIT binary patch delta 35 rcmca}l=03{#tnG_EN-7t6(<)7tmaNKvlQS?`q-G1l(<<#a7!Qn2xSe{ delta 35 rcmca}l=03{#tnG_EY6?O7$+AAtmZZ|G85oV`q*e{V7OUBa7!Qn{#Fd~ diff --git a/body/board/obj/body.bin.signed b/body/board/obj/body.bin.signed index 1913b5d2ff93242ac4564aeedcf241e78db03e1c..c90218370f23e4211f251f140abc27573834d263 100644 GIT binary patch delta 165 zcmV;W09ya##sTEU0kCcm1V-{@A(L_ts|#W_IS>nC@quDuVY4U^yitFZ;FVRMHRO!J zq&Y`#H6I3-I%gE+1AwSN(s@+=T>Yt_M!^{zE8nxeOKp?QX_h&rE0h4kNs|z+VHV_M9@qslkF|#NUyitFz-8rnnA=8P? zLORQkpxjge_W$H||HU1+lOY*I^@sAa8K4hHZqS%HegWGRs4Ea<8e^iE2)^xWiLlGW z2av;ah~-~J@#R{|8j5ho`d&Q3Djqqc$NO0d|KH!=C87$XVB{W{f&MPc>4@_C9+$i# T0VLdJL{ueTEL)HC8`S~3G4oJ9 diff --git a/body/board/obj/body.elf b/body/board/obj/body.elf index d355901bb3842ba6fec9a21e4e5c2f8948842d8c..9a1fb0486eb127aeaea4ae0d963edd4dbf8260b9 100755 GIT binary patch delta 65 zcmZqKD%rACazkDKi`%DE#mPkhtGScRECsleJ~k#LB{pjWwrd13Zr2E8(y?I%3bcp! RG669&5VLF#?`73J3jiG}7ia(g delta 65 zcmZqKD%rACazkDKi}R;6#>qtitGUgL%mlcTJ~o;f7&dDJwrd13Zr2E8(y?I%3bcp! RG669&5VLF#?`73J3jpmq74-lB diff --git a/body/board/obj/bootstub.body.bin b/body/board/obj/bootstub.body.bin index 4d212e48fd5e702a7e72cf1602f201c8b8ec38e5..1bbbe6ae44aed1b1f6a631fb99a2a753be7da91d 100755 GIT binary patch delta 21 ccmbQ^HOFhiGbN6sq{JjM%haUJ@09eI0Ae@@Jpcdz delta 21 ccmbQ^HOFhiGbIjF14A<-vowRv@09eI09bAZN&o-= diff --git a/body/board/obj/bootstub.body.elf b/body/board/obj/bootstub.body.elf index a4d54ddeb113e5ee01dfcc921e448ef7ba97d1df..071b2dc3e5577f5b8ae97bd7903278edf3734b06 100755 GIT binary patch delta 34 ncmZpeCeQ#xTNs}yaU>-rCYf2LCbhp)VgzEQ?eCPBg(^b diff --git a/panda/board/jungle/obj/bootstub.panda_jungle_h7.bin b/panda/board/jungle/obj/bootstub.panda_jungle_h7.bin index ac131f0b3abe5fb10a77d6afd4be4c0ebe6b2b58..d85d2a4d48e7d4eadd98b9f33dde366382a39de1 100755 GIT binary patch delta 21 ccmdmxwIORmp#euyQeu*sWopvqN`vhz0AmCQVgLXD delta 21 ccmdmxwIORmp#g`ffuWg^S(?G-N`vhz09iT*ZvX%Q diff --git a/panda/board/jungle/obj/bootstub.panda_jungle_h7.elf b/panda/board/jungle/obj/bootstub.panda_jungle_h7.elf index ac52d910dad726e13c78a3a0198884774d1a7384..2eaa65ac5bdea9540dca19655cc114f11d3bea12 100755 GIT binary patch delta 34 ocmew}kMGYszJ@J~g$5i+Nr_2jmZ?eYl?IGJ%(T7IfSEZS0P$Q56aWAK delta 34 ocmew}kMGYszJ@J~g$5j^28L!vW@!fPl?IGJ%(T7IfSEZS0N)1-ApigX diff --git a/panda/board/jungle/obj/panda_jungle.bin b/panda/board/jungle/obj/panda_jungle.bin index 6311a50ee6995dc1d1276303f2664c4345cd0681..9da4fde56a9fb786c5ffa9beb797d4b991deed27 100755 GIT binary patch delta 23 ecmdnd!n~t}dBf5^j-;f-Bs0s@q|Iylx{U#L&I!{1 delta 23 ecmdnd!n~t}dBf5^4pRd|Gb6J!gUxIEx{U#C1PI^& diff --git a/panda/board/jungle/obj/panda_jungle.bin.signed b/panda/board/jungle/obj/panda_jungle.bin.signed index 2b2a9439bb603ad69347529dd3bc67d8170d30d8..98089282ecdf8d58f6467e9260b4635276dfe808 100644 GIT binary patch delta 153 zcmV;K0A~Ndg#*Ba1F)rz2x4MkVm3KtVzaG|lQVx2;dR4~_yvER?_~Nc!a4h+4ipDZTtp>{eCZ-IdwTBT7f>BBJLa==QOCIsEJPmi{esJ!KVzvX7u53lSI+NnluBwgdu002FR!fjXFT~!=rR3Y)QBm{ z4ee_&t0RSzrR+vIR~FM7&$0lwPYV67Teor7&!YgysMZk|WU6IM7f_+{{|o+t)E~#< H_KX2#HAPHd diff --git a/panda/board/jungle/obj/panda_jungle.elf b/panda/board/jungle/obj/panda_jungle.elf index 702c26f010076954def38717704055362e22422b..d5272d33331788da223762a24d7260d44d20663f 100755 GIT binary patch delta 39 tcmbPpQ+Uoz;SEdAaU>-rCYf2LCN-};*S_`~BM>tIG4uAd=UCp$0swxB6GZ?3 delta 39 tcmbPpQ+Uoz;SEdAahMtyni-j;88ojw*S_`~BM>tIG4uAd=UCp$0sv)@5>fyF diff --git a/panda/board/jungle/obj/panda_jungle_h7.bin b/panda/board/jungle/obj/panda_jungle_h7.bin index 1058c8eb226a61f0b6e4abd7f3192ab4383a305e..59bd83b6c512e2e24aaa5f6aed22352228943a3e 100755 GIT binary patch delta 23 fcmeyemHEq7<_&M>b0j4tCYf2LCT;#Y|GyOgkbDc; delta 23 fcmeyemHEq7<_&M>bC?VAT!+bD^HL$w@8g92eR@qckk9`E~iTxCV$zc^fYv318~d58CmUf z$&VzQ6%<~*o?{7`Nc{5-nGzuKJnU+4ZuqN@k%iU5ibBDo>zy(Xi%+f;Q3;hk4i8b5 Ha|!{cW!pw2 delta 153 zcmV;K0A~OEwgddO1F-F%2sJPcbB1x%AQH}YY1WC;DT z1%IYt^H4NQ_p%VtpbUy_USSCj7w89j{2-re2 diff --git a/panda/board/jungle/obj/panda_jungle_h7.elf b/panda/board/jungle/obj/panda_jungle_h7.elf index e4ba9f0e2648f66bfbbf9f72928f6e2da3b322ff..16bea877d5a0b016aaa0765c71cdd1f8dadc866a 100755 GIT binary patch delta 42 ucmbPnMsmg($%ZYAZ|8F)B_$@AS*9knf1S?=#7scU48$zkzs_e>J_Z1&)D$oP delta 42 ucmbPnMsmg($%ZYAZ|8HE8W@@xnWY)Df1S?=#7scU48$zkzs_e>J_Z1e=My~u diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin index ae2f75ea2fcc4de72e72405c0c364c03c82287a7..95c2621a89efa21f9b03ea3462cb9859c74c7339 100755 GIT binary patch delta 21 ccmcapbEjs5pe09AQeu*sWopu9NlRx|0A$Mty#N3J delta 21 ccmcapbEjs5pe2W?fuWg^S(?FSNlRx|09yeD$^ZZW diff --git a/panda/board/obj/bootstub.panda.elf b/panda/board/obj/bootstub.panda.elf index 832f2392ac82fbe00b1703e7233835b6a4294a25..60063df4629158101365e074b1ca7415eff3983c 100755 GIT binary patch delta 34 ocmcbxn*YLT{)R1#f|eXfNr_2jmZ?eYl9r4>%(Pw7l6m_a0NHg5Z2$lO delta 34 ocmcbxn*YLT{)R1#f|eYn28L!vW@!fPl9r4>%(Pw7l6m_a0LLH-dH?_b diff --git a/panda/board/obj/bootstub.panda_h7.bin b/panda/board/obj/bootstub.panda_h7.bin index e3e6386a528847a146c5daa3a49e6aa0b2d464ad..8c70ad93a8dd838dcc3f7e6705e4e29e1bfa0b33 100755 GIT binary patch delta 23 ecmey-&iJF9al>0Xj-;f-Bs0s@q|IOLm{|dUeF={M delta 23 ecmey-&iJF9al>0X4pRd|Gb6J!gUw&HyGiTIn7-=sWzT*o~O&h~1{eC_Fx H1e*b0>@Q9~ delta 153 zcmV;K0A~Nh&;!KK1F-P12sJP<5$pQjnIaRL1>XLtL0?H!;MNoy zYc0A*uHGN{#4>iYfP_j)41B$?R{m6*-jDOI3?l1V(=zBw<5-;j)hGcM7tzpIxN(A` z3lFYpWV@FT(td4`9WQ3ind~D3(F{)2Q$@PGSv@HFb^Pa5n-?m8mzPu_UImMyQkQhn HcDDfzj}b|j diff --git a/panda/board/obj/panda.elf b/panda/board/obj/panda.elf index bfc78344620ae9b74ddff77910c38ddb86f05168..1b0e6ee9cb9a3ca728af02cf0f4f0985a77dcb76 100755 GIT binary patch delta 39 tcmZ4TR&2>zu?-(SawH`sCYf2LCN=-~*#6@qBM>tIG4u8xA6eEM0RXT17JC2y delta 39 tcmZ4TR&2>zu?-(Sa+n$zni-j;88rX+*#6@qBM>tIG4u8xA6eEM0RWc(6^H-; diff --git a/panda/board/obj/panda_h7.bin b/panda/board/obj/panda_h7.bin index 93b7e5d79968271f0595ad32f52b35b13bdb5bc2..cd08dcf98f647aff030a5ba2b1cdc6e442a2bf94 100755 GIT binary patch delta 23 fcmaF!gZa%5<_!(|Ig*kRlgunrlQwtke_{gwlV=N^ delta 23 fcmaF!gZa%5<_!(|IZO=<&5X>_3^sS{e_{gwiJc0n diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed index 7a913e065a54161e85e308971fc33bcd79ec95c5..617ef300aad7999b69539dd72326a3e912651337 100644 GIT binary patch delta 153 zcmV;K0A~O6`2+O%1F(R<2x4MkVm3KtVzY?9>^y(8&?6rLyk5m3O;?|A>#X~-#DQ!Y zaqka)I*1tzJP7)HksuP@<|>=k;NYN-11dVcGn4`XxzKG;S$aYyT9Bzv-?DuXGT_Gy z)el`{1MWy{n~f5AkT2t)%Nf1lqbN@{Vxn&>@Hv*PxVO^y&?OsQA0v^EFUklEd5b6mFpZ?`F& zW<~SUcExnE?@!}vcSB^%R-1gKA;F9cgfjI-b1}8`Y*;_xTP2~Lee$k1$2mw`x*oik zjWyU2X-yxr4owr$Wxj)pCaD-1c3k`j~5EK`%(HyAQ*-(bizfd>H3)C>Cn delta 30 mcmX@`hvUE>j)pCaD-1bI4GhhU%+d_nHyAQ*-(bizfd>G=OA819 diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 2dbfabcaa..cec1bef6c 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -263,13 +263,7 @@ class CarState(CarStateBase): messages.append(("BSM", 1)) if dp_toyota_enhanced_bsm: - signals +=[ - ("BLINDSPOT", "DEBUG"), - ("BLINDSPOTSIDE", "DEBUG"), - ("BLINDSPOTD1", "DEBUG"), - ("BLINDSPOTD2", "DEBUG"), - ] - checks.append(("DEBUG", 65)) + messages.append(("DEBUG", 65)) if CP.carFingerprint in RADAR_ACC_CAR: if not CP.flags & ToyotaFlags.SMART_DSU.value: diff --git a/selfdrive/controls/lib/road_edge_detector.py b/selfdrive/controls/lib/road_edge_detector.py new file mode 100644 index 000000000..6d05eb0e8 --- /dev/null +++ b/selfdrive/controls/lib/road_edge_detector.py @@ -0,0 +1,31 @@ +import numpy as np + +class RoadEdgeDetector: + + def __init__(self): + self._is_enabled = False + + def get_road_edge_detected(self, road_edge_stds, lane_line_probs, left_blinker, right_blinker): + if not self._is_enabled: + return False, False + + # Calculate probabiities for detecting road edges and lane lines + left_road_edge_prob = np.clip(1.0 - road_edge_stds[0], 0.0, 1.0) + left_lane_nearside_prob = lane_line_probs[0] + + right_road_edge_prob = np.clip(1.0 - road_edge_stds[1], 0.0, 1.0) + right_lane_nearside_prob = lane_line_probs[3] + + # Check conditions for detecting road edges + if right_blinker and right_road_edge_prob > 0.35 and right_lane_nearside_prob < 0.2 and left_lane_nearside_prob >= right_lane_nearside_prob: + return False, True + if left_blinker and left_road_edge_prob > 0.35 and left_lane_nearside_prob < 0.2 and right_lane_nearside_prob >= left_lane_nearside_prob: + return True, False + + return False, False + + def set_enabled(self, enabled): + self._is_enabled = enabled + + def is_enabled(self): + return self._is_enabled