diff -r 4d72243909ff -r 06ef28082c4d src/eric7/MicroPython/Devices/RP2040Devices.py
--- a/src/eric7/MicroPython/Devices/RP2040Devices.py Fri Feb 17 10:46:26 2023 +0100
+++ b/src/eric7/MicroPython/Devices/RP2040Devices.py Fri Feb 17 10:56:05 2023 +0100
@@ -204,7 +204,7 @@
),
)
else:
- if self._deviceData["mpy_variant"] == "Pimoroni":
+ if self._deviceData["mpy_variant"] == "Pimoroni Pico":
# MicroPython with Pimoroni add-on libraries
url = QUrl(FirmwareGithubUrls["pimoroni_pico"])
else:
@@ -232,27 +232,36 @@
currentVersionStr = self.tr("unknown")
currentVersion = (0, 0, 0)
else:
- currentVersionStr = self._deviceData["mpy_version"]
+ currentVersionStr = (
+ self._deviceData["mpy_variant_version"]
+ if bool(self._deviceData["mpy_variant_version"])
+ else self._deviceData["mpy_version"]
+ )
currentVersion = Globals.versionToTuple(currentVersionStr)
msg = self.tr(
"<h4>MicroPython Version Information</h4>"
"<table>"
- "<tr><td>Installed:</td><td>{0}</td><td></td></tr>"
- "<tr><td>Available:</td><td>{1}</td><td>{2}</td></tr>"
+ "<tr><td>Installed:</td><td>{0}</td></tr>"
+ "<tr><td>Available:</td><td>{1}</td></tr>"
+ "{2}"
"</table>"
).format(
currentVersionStr,
tag,
- self.tr("({0})").format(self._deviceData["mpy_variant"])
+ self.tr(
+ "<tr><td>Variant:</td><td>{0}</td></tr>"
+ ).format(self._deviceData["mpy_variant"])
if self._deviceData["mpy_variant"]
else "",
)
if (
- self._deviceData["mpy_variant"] not in ["Pimoroni"]
- and currentVersion < latestVersion
+ self._deviceData["mpy_variant"] in ["Pimoroni Pico"]
+ and not bool(self._deviceData["mpy_variant_version"])
):
- # cannot derive that info for 'Pimoroni' variant
+ # cannot derive update info
+ msg += self.tr("<p>Update may be available.</p>")
+ elif currentVersion < latestVersion:
msg += self.tr("<p><b>Update available!</b></p>")
EricMessageBox.information(
