srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

coredevice: only print version mismatch warning when relevant

This commit is contained in:
Sebastien Bourdeauducq 2022-03-16 21:21:43 +08:00
parent c1c2d21ba7
commit 1a26eb8cf2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/coredevice/comm_kernel.py
View File

@ -171,6 +171,16 @@ class CommKernelDummy:
pass pass
def incompatible_versions(v1, v2):
if v1.endswith(".beta") or v2.endswith(".beta"):
# Beta branches may introduce breaking changes. Check version strictly.
return v1 != v2
else:
# On stable branches, runtime/software protocol backward compatibility is kept.
# Runtime and software with the same major version number are compatible.
return v1.split(".", maxsplit=1)[0] != v2.split(".", maxsplit=1)[0]
class CommKernel: class CommKernel:
warned_of_mismatch = False warned_of_mismatch = False
@ -347,7 +357,7 @@ class CommKernel:
runtime_id = self._read(4) runtime_id = self._read(4)
if runtime_id == b"AROR": if runtime_id == b"AROR":
gateware_version = self._read_string().split(";")[0] gateware_version = self._read_string().split(";")[0]
if gateware_version != software_version and not self.warned_of_mismatch: if not self.warned_of_mismatch and incompatible_versions(gateware_version, software_version):
logger.warning("Mismatch between gateware (%s) " logger.warning("Mismatch between gateware (%s) "
"and software (%s) versions", "and software (%s) versions",
gateware_version, software_version) gateware_version, software_version)