bye bye f4 (#2259)

* bye bye f4

* lil more

* fix mac build

* update health idx

python/__init__.py

@@ -116,25 +116,22 @@ class Panda:
   HW_TYPE_UNKNOWN = b'\x00'
   HW_TYPE_WHITE = b'\x01'
   HW_TYPE_BLACK = b'\x03'
-  HW_TYPE_DOS = b'\x06'
   HW_TYPE_RED_PANDA = b'\x07'
   HW_TYPE_TRES = b'\x09'
   HW_TYPE_CUATRO = b'\x0a'
 
   CAN_PACKET_VERSION = 4
-  HEALTH_PACKET_VERSION = 16
+  HEALTH_PACKET_VERSION = 17
   CAN_HEALTH_PACKET_VERSION = 5
-  HEALTH_STRUCT = struct.Struct("<IIIIIIIIBBBBBHBBBHfBBHBHHB")
+  HEALTH_STRUCT = struct.Struct("<IIIIIIIIBBBBBHBBBHfBBHHHB")
   CAN_HEALTH_STRUCT = struct.Struct("<BIBBBBBBBBIIIIIIIHHBBBIIII")
 
-  F4_DEVICES = [HW_TYPE_WHITE, HW_TYPE_BLACK, HW_TYPE_DOS, ]
   H7_DEVICES = [HW_TYPE_RED_PANDA, HW_TYPE_TRES, HW_TYPE_CUATRO]
 
-  INTERNAL_DEVICES = (HW_TYPE_DOS, HW_TYPE_TRES, HW_TYPE_CUATRO)
+  INTERNAL_DEVICES = (HW_TYPE_TRES, HW_TYPE_CUATRO)
   DEPRECATED_DEVICES = (HW_TYPE_WHITE, HW_TYPE_BLACK)
 
   MAX_FAN_RPMs = {
-    HW_TYPE_DOS: 6500,
     HW_TYPE_TRES: 6600,
     HW_TYPE_CUATRO: 12500,
   }
@@ -210,23 +207,6 @@ class Panda:
     if self._handle is None:
       raise Exception("failed to connect to panda")
 
-    # Some fallback logic to determine panda and MCU type for old bootstubs,
-    # since we now support multiple MCUs and need to know which fw to flash.
-    # Three cases to consider:
-    # A) oldest bootstubs don't have any way to distinguish
-    #    MCU or panda type
-    # B) slightly newer (~2 weeks after first C3's built) bootstubs
-    #    have the panda type set in the USB bcdDevice
-    # C) latest bootstubs also implement the endpoint for panda type
-    self._bcd_hw_type = None
-    ret = self._handle.controlRead(Panda.REQUEST_IN, 0xc1, 0, 0, 0x40)
-    missing_hw_type_endpoint = self.bootstub and ret.startswith(b'\xff\x00\xc1\x3e\xde\xad\xd0\x0d')
-    if missing_hw_type_endpoint and bcd is not None:
-      self._bcd_hw_type = bcd
-
-    # For case A, we assume F4 MCU type, since all H7 pandas should be case B at worst
-    self._assume_f4_mcu = (self._bcd_hw_type is None) and missing_hw_type_endpoint
-
     self._serial = serial
     self._connect_serial = serial
     self._handle_open = True
@@ -575,10 +555,9 @@ class Panda:
       "fan_power": a[19],
       "safety_rx_checks_invalid": a[20],
       "spi_error_count": a[21],
-      "fan_stall_count": a[22],
-      "sbu1_voltage_mV": a[23],
-      "sbu2_voltage_mV": a[24],
-      "som_reset_triggered": a[25],
+      "sbu1_voltage_mV": a[22],
+      "sbu2_voltage_mV": a[23],
+      "som_reset_triggered": a[24],
     }
 
   @ensure_can_health_packet_version
@@ -641,13 +620,7 @@ class Panda:
     return bytes(part_1 + part_2)
 
   def get_type(self):
-    ret = self._handle.controlRead(Panda.REQUEST_IN, 0xc1, 0, 0, 0x40)
-
-    # old bootstubs don't implement this endpoint, see comment in Panda.device
-    if self._bcd_hw_type is not None and (ret is None or len(ret) != 1):
-      ret = self._bcd_hw_type
-
-    return ret
+    return self._handle.controlRead(Panda.REQUEST_IN, 0xc1, 0, 0, 0x40)
 
   # Returns tuple with health packet version and CAN packet/USB packet version
   def get_packets_versions(self):
@@ -660,15 +633,8 @@ class Panda:
 
   def get_mcu_type(self) -> McuType:
     hw_type = self.get_type()
-    if hw_type in Panda.F4_DEVICES:
-      return McuType.F4
-    elif hw_type in Panda.H7_DEVICES:
+    if hw_type in Panda.H7_DEVICES:
       return McuType.H7
-    else:
-      # have to assume F4, see comment in Panda.connect
-      if self._assume_f4_mcu:
-        return McuType.F4
-
     raise ValueError(f"unknown HW type: {hw_type}")
 
   def is_internal(self):

python/constants.py

@@ -24,19 +24,6 @@ class McuConfig(NamedTuple):
     # assume bootstub is in sector 0
     return self.bootstub_address + sum(self.sector_sizes[:i])
 
-F4Config = McuConfig(
-  "STM32F4",
-  0x463,
-  [0x4000 for _ in range(4)] + [0x10000] + [0x20000 for _ in range(11)],
-  16,
-  0x1FFF7A10,
-  0x800,
-  0x1FFF79C0,
-  0x8004000,
-  "panda.bin.signed",
-  0x8000000,
-  "bootstub.panda.bin",
-)
 
 H7Config = McuConfig(
   "STM32H7",
@@ -55,7 +42,6 @@ H7Config = McuConfig(
 
 @enum.unique
 class McuType(enum.Enum):
-  F4 = F4Config
   H7 = H7Config
 
   @property

python/dfu.py

@@ -97,15 +97,13 @@ class PandaDFU:
     return []
 
   @staticmethod
-  def st_serial_to_dfu_serial(st: str, mcu_type: McuType = McuType.F4):
+  def st_serial_to_dfu_serial(st: str, mcu_type: McuType = McuType.H7):
     if st is None or st == "none":
       return None
     try:
       uid_base = struct.unpack("H" * 6, bytes.fromhex(st))
       if mcu_type == McuType.H7:
         return binascii.hexlify(struct.pack("!HHH", uid_base[1] + uid_base[5], uid_base[0] + uid_base[4], uid_base[3])).upper().decode("utf-8")
-      else:
-        return binascii.hexlify(struct.pack("!HHH", uid_base[1] + uid_base[5], uid_base[0] + uid_base[4] + 0xA, uid_base[3])).upper().decode("utf-8")
     except struct.error:
       return None