Skip to content

Commit

Permalink
Merge pull request commaai#736 from arne182/release4
Browse files Browse the repository at this point in the history
Sync latest release4 to 077-clean
  • Loading branch information
arne182 authored Nov 23, 2020
2 parents 1446ccf + d3dfefb commit 7f25df7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions installer/updater/update.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ota_url": "https://commadist.azureedge.net/neosupdate/ota-signed-efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a.zip",
"ota_hash": "efdf7de63b1aef63d68301e6175930991bf9a5927d16ec6fcc69287e2ee7ca4a",
"recovery_url": "https://commadist.azureedge.net/neosupdate/recovery-97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e.img",
"recovery_len": 15861036,
"recovery_hash": "97c27e6ed04ed6bb0608b845a2d4100912093f9380c3f2ba6b56bccd608e5f6e"
"ota_url": "https://www.dropbox.com/s/dl/sa6i7iqcwcp7gcx/ota-signed-5c366df88020863525f80f6803afaca9f852854b4b1aef9184189844b7979f0b.zip",
"ota_hash": "5c366df88020863525f80f6803afaca9f852854b4b1aef9184189844b7979f0b",
"recovery_url": "https://www.dropbox.com/s/dl/72w602c7ev4v2a7/recovery-4772f9348e04b560b9df87d6dea6c740fa8d62ea41a8db3842eec216f04e3110.img",
"recovery_len": 15922476,
"recovery_hash": "4772f9348e04b560b9df87d6dea6c740fa8d62ea41a8db3842eec216f04e3110"
}
4 changes: 2 additions & 2 deletions selfdrive/car/honda/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ def update(self, c, can_strings):

# events
events, events_arne182 = self.create_common_events(ret, pcm_enable=False)
if ret.brakePressed:# or (self.CS.CP.openpilotLongitudinalControl and ret.gasPressed):
events.add(EventName.pedalPressed)
#if ret.brakePressed:# or (self.CS.CP.openpilotLongitudinalControl and ret.gasPressed):
# events.add(EventName.pedalPressed)
if self.CS.brake_error:
events.add(EventName.brakeUnavailable)
if self.CS.brake_hold and self.CS.CP.openpilotLongitudinalControl:
Expand Down

0 comments on commit 7f25df7

Please sign in to comment.