diff -r e1c6a2e32a38 -r fcfbb9e94471 eric6/MicroPython/MicroPythonDevices.py
--- a/eric6/MicroPython/MicroPythonDevices.py Tue Apr 21 19:52:43 2020 +0200
+++ b/eric6/MicroPython/MicroPythonDevices.py Wed Apr 22 19:58:01 2020 +0200
@@ -55,6 +55,14 @@
"icon": "microbitDevice",
},
+ "calliope": {
+ "ids": [
+ (0x0D28, 0x0204), # Calliope mini
+ ],
+ "description": "Calliope mini",
+ "icon": "calliope_mini",
+ },
+
"pyboard": {
"ids": [
(0xF055, 0x9800), # Pyboard in CDC mode
@@ -63,7 +71,7 @@
],
"description": "PyBoard",
"icon": "micropython48",
- }
+ },
}
@@ -103,7 +111,6 @@
foundDevices.append(
(board, SupportedBoards[board]["description"],
port.portName()))
- break
else:
logging.debug("Unknown device: (0x%04x:0x%04x)", vid, pid)
@@ -151,9 +158,9 @@
elif deviceType == "circuitpython":
from .CircuitPythonDevices import CircuitPythonDevice
return CircuitPythonDevice(microPythonWidget)
- elif deviceType == "bbc_microbit":
+ elif deviceType in ("bbc_microbit", "calliope"):
from .MicrobitDevices import MicrobitDevice
- return MicrobitDevice(microPythonWidget)
+ return MicrobitDevice(microPythonWidget, deviceType)
elif deviceType == "pyboard":
from .PyBoardDevices import PyBoardDevice
return PyBoardDevice(microPythonWidget)
