openpilot v0.4.6 release

old-commit-hash: c6df34f55b
2026-06-28 01:52:06 +08:00 · 2018-05-23 03:59:04 +00:00
parent a481644949
commit 8fc7b0b828
119 changed files with 535 additions and 389 deletions
@@ -148,7 +148,7 @@ Want to get paid to work on openpilot? [comma.ai is hiring](http://comma.ai/posi
 Licensing
 ------

-openpilot is released under the MIT license.
+openpilot is released under the MIT license. Some parts of the software are released under other licenses as specified.

 Any user of this software shall indemnify and hold harmless Comma.ai, Inc. and its directors, officers, employees, agents, stockholders, affiliates, subcontractors and customers from and against all allegations, claims, actions, suits, demands, damages, liabilities, obligations, losses, settlements, judgments, costs and expenses (including without limitation attorneys’ fees and costs) which arise out of, relate to or result from any use of this software by user.

@@ -1,3 +1,11 @@
+Version 0.4.6 (2018-05-18)
+==========================
+ * NEOSv6 required! Will autoupdate
+ * Stability improvements
+ * Fix all memory leaks
+ * Update C++ compiler to clang6
+ * Improve front camera exposure
+
 Version 0.4.5 (2018-04-27)
 ==========================
 * Release notes added to the update popup
@@ -57,6 +57,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
    plannerError @32;
    ipasOverride @33;
    debugAlert @34;
+    steerTempUnavailableMute @35;
  }
 }

@@ -330,4 +331,10 @@ struct CarParams {
  stoppingControl @34 :Bool; # Does the car allows full control even at lows speeds when stopping
  startAccel @35 :Float32; # Required acceleraton to overcome creep braking
  steerRateCost @40 :Float32; # Lateral MPC cost on steering rate
+  steerControlType @46 :SteerControlType;
+
+  enum SteerControlType {
+    torque @0;
+    angle @1;
+  }
 }
@@ -17,6 +17,10 @@ class TOYOTA:

 class GM:
  VOLT = "CHEVROLET VOLT PREMIER 2017"
+  CADILLAC_CT6 = "CADILLAC CT6 SUPERCRUISE 2018"
+
+class FORD:
+  FUSION = "FORD FUSION 2018"

 _DEBUG_ADDRESS = {1880: 8}   # reserved for debug purposes

@@ -82,6 +86,12 @@ _FINGERPRINTS = {
  GM.VOLT: [{
    170: 8, 171: 8, 189: 7, 190: 6, 193: 8, 197: 8, 199: 4, 201: 8, 209: 7, 211: 2, 241: 6, 288: 5, 289: 8, 298: 8, 304: 1, 308: 4, 309: 8, 311: 8, 313: 8, 320: 3, 328: 1, 352: 5, 381: 6, 386: 8, 388: 8, 389: 2, 390: 7, 417: 7, 419: 1, 426: 7, 451: 8, 452: 8, 453: 6, 454: 8, 456: 8, 479: 3, 481: 7, 485: 8, 489: 8, 493: 8, 495: 4, 497: 8, 499: 3, 500: 6, 501: 8, 508: 8, 528: 4, 532: 6, 546: 7, 550: 8, 554: 3, 558: 8, 560: 8, 562: 8, 563: 5, 564: 5, 565: 5, 566: 5, 567: 3, 568: 1, 573: 1, 577: 8, 647: 3, 707: 8, 711: 6, 761: 7, 810: 8, 840: 5, 842: 5, 844: 8, 866: 4, 961: 8, 969: 8, 977: 8, 979: 7, 988: 6, 989: 8, 995: 7, 1001: 8, 1005: 6, 1009: 8, 1017: 8, 1019: 2, 1020: 8, 1105: 6, 1187: 4, 1217: 8, 1221: 5, 1223: 3, 1225: 7, 1227: 4, 1233: 8, 1249: 8, 1257: 6, 1265: 8, 1267: 1, 1273: 3, 1275: 3, 1280: 4, 1300: 8, 1322: 6, 1323: 4, 1328: 4, 1417: 8, 1601: 8, 1905: 7, 1906: 7, 1907: 7, 1910: 7, 1912: 7, 1922: 7, 1927: 7, 1928: 7, 2016: 8, 2020: 8, 2024: 8, 2028: 8
  }],
+  GM.CADILLAC_CT6: [{
+    190: 6, 193: 8, 197: 8, 199: 4, 201: 8, 209: 7, 211: 2, 241: 6, 249: 8, 288: 5, 298: 8, 304: 1, 309: 8, 313: 8, 320: 3, 322: 7, 328: 1, 336: 1, 338: 6, 340: 6, 352: 5, 354: 5, 356: 8, 368: 3, 372: 5, 381: 8, 386: 8, 393: 7, 398: 8, 407: 7, 413: 8, 417: 7, 419: 1, 422: 4, 426: 7, 431: 8, 442: 8, 451: 8, 452: 8, 453: 6, 455: 7, 456: 8, 458: 5, 460: 5, 462: 4, 463: 3, 479: 3, 481: 7, 485: 8, 487: 8, 489: 8, 495: 4, 497: 8, 499: 3, 500: 6, 501: 8, 508: 8, 528: 5, 532: 6, 534: 2, 554: 3, 560: 8, 562: 8, 563: 5, 564: 5, 565: 5, 567: 5, 569: 3, 573: 1, 577: 8, 608: 8, 609: 6, 610: 6, 611: 6, 612: 8, 613: 8, 647: 6, 707: 8, 715: 8, 717: 5, 719: 5, 723: 2, 753: 5, 761: 7, 800: 6, 801: 8, 804: 3, 810: 8, 832: 8, 833: 8, 834: 8, 835: 6, 836: 5, 837: 8, 838: 8, 839: 8, 840: 5, 842: 5, 844: 8, 866: 4, 869: 4, 880: 6, 884: 8, 961: 8, 969: 8, 977: 8, 979: 8, 985: 5, 1001: 8, 1005: 6, 1009: 8, 1011: 6, 1013: 1, 1017: 8, 1019: 2, 1020: 8, 1105: 6, 1217: 8, 1221: 5, 1223: 3, 1225: 7, 1233: 8, 1249: 8, 1257: 6, 1259: 8, 1261: 7, 1263: 4, 1265: 8, 1267: 1, 1280: 4, 1296: 4, 1300: 8, 1322: 6, 1417: 8, 1601: 8, 1906: 7, 1907: 7, 1912: 7, 1914: 7, 1918: 7, 1919: 7, 1934: 7, 2016: 8, 2024: 8
+  }],
+  FORD.FUSION: [{
+    71: 8, 74: 8, 75: 8, 76: 8, 90: 8, 92: 8, 93: 8, 118: 8, 119: 8, 120: 8, 125: 8, 129: 8, 130: 8, 131: 8, 132: 8, 133: 8, 145: 8, 146: 8, 357: 8, 359: 8, 360: 8, 361: 8, 376: 8, 390: 8, 391: 8, 392: 8, 394: 8, 512: 8, 514: 8, 516: 8, 531: 8, 532: 8, 534: 8, 535: 8, 560: 8, 578: 8, 604: 8, 613: 8, 673: 8, 827: 8, 848: 8, 934: 8, 935: 8, 936: 8, 947: 8, 963: 8, 970: 8, 972: 8, 973: 8, 984: 8, 992: 8, 994: 8, 997: 8, 998: 8, 1003: 8, 1034: 8, 1045: 8, 1046: 8, 1053: 8, 1054: 8, 1058: 8, 1059: 8, 1068: 8, 1072: 8, 1073: 8, 1082: 8, 1107: 8, 1108: 8, 1109: 8, 1110: 8, 1200: 8, 1427: 8, 1430: 8, 1438: 8, 1459: 8
+  }],
 }

 # support additional internal only fingerprints
@@ -18,7 +18,7 @@ def json_robust_dumps(obj):

 class NiceOrderedDict(OrderedDict):
  def __str__(self):
-    return '{'+', '.join("%r: %r" % p for p in self.iteritems())+'}'
+    return json_robust_dumps(self)

 class SwagFormatter(logging.Formatter):
  def __init__(self, swaglogger):
@@ -62,6 +62,10 @@ class SwagFormatter(logging.Formatter):
  def format(self, record):
    return json_robust_dumps(self.format_dict(record))

+class SwagErrorFilter(logging.Filter):
+  def filter(self, record):
+    return record.levelno < logging.ERROR
+
 _tmpfunc = lambda: 0
 _srcfile = os.path.normcase(_tmpfunc.__code__.co_filename)

@@ -128,15 +132,40 @@ class SwagLogger(logging.Logger):
    if args:
      evt['args'] = args
    evt.update(kwargs)
-    self.info(evt)
+    if 'error' in kwargs:
+      self.error(evt)
+    else:
+      self.info(evt)

 if __name__ == "__main__":
  log = SwagLogger()

+  stdout_handler = logging.StreamHandler(sys.stdout)
+  stdout_handler.setLevel(logging.INFO)
+  stdout_handler.addFilter(SwagErrorFilter())
+  log.addHandler(stdout_handler)
+
+  stderr_handler = logging.StreamHandler(sys.stderr)
+  stderr_handler.setLevel(logging.ERROR)
+  log.addHandler(stderr_handler)
+
  log.info("asdasd %s", "a")
  log.info({'wut': 1})
+  log.warning("warning")
+  log.error("error")
+  log.critical("critical")
+  log.event("test", x="y")

  with log.ctx():
+    stdout_handler.setFormatter(SwagFormatter(log))
+    stderr_handler.setFormatter(SwagFormatter(log))
    log.bind(user="some user")
    log.info("in req")
-    log.event("do_req")
+    print("")
+    log.warning("warning")
+    print("")
+    log.error("error")
+    print("")
+    log.critical("critical")
+    print("")
+    log.event("do_req", a=1, b="c")
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1817dfc1a36226c1f2ffa56080c1488cb8e2dd83b2732c50f73f7e63302f2112
+size 2500744
@@ -22,18 +22,6 @@ function launch {
  echo 0-3 > /dev/cpuset/foreground/cpus
  echo 0-3 > /dev/cpuset/android/cpus

-  # check if NEOS update is required
-  while [ "$(cat /VERSION)" -lt 4 ] && [ ! -e /data/media/0/noupdate ]; do
-    # wait for network
-    (cd selfdrive/ui/spinner && exec ./spinner 'waiting for network...') & spin_pid=$!
-    until ping -W 1 -c 1 8.8.8.8; do sleep 1; done
-    kill $spin_pid
-
-    # update NEOS
-    curl -o /tmp/updater https://neos.comma.ai/updater && chmod +x /tmp/updater && /tmp/updater
-    sleep 10
-  done
-
  export PYTHONPATH="$PWD"

  # start manager
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e587ed5f1a993dbd555d4feb52fefbf16f7ed5400513af2b70923d37a09ec7b
+size 1525512
@@ -0,0 +1 @@
+capnp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd881b90aad022217a9bd9fd3edbdea6a4d849b9a4e784125f3a0bf34c5eaccc
+size 1464976
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acd14ceea3fa99e320562186fc150b3942402dd200d0a191c548df24a8b5f226
+size 824160
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64c52189119abd30d20ffad1989a99a6576048d3b5aeb6051cf6c55fd3d62fe0
+size 3376746
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58d733153edbb86b565785e1a29dae5f90816b18bc0d59908c40109f8838961b
+size 7093966
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15365c956d5b90120a65429c0abae5601ef3f26f5c2800751ae3ac0dc5cfb44b
+size 1318656
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0ff4d65e7df901b76fa6417b56d2a878397f977cf2f2547c41560cbc00ad149
+size 34795
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1145a302e778a9bd6e6a34f96a85472818008a1d0fbbdb57d7c0659903ca41f
+size 8513
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb306076cd38c27af1aed20fac6395e9a46fbe5b5df6a248b5f1b6845a079c44
+size 1354
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:01537f9ce3cbc843d6aab018195e02df268b9d16c15e5958cc367c6e47fc1589
+size 848
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:953a999f02ff20c196fc62e60e80a45244d275195a7f956ddd3dbb49ae20f99b
+size 1814
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c86744ebbbb5c8c4d24bb6647d3c938d8672ef2d2c4ad498a7cb6de3d9cbf88
+size 37616
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3529d6562cbc98627d662198d1ea5d8fefb67c1a2f6255c6be9bb16c09bfa04b
+size 26891
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bafe76fab6debe5a33dcf3b397df7be233391d97a6d81dc9ab189948b5f96d0
+size 33921
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4db4d9b9b5595676fc019a866394d48534fc3aca368fa6726293fc29e06d455a
+size 21485
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d469ca634e1431d985c8022d0fe67e7fe79051a2d807d04186211d986a2b1ab
+size 60368
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4535f1c350d8bfb590a1e1b9abd36d843eeadd414d981bf43b7bc23ce43de1c
+size 9394
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:760907776eb6f2726749e53468c54982d8df009e6cec7e64b04f4caf6732987d
+size 11855
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d48f9ac2426974e5877d8ff9d5f6d146aeec105eacccfbe18ccbb044ed7c183
+size 13507
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8aa1ea3348a869f18a9c21e8f63862b9b416de1542b06648a1303f26cc1ca05d
+size 2190
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db08dd4c3450e7428d6a5eec162b51df1fc15cab762596c5960c5a5cc1a4370b
+size 52052
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47c91e34cfb431cec9a2e2422cc693e25eccbce2e6b71aab2815aae4282e463f
+size 20983
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8ba2016719f2bd2d67848347f72ac1fba39b7a414089d1787a64f2a7b55afa4
+size 10900
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:018dc0f00ee97fce180084584f210a4965cc15342fa8e4ed7496ae7be3ffc259
+size 23593
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1d4690b2fce91b7089d98346ef5455ebe6e621cc21760c27ae1c3197294334e
+size 17874
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea0fa94250ff56111f9fcccb2a560be29ff9c7c9068dd4e19705a4af37e257cf
+size 8273
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:250ef0923e0256e7651c9451c5cb79424078677ea84902b13381e3596e7a4cc4
+size 71148
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b963933d154d9114ee6f9cf36b3023f5b99c8d96c078d95bcbdd19e656946d2
+size 6512
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f5427abfa4583dbb0841c275b9852ba2ee20dfb5ef6648c9871b6283adcc580
+size 2051
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d2653f6a2fd04a79d600cfe626880e8bad0062557c9b1baecb1439269538dc9
+size 8912
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f97348f4aa486a38cd1be005f478a8e53601bfa47abf500592c6ef0c12b146df
+size 4897
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0401c91f90ae1283ce040537c88554a34f03491114c1393b535ffbbbe70741e
+size 9716
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a80c2d746de0097a2d6193906d74b52f10587ab94a64830f41e232b33d87de91
+size 21232
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40d54e34d92e3ac1a6ab42a84fbeb8c7020989c994615ecd2d30ac689ccb2c2d
+size 6252
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a20003d7fac60638fa0c16b1001caab7cac6389f1926114d50d5e975448ed12
+size 76462
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71c38f5c4e2b2dad42991286c68e57c2993b3403e497c8f011aaea18e4729a33
+size 185146
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2f5e6fb81e016db2689070c465181c717452b246f6dee9c70c8cd9f2bcc20ee
+size 26602
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6226f1bcee096d3e13d9c2159ffe9695ca27c1a132a1702d84c08ee06e67e482
+size 2038
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:466d1e6a87a86d6ac3b24edb02e095cab2ac0ef36dcdcaddd2cb8bdba9166a33
+size 8681
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fc427bf35d1b4081587017a1172549bc8115fb6717fd801d922a45629867e40
+size 8616
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a8b4277ba9964831af0125e37f238f07a5db588549231b28be0fd4e2219a10e4
+size 16976
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa22dc6f17e5df03c24012d7c4d054e88395f5b88770cf8ef79c3324e5145408
+size 291672
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:261583f20eee704197b3aebd9da00225a7a437f3352ced3db45bfee7f2ecdb99
+size 36242
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2b4777da2f36a2a51f784fcb4f7023679a4ec2272958e69de25e4014c4c4875
+size 2770
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fccc4e53638192db7688def8f4892d4bbcb0518c909dc34ebc3596b13f60b917
+size 5404
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d14d2e00e5b73422e2516256eddbccaa3c4f52aabd4201c5df1702822508893a
+size 3753
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:962a36c62a361b1f2252f8facb89d1290cd7196287e7cdb50a042f7477aa16d5
+size 11669
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e3f65eb614ab0308dabaaeb3fe1907f33feb96fb4aa9d659db08ba7849d4273
+size 8300
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e82ba9225547df2cb1b43e7c6025b3d876c4b5737936942aa17ec80c70451a40
+size 27097
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b6086c88ec56a3f294f6845b2fb493613b424042922c10b3c3f3f9d67f64961
+size 35246
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fedee3753645e2a932d9c40b27bd85b41ce29719e3d67464486a4c02f21afcbc
+size 24313
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b0025cef7a323237540707cd6b74210681f8c599e368a1d735b7ec2e65102d3
+size 6589
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b57458b516e1e2a8ecb139313dffb80ae6ed652388a48af5d3a0f60a1630c59d
+size 12133
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5434475aff2d6c1f25f333bd3324ac375c2fa1ebe9d2ee8aebbd29d757c9a43c
+size 10110
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7f78bbe2b4a8c15734e181af93f0f600d8010da3dd5c0d349cbee6de81c3c13
+size 33142
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c0f8086465f312154d7def64da15cf790b0da847e811f59cc27860c1b35fb5e
+size 51151
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3a3d94ac3206c4ac6e3554efa66d532fc97866cbf219624dd4afd567b9164f7
+size 4582
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce0327b2ab11618d2b302f33e1c937caf8a692f5adeae849cce8faa1e3948832
+size 24896
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c7f8abd1e5b2194de42bc38bf958463dc4dfe51d24464a098e1161a3e7c45b9
+size 23227
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0586183e1044baa98113ad3927e9b44b5b4a4159efec88978b03db2ef059031a
+size 14802
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aff9075eeb57a3646beaee526010541f17bf062ed1a7116e00970d641dc94f91
+size 9236
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f38ef4fc1da744d81f1160a86a9e33dc6ce2506dc6aa511a378fae89ba3757c
+size 15536
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54e56fab508478c4fc043f1880da0e187187845723ec3c252d222f43cb41da80
+size 19767
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dd04feded21ac677cfa8f91aadc76a351832aeb4d8d0e87248be16cbe02b93f
+size 13633
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77b917aab3bb44db463251934a2daccf8dd6474f20e87d4fbf34869513687863
+size 11678
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d81a72d3717c27463b769dd5fc161314035849507faab76d89f0714d388f533
+size 5067
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:178045b2c75b7ccf200e0f2007a1a16e2eba005b03913db412f64a31df197d57
+size 12126
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17a4c71083f75467fa32ec9daeb6bb6fb4888899e598d712abee75f20fc42491
+size 26546
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fda6fb25d8f6d4dd9b8ffc9de0bc62dd5aa9adbbd47f84e8554b79d26dd30fbc
+size 4634
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfd7565b95e0eb3cc8f8306e6f5b21aa0ffd34f14914cb066fafee4677e6990b
+size 2685
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1088bc02dc394cfea38b7205063fb9ac60335bb90061d45f426183a3cc60b04f
+size 8157
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9f8bcdf110c2f1aeb629ad9ba987fc51d6cb2fdbc48d9e3895ad830cbcc406b
+size 21880
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30d2355dc0012ae7ccb6b61271ca893907f722a5d23e1858d5ecb0d6f78dda1e
+size 5532
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e10dd5c854d2e85b1201b8bb974f0effbebf9361b92e719cdce2cf7504fa80d6
+size 2475
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:778e4bffe5e104c2ff1383c4fbad81489e694113295078b7ce9327ee91c15a26
+size 4759
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da50a9f371cf0837af711b9d8131d96d11cd1b5269040a7cf3bc0ceaa7534a26
+size 6652
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3292c28e17721868e1caa1ca9b6694aa2e105efbc44dec51a101f34e357b1ae
+size 15713
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31ba4f0ddbf586003f98ecfe9e198afab8a20b22566e00b321dcb8c6c22519f2
+size 45634
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea68079d96d8e0bab678426caadcc078975dc9f2221d241419516418638e0c68
+size 4688
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c4dd9c5cdcf3e0affe9bd3ea2cbe1d4a7e3214c99482eade5564a27d86e6e53
+size 1604
@@ -2,7 +2,7 @@ Cython==0.24.1
 bitstring==3.1.5
 fastcluster==1.1.21
 libusb1==1.5.0
-pycapnp==0.5.9
+pycapnp==0.6.3
 pyzmq==15.4.0
 raven==5.23.0
 requests==2.10.0
@@ -16,3 +16,4 @@ filterpy==1.0.0
 smbus2==0.2.0
 pyflakes==1.5.0
 -e git+https://github.com/commaai/le_python.git#egg=Logentries
+Flask==1.0.1
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78d140abe572b00765a7ece46bd990cff1287c2e8705a5f551b74461ab307b6b
+size 15713
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49e9bad844598b0aa13c75fad7685f89f7ab190932963a8c70014553b9da37ae
+size 41523
@@ -37,6 +37,7 @@
 #define SAFETY_ELM327 0xE327
 #define SAFETY_GM 3
 #define SAFETY_HONDA_BOSCH 4
+#define SAFETY_FORD 5
 #define SAFETY_TOYOTA_NOLIMITS 0x1336
 #define SAFETY_ALLOUTPUT 0x1337

@@ -105,6 +106,9 @@ void *safety_setter_thread(void *s) {
  case (int)cereal::CarParams::SafetyModels::HONDA_BOSCH:
    safety_setting = SAFETY_HONDA_BOSCH;
    break;
+  case (int)cereal::CarParams::SafetyModels::FORD:
+    safety_setting = SAFETY_FORD;
+    break;
  default:
    LOGE("unknown safety model: %d", safety_model);
  }
@@ -28,6 +28,7 @@ else ifeq ($(UNAME_M),x86_64)
 else ifeq ($(UNAME_M),aarch64)
 	ZMQ_FLAGS = -I$(PHONELIBS)/zmq/aarch64/include
 	ZMQ_LIBS = -L$(PHONELIBS)/zmq/aarch64/lib -l:libzmq.a
+	CXXFLAGS += -lgnustl_shared
 endif

 OPENDBC_PATH := $(shell python -c 'import opendbc; print opendbc.DBC_PATH')
@@ -5,7 +5,7 @@ from common.fingerprints import eliminate_incompatible_cars, all_known_cars

 from selfdrive.swaglog import cloudlog
 import selfdrive.messaging as messaging
-from common.fingerprints import HONDA, TOYOTA, GM
+from common.fingerprints import HONDA, TOYOTA, GM, FORD

 def load_interfaces(x):
  ret = {}
@@ -22,7 +22,8 @@ def load_interfaces(x):
 interfaces = load_interfaces({
  'honda': [HONDA.CIVIC, HONDA.ACURA_ILX, HONDA.CRV, HONDA.ODYSSEY, HONDA.ACURA_RDX, HONDA.PILOT, HONDA.RIDGELINE],
  'toyota': [TOYOTA.PRIUS, TOYOTA.RAV4, TOYOTA.RAV4H, TOYOTA.COROLLA, TOYOTA.LEXUS_RXH],
-  'gm': [GM.VOLT],
+  'gm': [GM.VOLT, GM.CADILLAC_CT6],
+  'ford': [FORD.FUSION],
  'simulator2': ['simulator2'],
  'mock': ['mock']})

@@ -257,6 +257,7 @@ class CarInterface(object):
      raise ValueError("unsupported car %s" % candidate)

    ret.steerKf = 0. # TODO: investigate FF steer control for Honda
+    ret.steerControlType = car.CarParams.SteerControlType.torque

    # min speed to enable ACC. if car can do stop and go, then set enabling speed
    # to a negative value, so it won't matter. Otherwise, add 0.5 mph margin to not
@@ -67,6 +67,7 @@ def process_hud_alert(hud_alert, audible_alert):

  return steer, fcw, sound1, sound2

+
 def ipas_state_transition(steer_angle_enabled, enabled, ipas_active, ipas_reset_counter):

  if enabled and not steer_angle_enabled:
@@ -136,6 +136,7 @@ class CarInterface(object):

    # no rear steering, at least on the listed cars above
    ret.steerRatioRear = 0.
+    ret.steerControlType = car.CarParams.SteerControlType.torque

    # steer, gas, brake limitations VS speed
    ret.steerMaxBP = [16. * CV.KPH_TO_MS, 45. * CV.KPH_TO_MS]  # breakpoints at 1 and 40 kph
@@ -89,9 +89,9 @@ int touch_poll(TouchState *s, int* out_x, int* out_y) {
    }
  }
  if (up) {
-    // adjust for landscape
-    *out_x = 1920 - s->last_y;
-    *out_y = s->last_x;
+    // adjust for flippening
+    *out_x = s->last_y;
+    *out_y = 1080 - s->last_x;
  }
  return up;
 }
@@ -1 +1 @@
-#define COMMA_VERSION "0.4.5.1-release"
+#define COMMA_VERSION "0.4.6-release"
@@ -88,6 +88,12 @@ class AlertManager(object):
        AlertStatus.userPrompt, AlertSize.mid,
        Priority.LOW, "steerRequired", "chimeDouble", .4, 2., 3.),

+    "steerTempUnavailableMute": Alert(
+        "TAKE CONTROL",
+        "Steering Temporarily Unavailable",
+        AlertStatus.userPrompt, AlertSize.mid,
+        Priority.LOW, None, None, .2, .2, .2),
+
    "preDriverDistracted": Alert(
        "TAKE CONTROL",
        "User Appears Distracted",
@@ -124,6 +130,12 @@ class AlertManager(object):
        AlertStatus.userPrompt, AlertSize.mid,
        Priority.LOW, None, None, 0., 0., .2),

+    "debugAlert": Alert( 
+        "DEBUG ALERT", 
+        "", 
+        AlertStatus.userPrompt, AlertSize.mid, 
+        Priority.LOW, None, None, .1, .1, .1), 
+
    # Non-entry only alerts
    "wrongCarModeNoEntry": Alert(
        "openpilot Unavailable",
--- a/Show More
+++ b/Show More