From 1a26eb8cf22b9a0146cd269bcc69b59eea442c81 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 16 Mar 2022 21:21:43 +0800 Subject: [PATCH] coredevice: only print version mismatch warning when relevant --- artiq/coredevice/comm_kernel.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/artiq/coredevice/comm_kernel.py b/artiq/coredevice/comm_kernel.py index e6551cb0a..0b5dd84b7 100644 --- a/artiq/coredevice/comm_kernel.py +++ b/artiq/coredevice/comm_kernel.py @@ -171,6 +171,16 @@ class CommKernelDummy: 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: warned_of_mismatch = False @@ -347,7 +357,7 @@ class CommKernel: runtime_id = self._read(4) if runtime_id == b"AROR": 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) " "and software (%s) versions", gateware_version, software_version)