Merge branch 'devel' into corolla

dylanl321 · Feb 7, 2019 · e9b434b · e9b434b
2 parents 57c15f6 + 421a6b0
commit e9b434b
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Supported Cars
 | Chevrolet<sup>3</sup>| Malibu 2017              | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
 | Chevrolet<sup>3</sup>| Volt 2017-18             | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
 | Cadillac<sup>3</sup> | ATS 2018                 | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
-| Chrysler             | Pacifica Hybrid 2017     | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | Custom<sup>8</sup>|
+| Chrysler             | Pacifica Hybrid 2017     | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | FCA               |
 | GMC<sup>3</sup>      | Acadia Denali 2018       | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
 | Holden<sup>3</sup>   | Astra 2017               | Adaptive Cruise      | Yes     | Yes            | 0mph             | 7mph           | Custom<sup>7</sup>|
 | Honda                | Accord 2018              | All                  | Yes     | Stock          | 0mph             | 3mph           | Bosch             |
@@ -103,7 +103,6 @@ Supported Cars
 <sup>5</sup>28mph for Camry 4CYL L, 4CYL LE and 4CYL SE which don't have Full-Speed Range Dynamic Radar Cruise Control.  
 <sup>6</sup>Open sourced [Hyundai Giraffe](https://github.com/commaai/neo/tree/master/giraffe/hyundai) is designed for the 2019 Sante Fe; pinout may differ for other Hyundais.  
 <sup>7</sup>Community built Giraffe, find more information [here](https://zoneos.com/shop/).  
-<sup>8</sup>Community built Giraffe, find more information [here](https://github.com/adhintz/openpilot/wiki). Comma official Giraffe coming soon.  
 
 Community Maintained Cars
 ------
@@ -126,7 +125,7 @@ In Progress Cars
   - Only remaining Toyota cars with no port yet are the Avalon and the Sienna.
 - All Hyundai with SmartSense.
 - All Kia with SCC and LKAS.
-- All Chrysler, Jeep, Fiat with Adaprive Cruise Control and LaneSense.
+- All Chrysler, Jeep, Fiat with Adaptive Cruise Control and LaneSense.
 
 How can I add support for my car?
 ------
@@ -161,6 +160,8 @@ Directory structure
         ├── locationd       # Soon to be home of precise location
         ├── logcatd         # Android logcat as a service
         ├── loggerd         # Logger and uploader of car data
+        ├── mapd            # Fetches map data and computes next global path
+        ├── orbd            # Computes ORB features from frames
         ├── proclogd        # Logs information from proc
         ├── sensord         # IMU / GPS interface code
         ├── test            # Car simulator running code through virtual maneuvers

diff --git a/panda/board/pedal/obj/.gitkeep b/panda/board/pedal/obj/.gitkeep
diff --git a/panda/board/pedal.toyota/.gitignore → panda/board/pedal_honda/.gitignore b/panda/board/pedal.toyota/.gitignore → panda/board/pedal_honda/.gitignore
diff --git a/panda/board/pedal.toyota/Makefile → panda/board/pedal_honda/Makefile b/panda/board/pedal.toyota/Makefile → panda/board/pedal_honda/Makefile
diff --git a/panda/board/pedal/README → panda/board/pedal_honda/README b/panda/board/pedal/README → panda/board/pedal_honda/README
diff --git a/panda/board/pedal/main.c → panda/board/pedal_honda/main.c b/panda/board/pedal/main.c → panda/board/pedal_honda/main.c
diff --git a/panda/board/pedal/.gitignore → panda/board/pedal_toyota/.gitignore b/panda/board/pedal/.gitignore → panda/board/pedal_toyota/.gitignore
diff --git a/panda/board/pedal/Makefile → panda/board/pedal_toyota/Makefile b/panda/board/pedal/Makefile → panda/board/pedal_toyota/Makefile
diff --git a/panda/board/pedal.toyota/README → panda/board/pedal_toyota/README b/panda/board/pedal.toyota/README → panda/board/pedal_toyota/README
diff --git a/panda/board/pedal.toyota/main.c → panda/board/pedal_toyota/main.c b/panda/board/pedal.toyota/main.c → panda/board/pedal_toyota/main.c
diff --git a/phonelibs/snpe/lib/.gitattributes b/phonelibs/snpe/lib/.gitattributes
diff --git a/phonelibs/snpe/lib/libSNPE.so b/phonelibs/snpe/lib/libSNPE.so
diff --git a/phonelibs/snpe/lib/libSNPE_G.so b/phonelibs/snpe/lib/libSNPE_G.so
diff --git a/phonelibs/snpe/lib/libc++_shared.so b/phonelibs/snpe/lib/libc++_shared.so
diff --git a/phonelibs/snpe/lib/libsnpe_adsp.so b/phonelibs/snpe/lib/libsnpe_adsp.so
diff --git a/phonelibs/snpe/lib/libsnpe_dsp_domains.so b/phonelibs/snpe/lib/libsnpe_dsp_domains.so
diff --git a/phonelibs/snpe/lib/libsnpe_dsp_domains_system.so b/phonelibs/snpe/lib/libsnpe_dsp_domains_system.so
diff --git a/phonelibs/snpe/lib/libsnpe_dsp_domains_v2.so b/phonelibs/snpe/lib/libsnpe_dsp_domains_v2.so
diff --git a/phonelibs/snpe/lib/libsymphony-cpu.so b/phonelibs/snpe/lib/libsymphony-cpu.so
diff --git a/phonelibs/snpe/lib/libsymphonypower.so b/phonelibs/snpe/lib/libsymphonypower.so
diff --git a/selfdrive/car/chrysler/chryslercan.py b/selfdrive/car/chrysler/chryslercan.py
@@ -55,7 +55,7 @@ def create_lkas_hud(gear, lkas_active, hud_alert, car_fingerprint):
   # LKAS_HUD (678) Controls what lane-keeping icon is displayed.
 
   if hud_alert == VisualAlert.steerRequired:
-    msg = msg = '0000000300000000'.decode('hex')
+    msg = '0000000300000000'.decode('hex')
     return make_can_msg(0x2a6, msg)
 
   # TODO: use can packer

diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py
@@ -81,6 +81,8 @@ def get_params(candidate, fingerprint):
 
     if candidate == CAR.JEEP_CHEROKEE:
       ret.wheelbase = 2.91  # in meters
+      ret.steerRatio = 12.7
+      ret.steerActuatorDelay = 0.2  # in seconds
 
     ret.centerToFront = ret.wheelbase * 0.44
 

diff --git a/selfdrive/car/honda/carstate.py b/selfdrive/car/honda/carstate.py
@@ -314,7 +314,11 @@ def update(self, cp, cp_cam):
     self.user_brake = cp.vl["VSA_STATUS"]['USER_BRAKE']
     self.pcm_acc_status = cp.vl["POWERTRAIN_DATA"]['ACC_STATUS']
     self.hud_lead = cp.vl["ACC_HUD"]['HUD_LEAD']
-
+
+    # gets rid of Pedal Grinding noise when brake is pressed at slow speeds for some models
+    if self.CP.carFingerprint in (CAR.PILOT, CAR.PILOT_2019, CAR.RIDGELINE):
+      if self.user_brake > 0.05:
+        self.brake_pressed = 1
 
 # carstate standalone tester
 if __name__ == '__main__':