mirror of
https://github.com/infiniteCable2/openpilot.git
synced 2026-08-05 00:05:57 +08:00
modem.py: normalize padded ICCIDs (#38021)
modem: normalize padded ICCIDs
This commit is contained in:
@@ -308,7 +308,7 @@ class Modem:
|
|||||||
if not (imei.isdigit() and 14 <= len(imei) <= 17): # 3GPP TS 23.003
|
if not (imei.isdigit() and 14 <= len(imei) <= 17): # 3GPP TS 23.003
|
||||||
imei = ""
|
imei = ""
|
||||||
|
|
||||||
iccid = self._atv("AT+QCCID", "+QCCID:") or ""
|
iccid = (self._atv("AT+QCCID", "+QCCID:") or "").rstrip("F")
|
||||||
if not iccid.isdigit():
|
if not iccid.isdigit():
|
||||||
iccid = ""
|
iccid = ""
|
||||||
|
|
||||||
@@ -387,7 +387,7 @@ class Modem:
|
|||||||
def _check_iccid(self, state):
|
def _check_iccid(self, state):
|
||||||
if state in (State.INITIALIZING, State.DISCONNECTING) or not self.S["iccid"]:
|
if state in (State.INITIALIZING, State.DISCONNECTING) or not self.S["iccid"]:
|
||||||
return
|
return
|
||||||
iccid = self._atv("AT+QCCID", "+QCCID:")
|
iccid = (self._atv("AT+QCCID", "+QCCID:") or "").rstrip("F")
|
||||||
if iccid and iccid != self.S["iccid"]:
|
if iccid and iccid != self.S["iccid"]:
|
||||||
logging.warning(f"iccid changed: {self.S['iccid']} -> {iccid}")
|
logging.warning(f"iccid changed: {self.S['iccid']} -> {iccid}")
|
||||||
self._sim_change = True
|
self._sim_change = True
|
||||||
|
|||||||
Reference in New Issue
Block a user