Limits -> to-upstream (#11)

* remove logging from devel * Revert "remove logging from devel" This reverts commit 2145747. * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * 0.5.7 & Jeep Grand Cherokee 2017 support (#7) * GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee * separate fingerprint for trailhawk. separate wheelbase for Cherokee (#8) * GM: remove refactor leftovers (commaai#440) * Move calibration values (commaai#441) * initial commit * moved constants * Keep steering on radar fault (commaai#442) * Add initial support for Holden/Opel Astra BK (commaai#431) * Added Astra support to README and RELEASE notes (commaai#443) * Honda Nidec: avoid giraffe setting alert when car is turned off (commaai#449) * Adding support for 2018 GMC Acadia Denali (commaai#453) * added acadia * adding acadia * adding acadia * Update radar_interface.py * adding acadia * refactored * fixed tuning * Adding acadia * Update interface.py * fixed whitespace * fixed whitespace * ACC cancel button * GM: Cadillac ATS Coupe 2018 support (commaai#445) * GM: Cadillac ATS Coupe 2018 support * Missed adding Cadillac ATS * Fixed Capitalization + Made CT6 Comment Cleaner (commaai#456) * Update README.md * Updated CT6 comment * Add Lexus RX450HL as sub to RX450H (commaai#458) Add Lexus RX450HL as sub to RX450H * on gas pedal press, send cancel ACC button to cancel OpenPilot * try sending +1 counter so our message isn't a duplicate * only do the accel pedal for specific cars * do accel pedal for all models * try always sending 1 for cancel acc frame * clean up comments and remove unused moving_fast * remove unused make can msg parameters * try incrementing wheel button counter by 2 to see if that works better for cancel * Squashed 'opendbc/' changes from 3f6cd74..e108b6b e108b6b Add more Sign recognitions (commaai#126) 6e8a363 Add GM FCW Alert (Take 2) (commaai#125) 368701a Revert "Add GM FCW dashboard alert (commaai#123)" (commaai#124) 98b5f66 Add GM FCW dashboard alert (commaai#123) 71b7588 Adds dbc for 2019 Honda Insight (commaai#122) git-subtree-dir: opendbc git-subtree-split: e108b6b * Squashed 'pyextra/' changes from fb152de..8cc1594 8cc1594 update overpy 2c18997 switch to forked version of overpy git-subtree-dir: pyextra git-subtree-split: 8cc1594238fcae6acb8bcd825ac73bbca586b1be * openpilot v0.5.7 release * try to simplify message logic * clean up code * move Chrylser into main table in readme * 0.5.7 hotfixes * On pedal press, if in steer error state, do not send ACC cancel button message. Sending the ACC cancel button message in this state causes the car to display warnings. * set the new ret.openpilotLongitudinalControl = False * hotfix: wait longer in CDP mode before switching to fast charge, so EON can boot (commaai#469) * generalize jeep fingerprint to also cover 2017 Jeep Grand Cherokee Trailhawk * disable pedal_gas for now to do a devel release. Sending 23b might fault other cars. * add jeep grand cherokee 2017 to readme car list * separate fingerprint for trailhawk. separate wheelbase for Cherokee * add fingerprint for Pacifica 2019 Hybrid.
adhintz · Dec 29, 2018 · 0d97f2e · 0d97f2e
1 parent 9442c34
commit 0d97f2e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ Supported Cars
 | Hyundai              | Santa Fe 2019            | All                  | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
 | Hyundai              | Elantra 2017             | SCC + LKAS           | Yes     | Stock          | 19mph            | 34mph          | Custom<sup>6</sup>|
 | Hyundai              | Genesis 2018             | All                  | Yes     | Stock          | 19mph            | 34mph          | Custom<sup>6</sup>|
-| Jeep                 | Grand Cherokee 2018      | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | Custom<sup>8</sup>|
+| Jeep                 | Grand Cherokee 2017-18   | Adaptive Cruise      | Yes     | Stock          | 0mph             | 9mph           | Custom<sup>8</sup>|
 | Kia                  | Sorento 2018             | All                  | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
 | Kia                  | Stinger 2018             | SCC + LKAS           | Yes     | Stock          | 0mph             | 0mph           | Custom<sup>6</sup>|
 | Lexus                | RX Hybrid 2016-18        | All                  | Yes     | Yes<sup>2</sup>| 0mph             | 0mph           | Toyota            |

diff --git a/panda/VERSION b/panda/VERSION
@@ -1 +1 @@
-v1.1.7
+v1.1.8
diff --git a/panda/board/main.c b/panda/board/main.c
@@ -589,6 +589,8 @@ int main() {
     uint64_t marker = 0;
     #define CURRENT_THRESHOLD 0xF00
     #define CLICKS 8
+    // Enough clicks to ensure that enumeration happened. Should be longer than bootup time of the device connected to EON
+    #define CLICKS_BOOTUP 30
   #endif
 
   for (cnt=0;;cnt++) {
@@ -615,8 +617,8 @@ int main() {
           }
           break;
         case USB_POWER_CDP:
-          // been CLICKS clicks since we switched to CDP
-          if ((cnt-marker) >= CLICKS) {
+          // been CLICKS_BOOTUP clicks since we switched to CDP
+          if ((cnt-marker) >= CLICKS_BOOTUP ) {
             // measure current draw, if positive and no enumeration, switch to DCP
             if (!is_enumerated && current < CURRENT_THRESHOLD) {
               puts("USBP: no enumeration with current draw, switching to DCP mode\n");

diff --git a/selfdrive/car/chrysler/carstate.py b/selfdrive/car/chrysler/carstate.py
@@ -101,7 +101,8 @@ def update(self, cp):
     self.seatbelt = (cp.vl["SEATBELT_STATUS"]['SEATBELT_DRIVER_UNLATCHED'] == 0)
 
     self.brake_pressed = cp.vl["BRAKE_2"]['BRAKE_PRESSED_2'] == 5 # human-only
-    self.pedal_gas = cp.vl["ACCEL_PEDAL_MSG"]['ACCEL_PEDAL']
+    self.pedal_gas = 0  # TODO disabled until we test that sending 23b doesn't fault any other cars.
+    # self.pedal_gas = cp.vl["ACCEL_PEDAL_MSG"]['ACCEL_PEDAL']
     self.car_gas = self.pedal_gas
     self.esp_disabled = (cp.vl["TRACTION_BUTTON"]['TRACTION_OFF'] == 1)
 

diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py
@@ -80,6 +80,9 @@ def get_params(candidate, fingerprint):
     ret.steerActuatorDelay = 0.1
     ret.steerRateCost = 1.
 
+    if candidate == CAR.CHEROKEE:
+      ret.wheelbase = 2.91  # in meters
+
     ret.centerToFront = ret.wheelbase * 0.44
 
     ret.longPidDeadzoneBP = [0., 9.]

diff --git a/selfdrive/car/chrysler/values.py b/selfdrive/car/chrysler/values.py
@@ -2,15 +2,20 @@
 
 class CAR:
   PACIFICA_2017_HYBRID = "CHRYSLER PACIFICA HYBRID 2017"
-  PACIFICA_2018_HYBRID = "CHRYSLER PACIFICA HYBRID 2018"
+  PACIFICA_2018_HYBRID = "CHRYSLER PACIFICA HYBRID 2018"  # Also covers Pacifica 2019 Hybrid.
   PACIFICA_2018 = "CHRYSLER PACIFICA 2018"
-  CHEROKEE = "GRAND CHEROKEE V6 2018"
+  CHEROKEE = "GRAND CHEROKEE V6 2018"  # Also covers Tailhawk 2017.
 
 # Unique can messages:
 # Only the hybrids have 270: 8
-# Only the gas have 55: 8, 416: 7, 752: 2
-# For 564, Pacifica 2017 has length 4, whereas Pacifica 2018 has length 8.
-# For 924, Pacifica 2017 has length 3, whereas all 2018 have length 8.
+# Only the gas have 55: 8, 416: 7
+# For 564, Pacifica 2017 has length 4, whereas Pacifica 2018-19 have length 8.
+# For 924, Pacifica 2017 has length 3, whereas all 2018-19 have length 8.
+# For 560, Pacifica 2019 Hybrid has length 8, whereas all 2017-18 have length 4.
+
+# Jeep Grand Cherokee unique messages:
+# 2017 Trailhawk: 618: 8
+# For 924, Trailhawk 2017 has length 3, whereas 2018 V6 has length 8.
 
 FINGERPRINTS = {
   CAR.PACIFICA_2017_HYBRID: [
@@ -22,11 +27,16 @@ class CAR:
   ],
   CAR.PACIFICA_2018_HYBRID: [
     {68: 8, 257: 5, 258: 8, 264: 8, 268: 8, 270: 8, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 291: 8, 292: 8, 294: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 368: 8, 376: 3, 384: 8, 388: 4, 448: 6, 456: 4, 464: 8, 469: 8, 480: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 528: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 8, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 653: 8, 654: 8, 655: 8, 660: 8, 669: 3, 671: 8, 672: 8, 680: 8, 701: 8, 704: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 736: 8, 737: 8, 746: 5, 760: 8, 764: 8, 766: 8, 770: 8, 773: 8, 779: 8, 782: 8, 784: 8, 792: 8, 799: 8, 800: 8, 804: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 832: 8, 838: 2, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 878: 8, 882: 8, 897: 8, 908: 8, 924: 8, 926: 3, 929: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 958: 8, 959: 8, 969: 4, 974: 5, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1082: 8, 1083: 8, 1098: 8, 1100: 8},
-    {168: 8, 257: 5, 258: 8, 264: 8, 268: 8, 270: 8, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 291: 8, 292: 8, 294: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 368: 8, 376: 3, 384: 8, 388: 4, 448: 6, 456: 4, 464: 8, 469: 8, 480: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 528: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 8, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 653: 8, 654: 8, 655: 8, 660: 8, 669: 3, 671: 8, 672: 8, 680: 8, 701: 8, 704: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 736: 8, 737: 8, 746: 5, 760: 8, 764: 8, 766: 8, 770: 8, 773: 8, 779: 8, 782: 8, 784: 8, 792: 8, 799: 8, 800: 8, 804: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 832: 8, 838: 2, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 878: 8, 882: 8, 897: 8, 908: 8, 924: 8, 926: 3, 929: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 958: 8, 959: 8, 969: 4, 974: 5, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1082: 8, 1083: 8, 1098: 8, 1100: 8}
+    {168: 8, 257: 5, 258: 8, 264: 8, 268: 8, 270: 8, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 291: 8, 292: 8, 294: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 368: 8, 376: 3, 384: 8, 388: 4, 448: 6, 456: 4, 464: 8, 469: 8, 480: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 528: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 8, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 653: 8, 654: 8, 655: 8, 660: 8, 669: 3, 671: 8, 672: 8, 680: 8, 701: 8, 704: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 736: 8, 737: 8, 746: 5, 760: 8, 764: 8, 766: 8, 770: 8, 773: 8, 779: 8, 782: 8, 784: 8, 792: 8, 799: 8, 800: 8, 804: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 832: 8, 838: 2, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 878: 8, 882: 8, 897: 8, 908: 8, 924: 8, 926: 3, 929: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 958: 8, 959: 8, 969: 4, 974: 5, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1082: 8, 1083: 8, 1098: 8, 1100: 8},
+    # Pacifica 2019 Hybrid
+    { 168: 8, 257: 5, 258: 8, 264: 8, 268: 8, 270: 8, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 291: 8, 292: 8, 294: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 368: 8, 376: 3, 384: 8, 388: 4, 448: 6, 456: 4, 464: 8, 469: 8, 480: 8, 500: 8, 501: 8, 512: 8, 514: 8, 515: 7, 516: 7, 517: 7, 518: 7, 520: 8, 528: 8, 532: 8, 542: 8, 544: 8, 557: 8, 559: 8, 560: 8, 564: 8, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 653: 8, 654: 8, 655: 8, 660: 8, 669: 3, 671: 8, 672: 8, 680: 8, 701: 8, 703: 8, 704: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 736: 8, 737: 8, 746: 5, 752: 2, 754: 8, 760: 8, 764: 8, 766: 8, 770:8, 773: 8, 779: 8, 782: 8, 784: 8, 792: 8, 799: 8, 800: 8, 804: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 832: 8, 838: 2, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 878: 8, 882: 8, 897: 8, 906: 8, 908: 8, 924: 8, 926: 3, 929: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 958: 8, 959: 8, 962: 8, 969: 4, 973: 8, 974: 5, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1082: 8, 1083: 8, 1098: 8, 1100: 8, 1538: 8}
+  ],
+  CAR.CHEROKEE: [
+    # GRAND CHEROKEE V6 2018
+    {55: 8, 168: 8, 181: 8, 256: 4, 257: 5, 258: 8, 264: 8, 268: 8, 272: 6, 273: 6, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 292: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 352: 8, 362: 8, 368: 8, 376: 3, 384: 8, 388: 4, 416: 7, 448: 6, 456: 4, 464: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 4, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 656: 4, 658: 6, 660: 8, 671: 8, 672: 8, 676: 8, 678: 8, 680: 8, 683: 8, 684: 8, 703: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 729: 5, 736: 8, 737: 8, 738: 8, 746: 5, 752: 2, 754: 8, 760: 8, 761: 8, 764: 8, 766: 8, 773: 8, 776: 8, 779: 8, 782: 8, 783: 8, 784: 8, 785: 8, 788: 3, 792: 8, 799: 8, 800: 8, 804: 8, 806: 2, 808: 8, 810: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 831: 6, 832: 8, 838: 2, 844: 5, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 882: 8, 897: 8, 906: 8, 924: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 968: 8, 969: 4, 970: 8, 973: 8, 974: 5, 976: 8, 977: 4, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1062: 8, 1098: 8, 1100: 8},
+    # Jeep Grand Cherokee 2017 Trailhawk
+    {257: 5, 258: 8, 264: 8, 268: 8, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 292: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 352: 8, 362: 8, 368: 8, 376: 3, 384: 8, 388: 4, 416: 7, 448: 6, 456: 4, 464: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 4, 571: 3, 584: 8, 608: 8, 618: 8, 624: 8, 625: 8, 632: 8, 639: 8, 660: 8, 671: 8, 672: 8, 680: 8, 684: 8, 703: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 736: 8, 737: 8, 746: 5, 752: 2, 760: 8, 761: 8, 764: 8, 766: 8, 773: 8, 776: 8, 779: 8, 783: 8, 784: 8, 792: 8, 799: 8, 800: 8, 804: 8, 806: 2, 808: 8, 810: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 831: 6, 832: 8, 838: 2, 844: 5, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 882: 8, 897: 8, 924: 3, 937: 8, 947: 8, 948: 8, 969: 4, 974: 5, 977: 4, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1062: 8, 1098: 8, 1100: 8}
   ],
-  CAR.CHEROKEE: [{
-    55: 8, 168: 8, 181: 8, 256: 4, 257: 5, 258: 8, 264: 8, 268: 8, 272: 6, 273: 6, 274: 2, 280: 8, 284: 8, 288: 7, 290: 6, 292: 8, 300: 8, 308: 8, 320: 8, 324: 8, 331: 8, 332: 8, 344: 8, 352: 8, 362: 8, 368: 8, 376: 3, 384: 8, 388: 4, 416: 7, 448: 6, 456: 4, 464: 8, 500: 8, 501: 8, 512: 8, 514: 8, 520: 8, 532: 8, 544: 8, 557: 8, 559: 8, 560: 4, 564: 4, 571: 3, 579: 8, 584: 8, 608: 8, 624: 8, 625: 8, 632: 8, 639: 8, 656: 4, 658: 6, 660: 8, 671: 8, 672: 8, 676: 8, 678: 8, 680: 8, 683: 8, 684: 8, 703: 8, 705: 8, 706: 8, 709: 8, 710: 8, 719: 8, 720: 6, 729: 5, 736: 8, 737: 8, 738: 8, 746: 5, 752: 2, 754: 8, 760: 8, 761: 8, 764: 8, 766: 8, 773: 8, 776: 8, 779: 8, 782: 8, 783: 8, 784: 8, 785: 8, 788: 3, 792: 8, 799: 8, 800: 8, 804: 8, 806: 2, 808: 8, 810: 8, 816: 8, 817: 8, 820: 8, 825: 2, 826: 8, 831: 6, 832: 8, 838: 2, 844: 5, 848: 8, 853: 8, 856: 4, 860: 6, 863: 8, 882: 8, 897: 8, 906: 8, 924: 8, 937: 8, 938: 8, 939: 8, 940: 8, 941: 8, 942: 8, 943: 8, 947: 8, 948: 8, 968: 8, 969: 4, 970: 8, 973: 8, 974: 5, 976: 8, 977: 4, 979: 8, 980: 8, 981: 8, 982: 8, 983: 8, 984: 8, 992: 8, 993: 7, 995: 8, 996: 8, 1000: 8, 1001: 8, 1002: 8, 1003: 8, 1008: 8, 1009: 8, 1010: 8, 1011: 8, 1012: 8, 1013: 8, 1014: 8, 1015: 8, 1024: 8, 1025: 8, 1026: 8, 1031: 8, 1033: 8, 1050: 8, 1059: 8, 1062: 8, 1098: 8, 1100: 8
-  }],    
 }