Add missing HIGHLANDERH_TSS2 ESP & engine f/w (#25066)

* Add missing HIGHLANDERH_TSS2 ESP & engine f/w

`@pkozlowski#5214` 2022 Highlander Hybrid (Poland)  DongleID/route b2e9858e29db492b|2022-07-07--17-57-24

* Fix test_fw_query_on_routes with older routes

Co-authored-by: Shane Smiskol <shane@smiskol.com>
old-commit-hash: 94c8717cac

selfdrive/car/toyota/values.py

@@ -954,11 +954,13 @@ FW_VERSIONS = {
       b'\x01F15264873500\x00\x00\x00\x00',
       b'\x01F152648C6300\x00\x00\x00\x00',
       b'\x01F152648J4000\x00\x00\x00\x00',
+      b'\x01F152648J6000\x00\x00\x00\x00',
     ],
     (Ecu.engine, 0x700, None): [
+      b'\x01896630EE4000\x00\x00\x00\x00',
+      b'\x01896630EE6000\x00\x00\x00\x00',
       b'\x01896630E67000\x00\x00\x00\x00',
       b'\x01896630EA1000\x00\x00\x00\x00',
-      b'\x01896630EE4000\x00\x00\x00\x00',
       b'\x01896630EA1000\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00',
       b'\x02896630E66000\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00',
       b'\x02896630EB3000\x00\x00\x00\x00897CF4801001\x00\x00\x00\x00',

selfdrive/debug/test_fw_query_on_routes.py

@@ -17,6 +17,7 @@ NO_API = "NO_API" in os.environ
 VERSIONS = get_interface_attr('FW_VERSIONS', ignore_none=True)
 SUPPORTED_BRANDS = VERSIONS.keys()
 SUPPORTED_CARS = [brand for brand in SUPPORTED_BRANDS for brand in interface_names[brand]]
+UNKNOWN_BRAND = "unknown"
 
 try:
   from xx.pipeline.c.CarState import migration
@@ -126,10 +127,10 @@ if __name__ == "__main__":
           print("New style (exact):", exact_matches)
           print("New style (fuzzy):", fuzzy_matches)
 
-          padding = max([len(fw.brand) for fw in car_fw])
+          padding = max([len(fw.brand or UNKNOWN_BRAND) for fw in car_fw])
           for version in sorted(car_fw, key=lambda fw: fw.brand):
             subaddr = None if version.subAddress == 0 else hex(version.subAddress)
-            print(f"  Brand: {version.brand:{padding}} - (Ecu.{version.ecu}, {hex(version.address)}, {subaddr}): [{version.fwVersion}],")
+            print(f"  Brand: {version.brand or UNKNOWN_BRAND:{padding}} - (Ecu.{version.ecu}, {hex(version.address)}, {subaddr}): [{version.fwVersion}],")
 
           print("Mismatches")
           found = False