Mon, 05 May 2025 17:40:08 +0200
MicroPython
- Added support for IPv6 for WiFi and Ethernet enabled devices (MPy ≥ 1.24.0).
8122 | 1 | # -*- coding: utf-8 -*- |
2 | ||
11090
f5f5f5803935
Updated copyright for 2025.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11051
diff
changeset
|
3 | # Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> |
8122 | 4 | # |
5 | ||
6 | """ | |
10897 | 7 | Module implementing the device interface class for RP2040/RP2350 based boards |
8 | (e.g. Raspberry Pi Pico / Pico 2). | |
8122 | 9 | """ |
10 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
11 | import ast |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
12 | import binascii |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
13 | import json |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
14 | import os |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
15 | |
9747 | 16 | from PyQt6.QtCore import QUrl, pyqtSlot |
9820 | 17 | from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
18 | from PyQt6.QtWidgets import QDialog, QMenu |
8122 | 19 | |
10806
2f6df822e3b9
Moved some functions to the EricUtilities package for consistency and adapted the code base accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10683
diff
changeset
|
20 | from eric7 import EricUtilities, Preferences |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
21 | from eric7.EricGui.EricOverrideCursor import EricOverrideCursor |
9747 | 22 | from eric7.EricWidgets import EricMessageBox |
23 | from eric7.EricWidgets.EricApplication import ericApp | |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
24 | |
9878 | 25 | from ..EthernetDialogs import WiznetUtilities |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
26 | from ..MicroPythonWidget import HAS_QTCHART |
9756
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
27 | from . import FirmwareGithubUrls |
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
28 | from .DeviceBase import BaseDevice |
8122 | 29 | |
30 | ||
10897 | 31 | class RP2Device(BaseDevice): |
8122 | 32 | """ |
10897 | 33 | Class implementing the device for RP2040/RP2350 based boards. |
8122 | 34 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
35 | |
8122 | 36 | def __init__(self, microPythonWidget, deviceType, parent=None): |
37 | """ | |
38 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
39 | |
8122 | 40 | @param microPythonWidget reference to the main MicroPython widget |
41 | @type MicroPythonWidget | |
42 | @param deviceType device type assigned to this device interface | |
43 | @type str | |
44 | @param parent reference to the parent object | |
45 | @type QObject | |
46 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
47 | super().__init__(microPythonWidget, deviceType, parent) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
48 | |
10897 | 49 | self.__createRP2Menu() |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
50 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
51 | self.__statusTranslations = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
52 | "picow": { |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
53 | -3: self.tr("authentication failed"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
54 | -2: self.tr("no matching access point found"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
55 | -1: self.tr("connection failed"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
56 | 0: self.tr("idle"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
57 | 1: self.tr("connecting"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
58 | 2: self.tr("connected, waiting for IP address"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
59 | 3: self.tr("connected"), |
11166
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
60 | 103: self.tr("AP listening"), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
61 | }, |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
62 | "picowireless": { |
9835 | 63 | 0: self.tr("idle"), |
64 | 1: self.tr("no matching access point found"), | |
65 | 2: self.tr("network scan completed"), | |
66 | 3: self.tr("connected"), | |
67 | 4: self.tr("connection failed"), | |
68 | 5: self.tr("connection lost"), | |
69 | 6: self.tr("disconnected"), | |
70 | 7: self.tr("AP listening"), | |
71 | 8: self.tr("AP connected"), | |
72 | 9: self.tr("AP failed"), | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
73 | }, |
9878 | 74 | "picowiz": { |
75 | 0: self.tr("switched off"), | |
76 | 1: self.tr("switched on, inactive"), | |
77 | 2: self.tr("switched on, active"), | |
78 | }, | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
79 | } |
9843
72e8270a5940
Removed an obsolete TODO marker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9841
diff
changeset
|
80 | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
81 | self.__securityTranslations = { |
9836 | 82 | "picow": { |
83 | 0: self.tr("open", "open WiFi network"), | |
84 | 1: "WEP", | |
85 | 2: "WPA", | |
86 | 3: "WPA2", | |
87 | 4: "WPA/WPA2", | |
11237 | 88 | 5: "WPA2", |
9836 | 89 | 6: "WPA3", |
90 | 7: "WPA2/WPA3", | |
91 | }, | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
92 | "picowireless": { |
9836 | 93 | 2: "WPA", |
11237 | 94 | 4: "WPA2", |
9836 | 95 | 5: "WEP", |
96 | 7: self.tr("open", "open WiFi network"), | |
97 | 8: self.tr("automatic"), | |
98 | }, | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
99 | } |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
100 | |
11236 | 101 | self.__securityMapping = { |
102 | "SEC_DPP": "DPP", | |
103 | "SEC_OPEN": self.tr("Open"), | |
104 | "SEC_OWE": "OWE", | |
105 | "SEC_WAPI": "WAPI", | |
106 | "SEC_WEP": "WEP", | |
107 | "SEC_WPA": "WPA", | |
108 | "SEC_WPA_WPA2": "WPA/WPA2", | |
109 | "SEC_WPA2": "WPA2", | |
110 | "SEC_WPA2_ENT": "WPA2 Enterprise", | |
111 | "SEC_WPA2_WPA3": "WPA2/WPA3", | |
112 | "SEC_WPA2_WPA3_ENT": "WPA2/WPA3 Enterprise", | |
113 | "SEC_WPA3": "WPA3", | |
114 | "SEC_WPA3_ENT": "WPA3 Enterprise", | |
115 | "SEC_WPA3_ENT_192": "WPA3 Enterprise (192-bit)", | |
116 | "SEC_WPA3_EXT_PSK": "WPA3 Extended", | |
117 | "SEC_WPA3_EXT_PSK_MIXED_MODE": "WPA3 Extended, Mixed Mode", | |
118 | } | |
119 | ||
8122 | 120 | def setButtons(self): |
121 | """ | |
122 | Public method to enable the supported action buttons. | |
123 | """ | |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8122
diff
changeset
|
124 | super().setButtons() |
9763
52f982c08301
Removed the 'Open' and 'Save' buttons from the MicroPython widget and made the repl and file manager start automatically upon connecting to the selected device.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9756
diff
changeset
|
125 | |
8122 | 126 | self.microPython.setActionButtons( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
127 | run=True, repl=True, files=True, chart=HAS_QTCHART |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
128 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
129 | |
8122 | 130 | def forceInterrupt(self): |
131 | """ | |
132 | Public method to determine the need for an interrupt when opening the | |
133 | serial connection. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
134 | |
8122 | 135 | @return flag indicating an interrupt is needed |
136 | @rtype bool | |
137 | """ | |
138 | return False | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
139 | |
8122 | 140 | def deviceName(self): |
141 | """ | |
142 | Public method to get the name of the device. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
143 | |
8122 | 144 | @return name of the device |
145 | @rtype str | |
146 | """ | |
10897 | 147 | return self.tr("RP2040/RP2350") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
148 | |
8122 | 149 | def canStartRepl(self): |
150 | """ | |
151 | Public method to determine, if a REPL can be started. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
152 | |
8122 | 153 | @return tuple containing a flag indicating it is safe to start a REPL |
154 | and a reason why it cannot. | |
155 | @rtype tuple of (bool, str) | |
156 | """ | |
157 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
158 | |
8122 | 159 | def canStartPlotter(self): |
160 | """ | |
161 | Public method to determine, if a Plotter can be started. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
162 | |
8122 | 163 | @return tuple containing a flag indicating it is safe to start a |
164 | Plotter and a reason why it cannot. | |
165 | @rtype tuple of (bool, str) | |
166 | """ | |
167 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
168 | |
8122 | 169 | def canRunScript(self): |
170 | """ | |
171 | Public method to determine, if a script can be executed. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
172 | |
8122 | 173 | @return tuple containing a flag indicating it is safe to start a |
174 | Plotter and a reason why it cannot. | |
175 | @rtype tuple of (bool, str) | |
176 | """ | |
177 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
178 | |
8122 | 179 | def runScript(self, script): |
180 | """ | |
181 | Public method to run the given Python script. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
182 | |
8122 | 183 | @param script script to be executed |
184 | @type str | |
185 | """ | |
186 | pythonScript = script.split("\n") | |
187 | self.sendCommands(pythonScript) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
188 | |
8122 | 189 | def canStartFileManager(self): |
190 | """ | |
191 | Public method to determine, if a File Manager can be started. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
192 | |
8122 | 193 | @return tuple containing a flag indicating it is safe to start a |
194 | File Manager and a reason why it cannot. | |
195 | @rtype tuple of (bool, str) | |
196 | """ | |
197 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
198 | |
10897 | 199 | def __createRP2Menu(self): |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
200 | """ |
10897 | 201 | Private method to create the RP2 submenu. |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
202 | """ |
10897 | 203 | self.__rp2Menu = QMenu(self.tr("RP2 Functions")) |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
204 | |
10897 | 205 | self.__showMpyAct = self.__rp2Menu.addAction( |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
206 | self.tr("Show MicroPython Versions"), self.__showFirmwareVersions |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
207 | ) |
10897 | 208 | self.__rp2Menu.addSeparator() |
209 | self.__bootloaderAct = self.__rp2Menu.addAction( | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
210 | self.tr("Activate Bootloader"), self.__activateBootloader |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
211 | ) |
10897 | 212 | self.__flashMpyAct = self.__rp2Menu.addAction( |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
213 | self.tr("Flash MicroPython Firmware"), self.__flashPython |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
214 | ) |
10897 | 215 | self.__rp2Menu.addSeparator() |
216 | self.__resetAct = self.__rp2Menu.addAction( | |
9835 | 217 | self.tr("Reset Device"), self.__resetDevice |
218 | ) | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
219 | |
8122 | 220 | def addDeviceMenuEntries(self, menu): |
221 | """ | |
222 | Public method to add device specific entries to the given menu. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
223 | |
8122 | 224 | @param menu reference to the context menu |
225 | @type QMenu | |
226 | """ | |
227 | connected = self.microPython.isConnected() | |
9749 | 228 | linkConnected = self.microPython.isLinkConnected() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
229 | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
230 | self.__showMpyAct.setEnabled(connected) |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
231 | self.__bootloaderAct.setEnabled(connected) |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
232 | self.__flashMpyAct.setEnabled(not linkConnected) |
9835 | 233 | self.__resetAct.setEnabled(connected) |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
234 | |
10897 | 235 | menu.addMenu(self.__rp2Menu) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
236 | |
8122 | 237 | def hasFlashMenuEntry(self): |
238 | """ | |
239 | Public method to check, if the device has its own flash menu entry. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
240 | |
8122 | 241 | @return flag indicating a specific flash menu entry |
242 | @rtype bool | |
243 | """ | |
244 | return True | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
245 | |
8122 | 246 | @pyqtSlot() |
247 | def __flashPython(self): | |
248 | """ | |
249 | Private slot to flash a MicroPython firmware to the device. | |
250 | """ | |
9756
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
251 | from ..UF2FlashDialog import UF2FlashDialog |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
252 | |
11208
f776db7cc222
Fixed some issues related to support of UF2 capable micro-controllers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11179
diff
changeset
|
253 | dlg = UF2FlashDialog(boardType="RP2", parent=self.microPython) |
8122 | 254 | dlg.exec() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
255 | |
9820 | 256 | @pyqtSlot() |
8122 | 257 | def __activateBootloader(self): |
258 | """ | |
9820 | 259 | Private slot to switch the board into 'bootloader' mode. |
8122 | 260 | """ |
261 | if self.microPython.isConnected(): | |
9989 | 262 | self.executeCommands( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
263 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
264 | "import machine", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
265 | "machine.bootloader()", |
9835 | 266 | ], |
267 | mode=self._submitMode, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
268 | ) |
8122 | 269 | # simulate pressing the disconnect button |
270 | self.microPython.on_connectButton_clicked() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
271 | |
9747 | 272 | @pyqtSlot() |
273 | def __showFirmwareVersions(self): | |
274 | """ | |
275 | Private slot to show the firmware version of the connected device and the | |
276 | available firmware version. | |
277 | """ | |
278 | if self.microPython.isConnected(): | |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
279 | if self._deviceData["mpy_name"] != "micropython": |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
280 | EricMessageBox.critical( |
11034
7b8a21fd2d58
Extended the EricMessageBox module to determine a parent widget if none was given and extended the EricApplication class to store a reference to the main widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11005
diff
changeset
|
281 | self.microPython, |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
282 | self.tr("Show MicroPython Versions"), |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
283 | self.tr( |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
284 | """The firmware of the connected device cannot be""" |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
285 | """ determined or the board does not run MicroPython.""" |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
286 | """ Aborting...""" |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
287 | ), |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
288 | ) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
289 | else: |
9772
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
290 | if self._deviceData["mpy_variant"] == "Pimoroni Pico": |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
291 | # MicroPython with Pimoroni add-on libraries |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
292 | url = QUrl(FirmwareGithubUrls["pimoroni_pico"]) |
9747 | 293 | else: |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
294 | url = QUrl(FirmwareGithubUrls["micropython"]) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
295 | ui = ericApp().getObject("UserInterface") |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
296 | request = QNetworkRequest(url) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
297 | reply = ui.networkAccessManager().head(request) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
298 | reply.finished.connect(lambda: self.__firmwareVersionResponse(reply)) |
9747 | 299 | |
9820 | 300 | @pyqtSlot(QNetworkReply) |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
301 | def __firmwareVersionResponse(self, reply): |
9747 | 302 | """ |
9820 | 303 | Private slot handling the response of the latest version request. |
9747 | 304 | |
305 | @param reply reference to the reply object | |
306 | @type QNetworkReply | |
307 | """ | |
308 | latestUrl = reply.url().toString() | |
309 | tag = latestUrl.rsplit("/", 1)[-1] | |
310 | while tag and not tag[0].isdecimal(): | |
311 | # get rid of leading non-decimal characters | |
312 | tag = tag[1:] | |
10806
2f6df822e3b9
Moved some functions to the EricUtilities package for consistency and adapted the code base accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10683
diff
changeset
|
313 | latestVersion = EricUtilities.versionToTuple(tag) |
9747 | 314 | |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
315 | if self._deviceData["mpy_version"] == "unknown": |
9747 | 316 | currentVersionStr = self.tr("unknown") |
317 | currentVersion = (0, 0, 0) | |
318 | else: | |
9772
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
319 | currentVersionStr = ( |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
320 | self._deviceData["mpy_variant_version"] |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
321 | if bool(self._deviceData["mpy_variant_version"]) |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
322 | else self._deviceData["mpy_version"] |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
323 | ) |
10806
2f6df822e3b9
Moved some functions to the EricUtilities package for consistency and adapted the code base accordingly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10683
diff
changeset
|
324 | currentVersion = EricUtilities.versionToTuple(currentVersionStr) |
9747 | 325 | |
326 | msg = self.tr( | |
327 | "<h4>MicroPython Version Information</h4>" | |
328 | "<table>" | |
9772
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
329 | "<tr><td>Installed:</td><td>{0}</td></tr>" |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
330 | "<tr><td>Available:</td><td>{1}</td></tr>" |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
331 | "{2}" |
9747 | 332 | "</table>" |
333 | ).format( | |
334 | currentVersionStr, | |
335 | tag, | |
10621
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
336 | ( |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
337 | self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
338 | self._deviceData["mpy_variant"] |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
339 | ) |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
340 | if self._deviceData["mpy_variant"] |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
341 | else "" |
f5631f40c4d9
Corrected some code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
342 | ), |
9747 | 343 | ) |
9786
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
344 | if self._deviceData["mpy_variant"] in ["Pimoroni Pico"] and not bool( |
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
345 | self._deviceData["mpy_variant_version"] |
9747 | 346 | ): |
9772
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
347 | # cannot derive update info |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
348 | msg += self.tr("<p>Update may be available.</p>") |
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
349 | elif currentVersion < latestVersion: |
9747 | 350 | msg += self.tr("<p><b>Update available!</b></p>") |
351 | ||
352 | EricMessageBox.information( | |
11034
7b8a21fd2d58
Extended the EricMessageBox module to determine a parent widget if none was given and extended the EricApplication class to store a reference to the main widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11005
diff
changeset
|
353 | self.microPython, |
9747 | 354 | self.tr("MicroPython Version"), |
355 | msg, | |
356 | ) | |
357 | ||
9835 | 358 | @pyqtSlot() |
359 | def __resetDevice(self): | |
360 | """ | |
361 | Private slot to reset the connected device. | |
362 | """ | |
9989 | 363 | if self.microPython.isConnected(): |
364 | self.executeCommands( | |
365 | "import machine\nmachine.reset()\n", mode=self._submitMode | |
366 | ) | |
9835 | 367 | |
8122 | 368 | def getDocumentationUrl(self): |
369 | """ | |
370 | Public method to get the device documentation URL. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
371 | |
8122 | 372 | @return documentation URL of the device |
373 | @rtype str | |
374 | """ | |
375 | return Preferences.getMicroPython("MicroPythonDocuUrl") | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
376 | |
8122 | 377 | def getDownloadMenuEntries(self): |
378 | """ | |
379 | Public method to retrieve the entries for the downloads menu. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
380 | |
8122 | 381 | @return list of tuples with menu text and URL to be opened for each |
382 | entry | |
383 | @rtype list of tuple of (str, str) | |
384 | """ | |
385 | return [ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
386 | ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
387 | self.tr("MicroPython Firmware"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
388 | Preferences.getMicroPython("MicroPythonFirmwareUrl"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
389 | ), |
8122 | 390 | ("<separator>", ""), |
9748 | 391 | (self.tr("Pimoroni Pico Firmware"), FirmwareGithubUrls["pimoroni_pico"]), |
9747 | 392 | ("<separator>", ""), |
393 | ( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
394 | self.tr("CircuitPython Firmware"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
395 | Preferences.getMicroPython("CircuitPythonFirmwareUrl"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
396 | ), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
397 | ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
398 | self.tr("CircuitPython Libraries"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
399 | Preferences.getMicroPython("CircuitPythonLibrariesUrl"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
400 | ), |
8122 | 401 | ] |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
402 | |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
403 | ################################################################## |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
404 | ## time related methods below |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
405 | ################################################################## |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
406 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
407 | def _getSetTimeCode(self): |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
408 | """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
409 | Protected method to get the device code to set the time. |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
410 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
411 | Note: This method must be implemented in the various device specific |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
412 | subclasses. |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
413 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
414 | @return code to be executed on the connected device to set the time |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
415 | @rtype str |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
416 | """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
417 | # rtc_time[0] - year 4 digit |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
418 | # rtc_time[1] - month 1..12 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
419 | # rtc_time[2] - day 1..31 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
420 | # rtc_time[3] - weekday 1..7 1=Monday |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
421 | # rtc_time[4] - hour 0..23 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
422 | # rtc_time[5] - minute 0..59 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
423 | # rtc_time[6] - second 0..59 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
424 | # rtc_time[7] - yearday 1..366 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
425 | # rtc_time[8] - isdst 0, 1, or -1 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
426 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
427 | # The machine.rtc.datetime() function takes the arguments in the order: |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
428 | # (year, month, day, weekday, hour, minute, second, subseconds) |
11148
15e30f0c76a8
Adjusted the code to the modified issue codes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11090
diff
changeset
|
429 | # __IGNORE_WARNING_M-891__ |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
430 | # https://docs.micropython.org/en/latest/library/machine.RTC.html#machine-rtc |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
431 | return """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
432 | def set_time(rtc_time): |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
433 | import machine |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
434 | rtc = machine.RTC() |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
435 | rtc.datetime(rtc_time[:7] + (0,)) |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
436 | """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
437 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
438 | ################################################################## |
11179 | 439 | ## Method to determine the processor temperatur |
440 | ################################################################## | |
441 | ||
442 | def getBoardInformation(self): | |
443 | """ | |
444 | Public method to get some information data of the connected board. | |
445 | ||
446 | This method amends the base class result with the board temperature | |
447 | determined via the built in temperature sensor of the RPi Pico. | |
448 | ||
449 | @return dictionary containing the determined data | |
450 | @rtype dict | |
451 | @exception OSError raised to indicate an issue with the device | |
452 | """ | |
453 | temp_command = """def get_board_temperature(): | |
454 | from machine import ADC | |
455 | ||
456 | try: | |
457 | # RP2040, RP2350A: Temp. sensor is connected to ADC channel 4 | |
458 | # RP2350B: Temp. sensor is connected to ADC channel 8 | |
459 | temp_sensor = ADC(ADC.CORE_TEMP) | |
460 | except AttributeError: | |
461 | # older MPy implementation, use 4 for RP2040 and RP2350A | |
462 | temp_sensor = ADC(4) | |
463 | ||
464 | adc_value = temp_sensor.read_u16() # Read the raw ADC value | |
465 | ||
466 | # Convert ADC value to voltage | |
467 | voltage = adc_value * 3.3 / 65535.0 | |
468 | ||
469 | # Temperature calculation based on sensor characteristics | |
470 | return 27 - (voltage - 0.706) / 0.001721 | |
471 | ||
472 | print(get_board_temperature()) | |
473 | del get_board_temperature | |
474 | """ | |
475 | res = super().getBoardInformation() | |
476 | ||
477 | # add the RPi Pico board temperature | |
478 | out, err = self.executeCommands(temp_command, mode=self._submitMode) | |
479 | if err: | |
480 | raise OSError(self._shortError(err)) | |
481 | res["mc_temp_c"] = ast.literal_eval(out.decode("utf-8")) | |
482 | ||
483 | return res | |
484 | ||
485 | ################################################################## | |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
486 | ## Methods below implement WiFi related methods |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
487 | ################################################################## |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
488 | |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
489 | def addDeviceWifiEntries(self, menu): |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
490 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
491 | Public method to add device specific entries to the given menu. |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
492 | |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
493 | @param menu reference to the context menu |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
494 | @type QMenu |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
495 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
496 | menu.addSeparator() |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
497 | menu.addAction(self.tr("Set Country"), self.__setCountry).setEnabled( |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
498 | self._deviceData["wifi_type"] == "picow" |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
499 | ) |
10153 | 500 | menu.addAction(self.tr("Reset Country"), self.__resetCountry).setEnabled( |
501 | self._deviceData["wifi_type"] == "picow" | |
502 | ) | |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
503 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
504 | def hasWifi(self): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
505 | """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
506 | Public method to check the availability of WiFi. |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
507 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
508 | @return tuple containing a flag indicating the availability of WiFi |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
509 | and the WiFi type (picow or picowireless) |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
510 | @rtype tuple of (bool, str) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
511 | @exception OSError raised to indicate an issue with the device |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
512 | """ |
9835 | 513 | # picowireless: |
514 | # It seems to take up to 20 sec to detect, that no Pico Wireless Pack is | |
515 | # attached. Therefore the command will timeout before. | |
11254
cdb56075b4bc
Added code to suppress a code style warning in RP2Devices.py.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11240
diff
changeset
|
516 | if Preferences.getMicroPython("DisablePicowireless"): # noqa: Y-108 |
11240 | 517 | # Support for Pimoroni Pico Wireless Pack is disabled. |
518 | command = """ | |
519 | def has_wifi(): | |
520 | try: | |
521 | import network | |
522 | if hasattr(network, 'WLAN'): | |
523 | wifi = network.WLAN(network.STA_IF) | |
524 | if not wifi.active(): | |
525 | wifi.active(True) | |
526 | wifi.active(False) | |
527 | return True, 'picow' | |
528 | except ImportError: | |
529 | pass | |
530 | ||
531 | return False, '' | |
532 | ||
533 | print(has_wifi()) | |
534 | del has_wifi | |
535 | """ | |
536 | else: | |
537 | command = """ | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
538 | def has_wifi(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
539 | try: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
540 | import network |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
541 | if hasattr(network, 'WLAN'): |
11051 | 542 | wifi = network.WLAN(network.STA_IF) |
543 | if not wifi.active(): | |
544 | wifi.active(True) | |
545 | wifi.active(False) | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
546 | return True, 'picow' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
547 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
548 | try: |
9836 | 549 | import picowireless as pw |
550 | try: | |
551 | if pw.get_fw_version() != '': | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
552 | return True, 'picowireless' |
9836 | 553 | except RuntimeError: |
10326
d83e1fea5ea6
Fixed an issue in the MicroPython interface related to Pi Pico with Pimoroni 'pico wireless'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10233
diff
changeset
|
554 | pw.init() |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
555 | return True, 'picowireless' |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
556 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
557 | pass |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
558 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
559 | return False, '' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
560 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
561 | print(has_wifi()) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
562 | del has_wifi |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
563 | """ |
10327
6b1e6d7b26f0
RP2040Devices
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10326
diff
changeset
|
564 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=20000) |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
565 | if err: |
9836 | 566 | if not err.startswith(b"Timeout "): |
9835 | 567 | raise OSError(self._shortError(err)) |
568 | else: | |
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
569 | # pimoroni firmware loaded but no pico wireless present |
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
570 | return False, "" |
11051 | 571 | if b"Failed to start CYW43" in out: |
572 | # network module present but no CYW43 chip | |
573 | # (pimoroni firmware has everything) | |
574 | return False, "" | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
575 | return ast.literal_eval(out.decode("utf-8")) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
576 | |
10153 | 577 | def hasWifiCountry(self): |
578 | """ | |
579 | Public method to check, if the device has support to set the WiFi country. | |
580 | ||
581 | @return flag indicating the support of WiFi country | |
582 | @rtype bool | |
583 | """ | |
584 | return self._deviceData["wifi_type"] == "picow" | |
585 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
586 | def getWifiData(self): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
587 | """ |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
588 | Public method to get data related to the current WiFi status. |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
589 | |
9798 | 590 | @return tuple of three dictionaries containing the WiFi status data |
591 | for the WiFi client, access point and overall data | |
592 | @rtype tuple of (dict, dict, dict) | |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
593 | @exception OSError raised to indicate an issue with the device |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
594 | """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
595 | if self._deviceData["wifi_type"] == "picow": |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
596 | command = """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
597 | def wifi_status(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
598 | import ubinascii |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
599 | import ujson |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
600 | import network |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
601 | import rp2 |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
602 | |
11236 | 603 | def security_str(mode): |
604 | for sm in [e for e in dir(network.WLAN) if e.startswith('SEC_')]: | |
605 | if getattr(network.WLAN, sm, 0) == mode: | |
606 | return sm | |
607 | return "" | |
608 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
609 | wifi = network.WLAN(network.STA_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
610 | station = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
611 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
612 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
613 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
614 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
615 | 'channel': wifi.config('channel'), |
11263 | 616 | 'essid': wifi.config('essid'), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
617 | 'txpower': wifi.config('txpower'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
618 | } |
11263 | 619 | try: |
620 | station['ifconfig'] = ( | |
621 | wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns')) | |
622 | ) | |
623 | except AttributeError: | |
624 | station['ifconfig'] = wifi.ifconfig() | |
625 | try: | |
626 | station['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')] | |
627 | except ValueError: | |
628 | station['ipv6_addr'] = [] | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
629 | print(ujson.dumps(station)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
630 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
631 | wifi = network.WLAN(network.AP_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
632 | ap = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
633 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
634 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
635 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
636 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
637 | 'channel': wifi.config('channel'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
638 | 'txpower': wifi.config('txpower'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
639 | 'essid': wifi.config('essid'), |
11236 | 640 | 'ap_security': security_str(wifi.config('security')), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
641 | } |
11263 | 642 | try: |
643 | ap['ifconfig'] = ( | |
644 | wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns')) | |
645 | ) | |
646 | except AttributeError: | |
647 | ap['ifconfig'] = wifi.ifconfig() | |
648 | try: | |
649 | ap['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')] | |
650 | except ValueError: | |
651 | ap['ipv6_addr'] = [] | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
652 | print(ujson.dumps(ap)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
653 | |
9798 | 654 | overall = { |
655 | 'active': station['active'] or ap['active'] | |
656 | } | |
10153 | 657 | try: |
658 | overall['country'] = network.country() | |
659 | except AttributeError: | |
660 | overall['country'] = rp2.country() | |
661 | try: | |
662 | overall['hostname'] = network.hostname() | |
663 | except AttributeError: | |
664 | pass | |
11263 | 665 | try: |
666 | overall['prefer'] = network.ipconfig('prefer') | |
667 | except ValueError: | |
668 | overall['prefer'] = 4 | |
9798 | 669 | print(ujson.dumps(overall)) |
670 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
671 | wifi_status() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
672 | del wifi_status |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
673 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
674 | elif self._deviceData["wifi_type"] == "picowireless": |
9835 | 675 | command = """ |
676 | def wifi_status(): | |
677 | import picowireless as pw | |
678 | import ubinascii | |
679 | import ujson | |
680 | ||
681 | def ip_str(ip): | |
682 | return '.'.join(str(i) for i in ip) | |
683 | ||
684 | station = { | |
685 | 'active': pw.get_connection_status() not in (0, 7, 8, 9), | |
686 | 'connected': pw.get_connection_status() == 3, | |
687 | 'status': pw.get_connection_status(), | |
11263 | 688 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), |
9835 | 689 | 'ifconfig': ( |
690 | ip_str(pw.get_ip_address()), | |
691 | ip_str(pw.get_subnet_mask()), | |
692 | ip_str(pw.get_gateway_ip()), | |
693 | '0.0.0.0' | |
694 | ), | |
11263 | 695 | 'ipv6_addr': [], |
9835 | 696 | } |
697 | if station['connected']: | |
698 | station.update({ | |
699 | 'ap_ssid': pw.get_current_ssid(), | |
9836 | 700 | 'ap_bssid': ubinascii.hexlify(pw.get_current_bssid(), ':'), |
9835 | 701 | 'ap_rssi': pw.get_current_rssi(), |
702 | 'ap_security': pw.get_current_encryption_type(), | |
703 | }) | |
704 | print(ujson.dumps(station)) | |
705 | ||
706 | ap = { | |
707 | 'active': pw.get_connection_status() in (7, 8, 9), | |
708 | 'connected': pw.get_connection_status() == 8, | |
709 | 'status': pw.get_connection_status(), | |
710 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), | |
11237 | 711 | 'ap_security': pw.get_current_encryption_type(), |
11263 | 712 | 'ipv6_addr': [], |
9835 | 713 | } |
714 | if ap['active']: | |
715 | ap['essid'] = pw.get_current_ssid() | |
9836 | 716 | ap['ifconfig'] = ( |
717 | ip_str(pw.get_ip_address()), | |
718 | ip_str(pw.get_subnet_mask()), | |
719 | ip_str(pw.get_gateway_ip()), | |
720 | '0.0.0.0' | |
721 | ) | |
9835 | 722 | print(ujson.dumps(ap)) |
723 | ||
724 | overall = { | |
11263 | 725 | 'active': pw.get_connection_status() != 0, |
726 | 'prefer': 4, | |
9835 | 727 | } |
728 | print(ujson.dumps(overall)) | |
729 | ||
730 | wifi_status() | |
731 | del wifi_status | |
732 | """ | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
733 | else: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
734 | return super().getWifiData() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
735 | |
9989 | 736 | out, err = self.executeCommands(command, mode=self._submitMode) |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
737 | if err: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
738 | raise OSError(self._shortError(err)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
739 | |
9798 | 740 | stationStr, apStr, overallStr = out.decode("utf-8").splitlines() |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
741 | station = json.loads(stationStr) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
742 | ap = json.loads(apStr) |
9798 | 743 | overall = json.loads(overallStr) |
9836 | 744 | if "status" in station: |
745 | # translate the numerical status to a string | |
746 | try: | |
747 | station["status"] = self.__statusTranslations[ | |
748 | self._deviceData["wifi_type"] | |
749 | ][station["status"]] | |
750 | except KeyError: | |
751 | station["status"] = str(station["status"]) | |
10138 | 752 | if "status" in ap: |
9836 | 753 | # translate the numerical status to a string |
754 | try: | |
755 | ap["status"] = self.__statusTranslations[self._deviceData["wifi_type"]][ | |
11166
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
756 | ( |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
757 | 103 |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
758 | if self._deviceData["wifi_type"] == "picow" |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
759 | and ap["status"] == 3 |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
760 | else ap["status"] |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
761 | ) |
9836 | 762 | ] |
763 | except KeyError: | |
764 | ap["status"] = str(ap["status"]) | |
765 | if "ap_security" in station: | |
766 | # translate the numerical AP security to a string | |
767 | try: | |
768 | station["ap_security"] = self.__securityTranslations[ | |
769 | self._deviceData["wifi_type"] | |
770 | ][station["ap_security"]] | |
771 | except KeyError: | |
772 | station["ap_security"] = self.tr("unknown ({0})").format( | |
773 | station["ap_security"] | |
774 | ) | |
11237 | 775 | if "ap_security" in ap: |
776 | if self._deviceData["wifi_type"] == "picow": | |
777 | try: | |
778 | ap["ap_security"] = self.__securityMapping[ap["ap_security"]] | |
779 | except KeyError: | |
780 | ap["ap_security"] = self.tr("unknown ({0})").format( | |
781 | ap["ap_security"] | |
782 | ) | |
783 | elif self._deviceData["wifi_type"] == "picowireless": | |
784 | # translate the numerical AP security to a string | |
785 | try: | |
786 | ap["ap_security"] = self.__securityTranslations["picowireless"][ | |
787 | ap["ap_security"] | |
788 | ] | |
789 | except KeyError: | |
790 | ap["ap_security"] = self.tr("unknown ({0})").format( | |
791 | ap["ap_security"] | |
792 | ) | |
793 | else: | |
11236 | 794 | ap["ap_security"] = self.tr("unknown ({0})").format(ap["ap_security"]) |
795 | ||
9798 | 796 | return station, ap, overall |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
797 | |
10153 | 798 | def connectWifi(self, ssid, password, hostname): |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
799 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
800 | Public method to connect a device to a WiFi network. |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
801 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
802 | @param ssid name (SSID) of the WiFi network |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
803 | @type str |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
804 | @param password password needed to connect |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
805 | @type str |
10153 | 806 | @param hostname host name of the device |
807 | @type str | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
808 | @return tuple containing the connection status and an error string |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
809 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
810 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
811 | if self._deviceData["wifi_type"] == "picow": |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
812 | country = Preferences.getMicroPython("WifiCountry").upper() |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
813 | command = """ |
10153 | 814 | def connect_wifi(ssid, password, hostname, country): |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
815 | import network |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
816 | import rp2 |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
817 | import ujson |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
818 | from time import sleep |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
819 | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
820 | rp2.country(country) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
821 | |
10153 | 822 | if hostname: |
823 | try: | |
824 | network.hostname(hostname) | |
825 | except AttributeError: | |
826 | pass | |
827 | ||
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
828 | wifi = network.WLAN(network.STA_IF) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
829 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
830 | wifi.active(True) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
831 | wifi.connect(ssid, password) |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
832 | max_wait = 140 |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
833 | while max_wait: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
834 | if wifi.status() < 0 or wifi.status() >= 3: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
835 | break |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
836 | max_wait -= 1 |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
837 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
838 | status = wifi.status() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
839 | print(ujson.dumps({{'connected': wifi.isconnected(), 'status': status}})) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
840 | |
10153 | 841 | connect_wifi({0}, {1}, {2}, {3}) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
842 | del connect_wifi |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
843 | """.format( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
844 | repr(ssid), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
845 | repr(password if password else ""), |
10153 | 846 | repr(hostname), |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
847 | repr(country if country else "XX"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
848 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
849 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 850 | command = """ |
851 | def connect_wifi(ssid, password): | |
852 | import picowireless as pw | |
853 | import ujson | |
854 | from time import sleep | |
855 | ||
856 | pw.init() | |
857 | if bool(password): | |
858 | pw.wifi_set_passphrase(ssid, password) | |
859 | else: | |
860 | pw.wifi_set_network(ssid) | |
861 | ||
862 | max_wait = 140 | |
863 | while max_wait: | |
864 | if pw.get_connection_status() == 3: | |
865 | break | |
866 | max_wait -= 1 | |
867 | sleep(0.1) | |
868 | status = pw.get_connection_status() | |
869 | if status == 3: | |
870 | pw.set_led(0, 64, 0) | |
871 | else: | |
872 | pw.set_led(64, 0, 0) | |
873 | print(ujson.dumps({{'connected': status == 3, 'status': status}})) | |
874 | ||
875 | connect_wifi({0}, {1}) | |
876 | del connect_wifi | |
877 | """.format( | |
878 | repr(ssid), | |
879 | repr(password if password else ""), | |
880 | ) | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
881 | else: |
10153 | 882 | return super().connectWifi(ssid, password, hostname) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
883 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
884 | with EricOverrideCursor(): |
9989 | 885 | out, err = self.executeCommands( |
9827 | 886 | command, mode=self._submitMode, timeout=15000 |
9799 | 887 | ) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
888 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
889 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
890 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
891 | result = json.loads(out.decode("utf-8").strip()) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
892 | if result["connected"]: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
893 | error = "" |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
894 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
895 | try: |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
896 | error = self.__statusTranslations[self._deviceData["wifi_type"]][ |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
897 | result["status"] |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
898 | ] |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
899 | except KeyError: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
900 | error = str(result["status"]) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
901 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
902 | return result["connected"], error |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
903 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
904 | def disconnectWifi(self): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
905 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
906 | Public method to disconnect a device from the WiFi network. |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
907 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
908 | @return tuple containing a flag indicating success and an error string |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
909 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
910 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
911 | if self._deviceData["wifi_type"] == "picow": |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
912 | command = """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
913 | def disconnect_wifi(): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
914 | import network |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
915 | from time import sleep |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
916 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
917 | wifi = network.WLAN(network.STA_IF) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
918 | wifi.disconnect() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
919 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
920 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
921 | print(not wifi.isconnected()) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
922 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
923 | disconnect_wifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
924 | del disconnect_wifi |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
925 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
926 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 927 | command = """ |
928 | def disconnect_wifi(): | |
929 | import picowireless as pw | |
930 | from time import sleep | |
931 | ||
932 | pw.disconnect() | |
933 | sleep(0.1) | |
934 | print(pw.get_connection_status() != 3) | |
935 | pw.set_led(0, 0, 0) | |
936 | ||
937 | disconnect_wifi() | |
938 | del disconnect_wifi | |
939 | """ | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
940 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
941 | return super().disconnectWifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
942 | |
9989 | 943 | out, err = self.executeCommands(command, mode=self._submitMode) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
944 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
945 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
946 | |
10144 | 947 | return out.decode("utf-8").strip() == "True", "" |
948 | ||
949 | def isWifiClientConnected(self): | |
950 | """ | |
951 | Public method to check the WiFi connection status as client. | |
952 | ||
953 | @return flag indicating the WiFi connection status | |
954 | @rtype bool | |
955 | """ | |
956 | if self._deviceData["wifi_type"] == "picow": | |
957 | command = """ | |
958 | def wifi_connected(): | |
959 | import network | |
960 | ||
961 | wifi = network.WLAN(network.STA_IF) | |
962 | print(wifi.isconnected()) | |
963 | ||
964 | wifi_connected() | |
965 | del wifi_connected | |
966 | """ | |
967 | elif self._deviceData["wifi_type"] == "picowireless": | |
968 | command = """ | |
969 | def wifi_connected(): | |
970 | import picowireless as pw | |
971 | ||
972 | print(pw.get_connection_status() == 3) | |
973 | ||
974 | wifi_connected() | |
975 | del wifi_connected | |
976 | """ | |
977 | else: | |
978 | return super().isWifiClientConnected() | |
979 | ||
980 | out, err = self.executeCommands(command, mode=self._submitMode) | |
981 | if err: | |
982 | return False | |
10138 | 983 | |
10144 | 984 | return out.strip() == b"True" |
985 | ||
986 | def isWifiApConnected(self): | |
987 | """ | |
988 | Public method to check the WiFi connection status as access point. | |
989 | ||
990 | @return flag indicating the WiFi connection status | |
991 | @rtype bool | |
992 | """ | |
993 | if self._deviceData["wifi_type"] == "picow": | |
994 | command = """ | |
995 | def wifi_connected(): | |
996 | import network | |
997 | ||
998 | wifi = network.WLAN(network.AP_IF) | |
999 | print(wifi.isconnected()) | |
1000 | ||
1001 | wifi_connected() | |
1002 | del wifi_connected | |
1003 | """ | |
1004 | elif self._deviceData["wifi_type"] == "picowireless": | |
1005 | command = """ | |
1006 | def wifi_connected(): | |
1007 | import picowireless as pw | |
1008 | ||
1009 | print(pw.get_connection_status() == 8) | |
1010 | ||
1011 | wifi_connected() | |
1012 | del wifi_connected | |
1013 | """ | |
1014 | else: | |
1015 | return super().isWifiClientConnected() | |
1016 | ||
1017 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1018 | if err: | |
1019 | return False | |
1020 | ||
1021 | return out.strip() == b"True" | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
1022 | |
10153 | 1023 | def writeCredentials(self, ssid, password, hostname, country): |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1024 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1025 | Public method to write the given credentials to the connected device and modify |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1026 | the start script to connect automatically. |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1027 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1028 | @param ssid SSID of the network to connect to |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1029 | @type str |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1030 | @param password password needed to authenticate |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1031 | @type str |
10153 | 1032 | @param hostname host name of the device |
1033 | @type str | |
1034 | @param country WiFi country code | |
1035 | @type str | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1036 | @return tuple containing a flag indicating success and an error message |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1037 | @rtype tuple of (bool, str) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1038 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1039 | command = """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1040 | def modify_boot(): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1041 | add = True |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1042 | try: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1043 | with open('/boot.py', 'r') as f: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1044 | for ln in f.readlines(): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1045 | if 'wifi_connect' in ln: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1046 | add = False |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1047 | break |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1048 | except: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1049 | pass |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1050 | if add: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1051 | with open('/boot.py', 'a') as f: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1052 | f.write('\\nimport wifi_connect\\n') |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1053 | print(True) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1054 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1055 | modify_boot() |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1056 | del modify_boot |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1057 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1058 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1059 | if self._deviceData["wifi_type"] == "picow": |
10153 | 1060 | secrets = ( |
1061 | "WIFI_SSID = {0}\nWIFI_KEY = {1}\nWIFI_COUNTRY={2}\n" | |
1062 | "WIFI_HOSTNAME = {3}\n" | |
1063 | ).format( | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1064 | repr(ssid), |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1065 | repr(password) if password else '""', |
10153 | 1066 | repr(country.upper()) if country else '""', |
1067 | repr(hostname) if hostname else '""', | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1068 | ) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1069 | wifiConnectFile = "picowWiFiConnect.py" |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1070 | else: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1071 | secrets = "WIFI_SSID = {0}\nWIFI_KEY = {1}\n".format( |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1072 | repr(ssid), |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1073 | repr(password) if password else '""', |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1074 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1075 | if self._deviceData["wifi_type"] == "picowireless": |
9836 | 1076 | wifiConnectFile = "pimoroniWiFiConnect.py" |
1077 | else: | |
10153 | 1078 | secrets += "WIFI_HOSTNAME = {0}\n".format( |
1079 | repr(hostname if hostname else '""') | |
1080 | ) | |
9836 | 1081 | wifiConnectFile = "mpyWiFiConnect.py" |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1082 | try: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1083 | # write secrets file |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1084 | self.putData("/secrets.py", secrets.encode("utf-8")) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1085 | # copy auto-connect file |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1086 | self.put( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1087 | os.path.join(os.path.dirname(__file__), "MCUScripts", wifiConnectFile), |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1088 | "/wifi_connect.py", |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1089 | ) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1090 | except OSError as err: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1091 | return False, str(err) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1092 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1093 | # modify boot.py |
9989 | 1094 | out, err = self.executeCommands(command, mode=self._submitMode) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1095 | if err: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1096 | return False, err |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1097 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1098 | return out.decode("utf-8").strip() == "True", "" |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1099 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1100 | def removeCredentials(self): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1101 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1102 | Public method to remove the saved credentials from the connected device. |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1103 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1104 | @return tuple containing a flag indicating success and an error message |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1105 | @rtype tuple of (bool, str) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1106 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1107 | try: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1108 | self.rm("/secrets.py") |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1109 | except OSError as err: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1110 | return False, str(err) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1111 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1112 | return True, "" |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1113 | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1114 | def checkInternet(self): |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1115 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1116 | Public method to check, if the internet can be reached. |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1117 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1118 | @return tuple containing a flag indicating reachability and an error string |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1119 | @rtype tuple of (bool, str) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1120 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1121 | if self._deviceData["wifi_type"] == "picow": |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1122 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1123 | def check_internet(): |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1124 | import network |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1125 | import socket |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1126 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1127 | wifi = network.WLAN(network.STA_IF) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1128 | if wifi.isconnected(): |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1129 | s = socket.socket() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1130 | try: |
10233
51a6649ba79d
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10170
diff
changeset
|
1131 | s.connect(socket.getaddrinfo('quad9.net', 443)[0][-1]) |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1132 | s.close() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1133 | print(True) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1134 | except: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1135 | print(False) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1136 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1137 | print(False) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1138 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1139 | check_internet() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1140 | del check_internet |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1141 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1142 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1143 | command = """ |
1144 | def check_internet(): | |
1145 | import picowireless as pw | |
1146 | ||
1147 | if pw.get_connection_status() == 3: | |
1148 | res = pw.ping((9, 9, 9, 9), 300) | |
1149 | print(res >= 0) | |
1150 | else: | |
1151 | print(False) | |
1152 | ||
1153 | check_internet() | |
1154 | del check_internet | |
1155 | """ | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1156 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1157 | return super().checkInternet() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1158 | |
9989 | 1159 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1160 | if err: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1161 | return False, err |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1162 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1163 | return out.decode("utf-8").strip() == "True", "" |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1164 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1165 | def scanNetworks(self): |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1166 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1167 | Public method to scan for available WiFi networks. |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1168 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1169 | @return tuple containing the list of available networks as a tuple of 'Name', |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1170 | 'MAC-Address', 'channel', 'RSSI' and 'security' and an error string |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1171 | @rtype tuple of (list of tuple of (str, str, int, int, str), str) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1172 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1173 | if self._deviceData["wifi_type"] == "picow": |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1174 | country = Preferences.getMicroPython("WifiCountry").upper() |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1175 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1176 | def scan_networks(): |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1177 | import network |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1178 | import rp2 |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1179 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1180 | rp2.country({0}) |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1181 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1182 | wifi = network.WLAN(network.STA_IF) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1183 | active = wifi.active() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1184 | if not active: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1185 | wifi.active(True) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1186 | network_list = wifi.scan() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1187 | if not active: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1188 | wifi.active(False) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1189 | print(network_list) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1190 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1191 | scan_networks() |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1192 | del scan_networks |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1193 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1194 | repr(country if country else "XX") |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1195 | ) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1196 | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1197 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1198 | command = """ |
1199 | def scan_networks(): | |
1200 | import picowireless as pw | |
1201 | ||
1202 | network_list = [] | |
1203 | pw.init() | |
1204 | pw.start_scan_networks() | |
1205 | networks = pw.get_scan_networks() | |
1206 | for n in range(networks): | |
1207 | network_list.append(( | |
1208 | pw.get_ssid_networks(n), | |
1209 | pw.get_bssid_networks(n), | |
1210 | pw.get_channel_networks(n), | |
1211 | pw.get_rssi_networks(n), | |
1212 | pw.get_enc_type_networks(n), | |
1213 | )) | |
1214 | print(network_list) | |
1215 | ||
1216 | scan_networks() | |
1217 | del scan_networks | |
1218 | """ | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1219 | else: |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1220 | return super().scanNetworks() |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1221 | |
9989 | 1222 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000) |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1223 | if err: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1224 | return [], err |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1225 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1226 | networksList = ast.literal_eval(out.decode("utf-8")) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1227 | networks = [] |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1228 | for network in networksList: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1229 | if network[0]: |
9836 | 1230 | ssid = ( |
1231 | network[0].decode("utf-8") | |
1232 | if isinstance(network[0], bytes) | |
1233 | else network[0] | |
1234 | ) | |
1235 | mac = ( | |
1236 | binascii.hexlify(network[1], ":").decode("utf-8") | |
1237 | if network[1] is not None | |
1238 | else "" | |
1239 | ) | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1240 | channel = network[2] |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1241 | rssi = network[3] |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1242 | try: |
9836 | 1243 | security = self.__securityTranslations[ |
1244 | self._deviceData["wifi_type"] | |
1245 | ][network[4]] | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1246 | except KeyError: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1247 | security = self.tr("unknown ({0})").format(network[4]) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1248 | networks.append((ssid, mac, channel, rssi, security)) |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1249 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1250 | return networks, "" |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1251 | |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1252 | def deactivateInterface(self, interface): |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1253 | """ |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1254 | Public method to deactivate a given WiFi interface of the connected device. |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1255 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1256 | @param interface designation of the interface to be deactivated (one of 'AP' |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1257 | or 'STA') |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1258 | @type str |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1259 | @return tuple containg a flag indicating success and an error message |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1260 | @rtype tuple of (bool, str) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1261 | @exception ValueError raised to indicate a wrong value for the interface type |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1262 | """ |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1263 | if interface not in ("STA", "AP"): |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1264 | raise ValueError( |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1265 | "interface must be 'AP' or 'STA', got '{0}'".format(interface) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1266 | ) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1267 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1268 | if self._deviceData["wifi_type"] == "picow": |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1269 | command = """ |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1270 | def deactivate(): |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1271 | import network |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1272 | from time import sleep |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1273 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1274 | wifi = network.WLAN(network.{0}_IF) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1275 | wifi.active(False) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1276 | sleep(0.1) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1277 | print(not wifi.active()) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1278 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1279 | deactivate() |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1280 | del deactivate |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1281 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1282 | interface |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1283 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1284 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1285 | command = """ |
1286 | def deactivate(): | |
1287 | import picowireless as pw | |
1288 | ||
1289 | pw.init() | |
1290 | print(True) | |
1291 | ||
1292 | deactivate() | |
1293 | del deactivate | |
1294 | """ | |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1295 | else: |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1296 | return super().deactivateInterface(interface) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1297 | |
9989 | 1298 | out, err = self.executeCommands(command, mode=self._submitMode) |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1299 | if err: |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1300 | return False, err |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1301 | else: |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1302 | return out.decode("utf-8").strip() == "True", "" |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1303 | |
10153 | 1304 | def startAccessPoint( |
1305 | self, | |
1306 | ssid, | |
1307 | security=None, | |
1308 | password=None, | |
1309 | hostname=None, | |
1310 | ifconfig=None, | |
1311 | ): | |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1312 | """ |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1313 | Public method to start the access point interface. |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1314 | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1315 | @param ssid SSID of the access point |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1316 | @type str |
11236 | 1317 | @param security security mode (defaults to None) (unused) |
1318 | @type str (optional) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1319 | @param password password (defaults to None) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1320 | @type str (optional) |
10153 | 1321 | @param hostname host name of the device (defaults to None) |
1322 | @type str (optional) | |
9797 | 1323 | @param ifconfig IPv4 configuration for the access point if not default |
1324 | (IPv4 address, netmask, gateway address, DNS server address) | |
1325 | @type tuple of (str, str, str, str) | |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1326 | @return tuple containing a flag indicating success and an error message |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1327 | @rtype tuple of (bool, str) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1328 | """ |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1329 | if security is None or password is None: |
11236 | 1330 | security = "SEC_OPEN" |
10170
6cf1ee737d8f
Corrected some more code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10153
diff
changeset
|
1331 | password = "" # secok |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1332 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1333 | if self._deviceData["wifi_type"] == "picow": |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1334 | country = Preferences.getMicroPython("WifiCountry").upper() |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1335 | command = """ |
11236 | 1336 | def start_ap(ssid, password, hostname, ifconfig, country): |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1337 | import network |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1338 | import rp2 |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1339 | from time import sleep |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1340 | |
9797 | 1341 | rp2.country(country) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1342 | |
10153 | 1343 | if hostname: |
1344 | try: | |
1345 | network.hostname(hostname) | |
1346 | except AttributeError: | |
1347 | pass | |
1348 | ||
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1349 | ap = network.WLAN(network.AP_IF) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1350 | ap.active(True) |
9797 | 1351 | if ifconfig: |
1352 | ap.ifconfig(ifconfig) | |
11236 | 1353 | ap.config(ssid=ssid, security=network.WLAN.{5}, password=password) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1354 | sleep(0.1) |
11166
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
1355 | print(ap.status() == network.STAT_GOT_IP) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1356 | |
11236 | 1357 | start_ap({0}, {1}, {2}, {3}, {4}) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1358 | del start_ap |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1359 | """.format( |
9797 | 1360 | repr(ssid), |
1361 | repr(password), | |
10153 | 1362 | repr(hostname), |
9797 | 1363 | ifconfig, |
1364 | repr(country if country else "XX"), | |
11236 | 1365 | security, |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1366 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1367 | elif self._deviceData["wifi_type"] == "picowireless": |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1368 | if ifconfig: |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1369 | return ( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1370 | False, |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1371 | self.tr( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1372 | "Pico Wireless does not support setting the IPv4 parameters of" |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1373 | " the WiFi access point." |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1374 | ), |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1375 | ) |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1376 | |
9836 | 1377 | # AP is fixed at channel 6 |
1378 | command = """ | |
1379 | def start_ap(ssid, password): | |
1380 | import picowireless as pw | |
1381 | ||
1382 | pw.init() | |
1383 | if bool(password): | |
1384 | res = pw.wifi_set_ap_passphrase(ssid, password, 6) | |
1385 | else: | |
1386 | res = pw.wifi_set_ap_network(ssid, 6) | |
1387 | status = pw.get_connection_status() | |
1388 | if status in (7, 8): | |
1389 | pw.set_led(0, 64, 0) | |
1390 | else: | |
1391 | pw.set_led(64, 0, 0) | |
1392 | print(res >= 0) | |
1393 | ||
1394 | start_ap({0}, {1}) | |
1395 | del start_ap | |
1396 | """.format( | |
1397 | repr(ssid), | |
1398 | repr(password if password else ""), | |
1399 | ) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1400 | else: |
10153 | 1401 | return super().startAccessPoint( |
1402 | ssid, | |
1403 | security=security, | |
1404 | password=password, | |
1405 | hostname=hostname, | |
1406 | ifconfig=ifconfig, | |
1407 | ) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1408 | |
9989 | 1409 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1410 | if err: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1411 | return False, err |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1412 | else: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1413 | return out.decode("utf-8").strip() == "True", "" |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1414 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1415 | def stopAccessPoint(self): |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1416 | """ |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1417 | Public method to stop the access point interface. |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1418 | |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1419 | @return tuple containg a flag indicating success and an error message |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1420 | @rtype tuple of (bool, str) |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1421 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1422 | if self._deviceData["wifi_type"] in ("picow", "picowireless"): |
9782
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1423 | return self.deactivateInterface("AP") |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1424 | else: |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1425 | return super().stopAccessPoint() |
67414f28db68
Continued implementing WiFi functionality for RP2040 based devices (interface deactivation, AP stop, MicroPython config page).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9781
diff
changeset
|
1426 | |
11237 | 1427 | def getSecurityModes(self): |
1428 | """ | |
1429 | Public method to get a list of security modes supported by the device. | |
1430 | ||
1431 | @return list of supported security modes | |
1432 | @rtype list of str | |
1433 | """ | |
1434 | if self._deviceData["wifi_type"] == "picowireless": | |
1435 | # Pimoroni picowireless supports just WPA2 in AP mode. | |
1436 | return ["SEC_WPA2"] | |
1437 | else: | |
1438 | return super().getSecurityModes() | |
1439 | ||
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1440 | def getConnectedClients(self): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1441 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1442 | Public method to get a list of connected clients. |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1443 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1444 | @return a tuple containing a list of tuples containing the client MAC-Address |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1445 | and the RSSI (if supported and available) and an error message |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1446 | @rtype tuple of ([(bytes, int)], str) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1447 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1448 | if self._deviceData["wifi_type"] == "picow": |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1449 | command = """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1450 | def get_stations(): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1451 | import network |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1452 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1453 | ap = network.WLAN(network.AP_IF) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1454 | stations = ap.status('stations') |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1455 | print(stations) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1456 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1457 | get_stations() |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1458 | del get_stations |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1459 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1460 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1461 | return ( |
1462 | [], | |
1463 | self.tr( | |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1464 | "Pico Wireless does not support reporting of connected clients." |
9836 | 1465 | ), |
1466 | ) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1467 | else: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1468 | return super().checkInternet() |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1469 | |
9989 | 1470 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1471 | if err: |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1472 | return [], err |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1473 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1474 | clientsList = ast.literal_eval(out.decode("utf-8")) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1475 | return clientsList, "" |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1476 | |
10022 | 1477 | def enableWebrepl(self, password): |
1478 | """ | |
1479 | Public method to write the given WebREPL password to the connected device and | |
1480 | modify the start script to start the WebREPL server. | |
1481 | ||
1482 | @param password password needed to authenticate | |
1483 | @type str | |
1484 | @return tuple containing a flag indicating success and an error message | |
1485 | @rtype tuple of (bool, str) | |
1486 | """ | |
1487 | command = """ | |
1488 | def modify_boot(): | |
1489 | import os | |
1490 | ||
1491 | try: | |
1492 | with open('/boot.py', 'r') as old_f, open('/boot.py.tmp', 'w') as new_f: | |
1493 | found = False | |
1494 | for l in old_f.read().splitlines(): | |
1495 | if 'webrepl' in l: | |
1496 | found = True | |
1497 | if l.startswith('#'): | |
1498 | l = l[1:] | |
1499 | new_f.write(l + '\\n') | |
1500 | if not found: | |
1501 | new_f.write('\\nimport webrepl\\nwebrepl.start()\\n') | |
1502 | ||
1503 | os.remove('/boot.py') | |
1504 | os.rename('/boot.py.tmp', '/boot.py') | |
1505 | except: | |
1506 | pass | |
1507 | ||
1508 | print(True) | |
1509 | ||
1510 | modify_boot() | |
1511 | del modify_boot | |
1512 | """ | |
1513 | ||
1514 | if self._deviceData["wifi_type"] == "picow": | |
1515 | config = "PASS = {0}\n".format(repr(password)) | |
1516 | else: | |
1517 | return False, self.tr("WebREPL is not supported on this device.") | |
1518 | ||
1519 | try: | |
1520 | # write config file | |
1521 | self.putData("/webrepl_cfg.py", config.encode("utf-8")) | |
1522 | except OSError as err: | |
1523 | return False, str(err) | |
1524 | ||
1525 | # modify boot.py | |
1526 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1527 | if err: | |
1528 | return False, err | |
1529 | ||
1530 | return out.decode("utf-8").strip() == "True", "" | |
1531 | ||
1532 | def disableWebrepl(self): | |
1533 | """ | |
1534 | Public method to write the given WebREPL password to the connected device and | |
1535 | modify the start script to start the WebREPL server. | |
1536 | ||
1537 | @return tuple containing a flag indicating success and an error message | |
1538 | @rtype tuple of (bool, str) | |
1539 | """ | |
1540 | command = """ | |
1541 | def modify_boot(): | |
1542 | import os | |
1543 | ||
1544 | try: | |
1545 | with open('/boot.py', 'r') as old_f, open('/boot.py.tmp', 'w') as new_f: | |
1546 | for l in old_f.read().splitlines(): | |
1547 | if 'webrepl' in l: | |
1548 | if not l.startswith('#'): | |
1549 | l = '#' + l | |
1550 | new_f.write(l + '\\n') | |
1551 | ||
1552 | os.remove('/boot.py') | |
1553 | os.rename('/boot.py.tmp', '/boot.py') | |
1554 | except: | |
1555 | pass | |
1556 | ||
1557 | print(True) | |
1558 | ||
1559 | modify_boot() | |
1560 | del modify_boot | |
1561 | """ | |
1562 | ||
1563 | # modify boot.py | |
1564 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1565 | if err: | |
1566 | return False, err | |
1567 | ||
1568 | return out.decode("utf-8").strip() == "True", "" | |
1569 | ||
10153 | 1570 | @pyqtSlot() |
1571 | def __setCountry(self): | |
1572 | """ | |
10897 | 1573 | Private slot to configure the country of the connected device. |
10153 | 1574 | |
1575 | The country is the two-letter ISO 3166-1 Alpha-2 country code. | |
1576 | """ | |
1577 | from ..WifiDialogs.WifiCountryDialog import WifiCountryDialog | |
1578 | ||
11005
b918c6c2736b
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10897
diff
changeset
|
1579 | dlg = WifiCountryDialog(parent=self.microPython) |
10153 | 1580 | if dlg.exec() == QDialog.DialogCode.Accepted: |
1581 | country, remember = dlg.getCountry() | |
1582 | if remember: | |
1583 | Preferences.setMicroPython("WifiCountry", country) | |
1584 | ||
1585 | command = """ | |
1586 | try: | |
1587 | import network | |
1588 | network.country({0}) | |
1589 | except AttributeError: | |
1590 | import rp2 | |
1591 | rp2.country({0}) | |
1592 | """.format( | |
1593 | repr(country) | |
1594 | ) | |
1595 | ||
1596 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1597 | if err: | |
1598 | self.microPython.showError("country()", err) | |
1599 | ||
1600 | @pyqtSlot() | |
1601 | def __resetCountry(self): | |
1602 | """ | |
1603 | Private slot to reset the country of the connected ESP32 device. | |
1604 | ||
1605 | The country is the two-letter ISO 3166-1 Alpha-2 country code. This method | |
1606 | resets it to the default code 'XX' representing the "worldwide" region. | |
1607 | """ | |
1608 | command = """ | |
1609 | try: | |
1610 | import network | |
1611 | network.country('XX') | |
1612 | except AttributeError: | |
1613 | pass | |
1614 | """ | |
1615 | ||
1616 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1617 | if err: | |
1618 | self.microPython.showError("country()", err) | |
1619 | ||
9868 | 1620 | ################################################################## |
10089 | 1621 | ## Methods below implement Bluetooth related methods |
1622 | ################################################################## | |
1623 | ||
1624 | def hasBluetooth(self): | |
1625 | """ | |
1626 | Public method to check the availability of Bluetooth. | |
1627 | ||
1628 | @return flag indicating the availability of Bluetooth | |
1629 | @rtype bool | |
1630 | @exception OSError raised to indicate an issue with the device | |
1631 | """ | |
1632 | command = """ | |
1633 | def has_bt(): | |
1634 | try: | |
1635 | import bluetooth | |
1636 | if hasattr(bluetooth, 'BLE'): | |
11051 | 1637 | ble = bluetooth.BLE() |
1638 | if not ble.active(): | |
1639 | ble.active(True) | |
1640 | ble.active(False) | |
10089 | 1641 | return True |
11051 | 1642 | except (ImportError, OSError): |
10089 | 1643 | pass |
1644 | ||
1645 | return False | |
1646 | ||
1647 | print(has_bt()) | |
1648 | del has_bt | |
1649 | """ | |
1650 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) | |
1651 | if err: | |
1652 | raise OSError(self._shortError(err)) | |
1653 | return out.strip() == b"True" | |
1654 | ||
1655 | def getBluetoothStatus(self): | |
1656 | """ | |
1657 | Public method to get Bluetooth status data of the connected board. | |
1658 | ||
1659 | @return list of tuples containing the translated status data label and | |
1660 | the associated value | |
1661 | @rtype list of tuples of (str, str) | |
1662 | @exception OSError raised to indicate an issue with the device | |
1663 | """ | |
1664 | command = """ | |
1665 | def ble_status(): | |
1666 | import bluetooth | |
1667 | import ubinascii | |
1668 | import ujson | |
1669 | ||
1670 | ble = bluetooth.BLE() | |
1671 | ||
1672 | ble_active = ble.active() | |
1673 | if not ble_active: | |
1674 | ble.active(True) | |
1675 | ||
1676 | res = { | |
1677 | 'active': ble_active, | |
1678 | 'mac': ubinascii.hexlify(ble.config('mac')[1], ':').decode(), | |
1679 | 'addr_type': ble.config('mac')[0], | |
1680 | 'name': ble.config('gap_name'), | |
1681 | 'mtu': ble.config('mtu'), | |
1682 | } | |
1683 | ||
1684 | if not ble_active: | |
1685 | ble.active(False) | |
1686 | ||
1687 | print(ujson.dumps(res)) | |
1688 | ||
1689 | ble_status() | |
1690 | del ble_status | |
1691 | """ | |
1692 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1693 | if err: | |
1694 | raise OSError(self._shortError(err)) | |
1695 | ||
1696 | status = [] | |
1697 | bleStatus = json.loads(out.decode("utf-8")) | |
1698 | status.append((self.tr("Active"), self.bool2str(bleStatus["active"]))) | |
1699 | status.append((self.tr("Name"), bleStatus["name"])) | |
1700 | status.append((self.tr("MAC-Address"), bleStatus["mac"])) | |
1701 | status.append( | |
1702 | ( | |
1703 | self.tr("Address Type"), | |
1704 | self.tr("Public") if bleStatus == 0 else self.tr("Random"), | |
1705 | ) | |
1706 | ) | |
1707 | status.append((self.tr("MTU"), self.tr("{0} Bytes").format(bleStatus["mtu"]))) | |
1708 | ||
1709 | return status | |
1710 | ||
1711 | def activateBluetoothInterface(self): | |
1712 | """ | |
1713 | Public method to activate the Bluetooth interface. | |
1714 | ||
1715 | @return flag indicating the new state of the Bluetooth interface | |
1716 | @rtype bool | |
1717 | @exception OSError raised to indicate an issue with the device | |
1718 | """ | |
1719 | command = """ | |
1720 | def activate_ble(): | |
1721 | import bluetooth | |
1722 | ||
1723 | ble = bluetooth.BLE() | |
1724 | if not ble.active(): | |
1725 | ble.active(True) | |
1726 | print(ble.active()) | |
1727 | ||
1728 | activate_ble() | |
1729 | del activate_ble | |
1730 | """ | |
1731 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1732 | if err: | |
1733 | raise OSError(self._shortError(err)) | |
1734 | ||
1735 | return out.strip() == b"True" | |
1736 | ||
1737 | def deactivateBluetoothInterface(self): | |
1738 | """ | |
1739 | Public method to deactivate the Bluetooth interface. | |
1740 | ||
1741 | @return flag indicating the new state of the Bluetooth interface | |
1742 | @rtype bool | |
1743 | @exception OSError raised to indicate an issue with the device | |
1744 | """ | |
1745 | command = """ | |
1746 | def deactivate_ble(): | |
1747 | import bluetooth | |
1748 | ||
1749 | ble = bluetooth.BLE() | |
1750 | if ble.active(): | |
1751 | ble.active(False) | |
1752 | print(ble.active()) | |
1753 | ||
1754 | deactivate_ble() | |
1755 | del deactivate_ble | |
1756 | """ | |
1757 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1758 | if err: | |
1759 | raise OSError(self._shortError(err)) | |
1760 | ||
1761 | return out.strip() == b"True" | |
1762 | ||
1763 | def getDeviceScan(self, timeout=10): | |
1764 | """ | |
1765 | Public method to perform a Bluetooth device scan. | |
1766 | ||
1767 | @param timeout duration of the device scan in seconds (defaults | |
1768 | to 10) | |
1769 | @type int (optional) | |
1770 | @return tuple containing a dictionary with the scan results and | |
1771 | an error string | |
1772 | @rtype tuple of (dict, str) | |
1773 | """ | |
1774 | from ..BluetoothDialogs.BluetoothAdvertisement import BluetoothAdvertisement | |
1775 | ||
1776 | command = """ | |
1777 | _scan_done = False | |
1778 | ||
1779 | def ble_scan(): | |
1780 | import bluetooth | |
1781 | import time | |
1782 | import ubinascii | |
1783 | ||
1784 | IRQ_SCAN_RESULT = 5 | |
1785 | IRQ_SCAN_DONE = 6 | |
1786 | ||
1787 | def _bleIrq(event, data): | |
1788 | global _scan_done | |
1789 | if event == IRQ_SCAN_RESULT: | |
1790 | addr_type, addr, adv_type, rssi, adv_data = data | |
1791 | if addr: | |
1792 | print({{ | |
1793 | 'address': ubinascii.hexlify(addr,':').decode('utf-8'), | |
1794 | 'rssi': rssi, | |
1795 | 'adv_type': adv_type, | |
1796 | 'advertisement': bytes(adv_data), | |
1797 | }}) | |
1798 | elif event == IRQ_SCAN_DONE: | |
1799 | _scan_done = True | |
1800 | ||
1801 | ble = bluetooth.BLE() | |
1802 | ||
1803 | ble_active = ble.active() | |
1804 | if not ble_active: | |
1805 | ble.active(True) | |
1806 | ||
1807 | ble.irq(_bleIrq) | |
1808 | ble.gap_scan({0} * 1000, 1000000, 50000, True) | |
1809 | while not _scan_done: | |
1810 | time.sleep(0.2) | |
1811 | ||
1812 | if not ble_active: | |
1813 | ble.active(False) | |
1814 | ||
1815 | ble_scan() | |
1816 | del ble_scan, _scan_done | |
1817 | """.format( | |
1818 | timeout | |
1819 | ) | |
1820 | out, err = self.executeCommands( | |
1821 | command, mode=self._submitMode, timeout=(timeout + 5) * 1000 | |
1822 | ) | |
1823 | if err: | |
1824 | return {}, err | |
1825 | ||
1826 | scanResults = {} | |
1827 | for line in out.decode("utf-8").splitlines(): | |
1828 | res = ast.literal_eval(line) | |
1829 | address = res["address"] | |
1830 | if address not in scanResults: | |
1831 | scanResults[address] = BluetoothAdvertisement(address) | |
1832 | scanResults[address].update( | |
1833 | res["adv_type"], res["rssi"], res["advertisement"] | |
1834 | ) | |
1835 | ||
1836 | return scanResults, "" | |
1837 | ||
11167 | 1838 | def supportsDeviceScan(self): |
1839 | """ | |
1840 | Public method to indicate, that the Bluetooth implementation supports | |
1841 | scanning for devices. | |
1842 | ||
1843 | @return flag indicating that the scanning function is supported | |
1844 | @rtype bool | |
1845 | """ | |
1846 | return True | |
1847 | ||
10089 | 1848 | ################################################################## |
9878 | 1849 | ## Methods below implement Ethernet related methods |
1850 | ################################################################## | |
1851 | ||
1852 | def hasEthernet(self): | |
1853 | """ | |
1854 | Public method to check the availability of Ethernet. | |
1855 | ||
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1856 | @return tuple containing a flag indicating the availability of Ethernet |
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1857 | and the Ethernet type (picowiz) |
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1858 | @rtype tuple of (bool, str) |
9878 | 1859 | @exception OSError raised to indicate an issue with the device |
1860 | """ | |
1861 | command = """ | |
1862 | def has_eth(): | |
1863 | try: | |
1864 | import network | |
1865 | if hasattr(network, 'WIZNET5K'): | |
1866 | return True, 'picowiz' | |
1867 | except ImportError: | |
1868 | pass | |
1869 | ||
1870 | return False, '' | |
1871 | ||
1872 | print(has_eth()) | |
1873 | del has_eth | |
1874 | """ | |
1875 | ||
9989 | 1876 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9878 | 1877 | if err: |
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1878 | raise OSError(self._shortError(err)) |
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1879 | |
9878 | 1880 | return ast.literal_eval(out.decode("utf-8")) |
1881 | ||
1882 | def getEthernetStatus(self): | |
1883 | """ | |
1884 | Public method to get Ethernet status data of the connected board. | |
1885 | ||
1886 | @return list of tuples containing the translated status data label and | |
11263 | 1887 | the associated value and a dictionary with keys 'ipv4' and 'ipv6' |
1888 | containing the respective address information | |
1889 | @rtype tuple of list of tuples of (str, str) and dict | |
9878 | 1890 | @exception OSError raised to indicate an issue with the device |
1891 | """ | |
1892 | command = """{0} | |
1893 | def ethernet_status(): | |
1894 | import network | |
1895 | import ubinascii | |
1896 | import ujson | |
1897 | ||
1898 | w5x00_init() | |
1899 | ||
1900 | res = {{ | |
1901 | 'active': nic.active(), | |
1902 | 'connected': nic.isconnected(), | |
1903 | 'status': nic.status(), | |
1904 | 'mac': ubinascii.hexlify(nic.config('mac'), ':').decode(), | |
1905 | }} | |
10153 | 1906 | try: |
11263 | 1907 | res['ipv4_addr'] = ( |
1908 | nic.ipconfig('addr4') + (nic.ipconfig('gw4'), network.ipconfig('dns')) | |
1909 | ) | |
1910 | except AttributeError: | |
1911 | res['ipv4_addr'] = nic.ifconfig() | |
1912 | try: | |
1913 | res['ipv6_addr'] = [a[0] for a in nic.ipconfig('addr6')] | |
1914 | except ValueError: | |
1915 | res['ipv6_addr'] = [] | |
1916 | try: | |
10153 | 1917 | res['hostname'] = network.hostname() |
1918 | except AttributeError: | |
1919 | res['hostname'] = '' | |
11263 | 1920 | try: |
1921 | res['prefer'] = network.ipconfig('prefer') | |
1922 | except ValueError: | |
1923 | res['prefer'] = 4 | |
9878 | 1924 | print(ujson.dumps(res)) |
1925 | ||
1926 | ethernet_status() | |
1927 | del ethernet_status, w5x00_init | |
1928 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
1929 | WiznetUtilities.mpyWiznetInit() |
9878 | 1930 | ) |
1931 | ||
9989 | 1932 | out, err = self.executeCommands(command, mode=self._submitMode) |
9878 | 1933 | if err: |
1934 | raise OSError(self._shortError(err)) | |
1935 | ||
1936 | ethStatus = json.loads(out.decode("utf-8")) | |
11263 | 1937 | status = [ |
1938 | (self.tr("Active"), self.bool2str(ethStatus["active"])), | |
1939 | (self.tr("Connected"), self.bool2str(ethStatus["connected"])), | |
9878 | 1940 | ( |
1941 | self.tr("Status"), | |
1942 | self.__statusTranslations["picowiz"][ethStatus["status"]], | |
11263 | 1943 | ), |
10153 | 1944 | ( |
1945 | self.tr("Hostname"), | |
1946 | ethStatus["hostname"] if ethStatus["hostname"] else self.tr("unknown"), | |
11263 | 1947 | ), |
1948 | (self.tr("MAC-Address"), ethStatus["mac"]), | |
1949 | ] | |
1950 | addressInfo = { | |
1951 | "ipv4": ethStatus["ipv4_addr"], | |
1952 | "ipv6": ethStatus["ipv6_addr"], | |
1953 | } | |
9878 | 1954 | |
11263 | 1955 | return status, addressInfo |
9878 | 1956 | |
10153 | 1957 | def connectToLan(self, config, hostname): |
9878 | 1958 | """ |
1959 | Public method to connect the connected device to the LAN. | |
1960 | ||
1961 | @param config configuration for the connection (either the string 'dhcp' | |
1962 | for a dynamic address or a tuple of four strings with the IPv4 parameters. | |
1963 | @type str or tuple of (str, str, str, str) | |
10153 | 1964 | @param hostname host name of the device |
1965 | @type str | |
9878 | 1966 | @return tuple containing a flag indicating success and an error message |
1967 | @rtype tuple of (bool, str) | |
1968 | """ | |
1969 | command = """{0} | |
10153 | 1970 | def connect_lan(config, hostname): |
1971 | import network | |
9878 | 1972 | import time |
1973 | ||
10153 | 1974 | if hostname: |
1975 | try: | |
1976 | network.hostname(hostname) | |
1977 | except AttributeError: | |
1978 | pass | |
1979 | ||
9878 | 1980 | w5x00_init() |
1981 | ||
1982 | nic.active(False) | |
1983 | nic.active(True) | |
1984 | nic.ifconfig(config) | |
1985 | max_wait = 140 | |
1986 | while max_wait: | |
1987 | if nic.isconnected(): | |
1988 | break | |
1989 | max_wait -= 1 | |
1990 | time.sleep(0.1) | |
1991 | print(nic.isconnected()) | |
1992 | ||
10153 | 1993 | connect_lan({1}, {2}) |
9878 | 1994 | del connect_lan, w5x00_init |
1995 | """.format( | |
10153 | 1996 | WiznetUtilities.mpyWiznetInit(), |
1997 | "'dhcp'" if config == "dhcp" else config, | |
1998 | repr(hostname) if hostname else "''", | |
9878 | 1999 | ) |
2000 | ||
2001 | with EricOverrideCursor(): | |
9989 | 2002 | out, err = self.executeCommands( |
9878 | 2003 | command, mode=self._submitMode, timeout=15000 |
2004 | ) | |
2005 | if err: | |
2006 | return False, err | |
2007 | ||
2008 | return out.strip() == b"True", "" | |
2009 | ||
2010 | def disconnectFromLan(self): | |
2011 | """ | |
2012 | Public method to disconnect from the LAN. | |
2013 | ||
2014 | @return tuple containing a flag indicating success and an error message | |
2015 | @rtype tuple of (bool, str) | |
2016 | """ | |
2017 | command = """{0} | |
2018 | def disconnect_lan(): | |
2019 | import time | |
2020 | ||
2021 | w5x00_init() | |
2022 | ||
2023 | nic.active(False) | |
2024 | time.sleep(0.1) | |
2025 | print(not nic.isconnected()) | |
2026 | ||
2027 | disconnect_lan() | |
2028 | del disconnect_lan, w5x00_init | |
2029 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2030 | WiznetUtilities.mpyWiznetInit(), |
9878 | 2031 | ) |
2032 | ||
2033 | with EricOverrideCursor(): | |
9989 | 2034 | out, err = self.executeCommands( |
9878 | 2035 | command, mode=self._submitMode, timeout=15000 |
2036 | ) | |
2037 | if err: | |
2038 | return False, err | |
2039 | ||
10144 | 2040 | return out.strip() == b"True", "" |
2041 | ||
2042 | def isLanConnected(self): | |
2043 | """ | |
2044 | Public method to check the LAN connection status. | |
2045 | ||
2046 | @return flag indicating that the device is connected to the LAN | |
2047 | @rtype bool | |
2048 | """ | |
2049 | command = """{0} | |
2050 | def is_connected(): | |
2051 | import network | |
10138 | 2052 | |
10144 | 2053 | w5x00_init() |
2054 | ||
2055 | print(nic.isconnected()) | |
2056 | ||
2057 | is_connected() | |
2058 | del is_connected, w5x00_init | |
2059 | """.format( | |
2060 | WiznetUtilities.mpyWiznetInit(), | |
2061 | ) | |
2062 | ||
2063 | out, err = self.executeCommands(command, mode=self._submitMode) | |
2064 | if err: | |
2065 | return False | |
2066 | ||
2067 | return out.strip() == b"True" | |
9878 | 2068 | |
2069 | def checkInternetViaLan(self): | |
2070 | """ | |
2071 | Public method to check, if the internet can be reached (LAN variant). | |
2072 | ||
2073 | @return tuple containing a flag indicating reachability and an error string | |
2074 | @rtype tuple of (bool, str) | |
2075 | """ | |
2076 | command = """{0} | |
2077 | def check_internet(): | |
2078 | import network | |
2079 | import socket | |
2080 | ||
2081 | w5x00_init() | |
2082 | ||
2083 | if nic.isconnected(): | |
2084 | s = socket.socket() | |
2085 | try: | |
10233
51a6649ba79d
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10170
diff
changeset
|
2086 | s.connect(socket.getaddrinfo('quad9.net', 443)[0][-1]) |
9878 | 2087 | s.close() |
2088 | print(True) | |
2089 | except: | |
2090 | print(False) | |
2091 | else: | |
2092 | print(False) | |
2093 | ||
2094 | check_internet() | |
2095 | del check_internet, w5x00_init | |
2096 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2097 | WiznetUtilities.mpyWiznetInit(), |
9878 | 2098 | ) |
2099 | ||
9989 | 2100 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9878 | 2101 | if err: |
2102 | return False, err | |
2103 | ||
2104 | return out.strip() == b"True", "" | |
2105 | ||
2106 | def deactivateEthernet(self): | |
2107 | """ | |
2108 | Public method to deactivate the Ethernet interface of the connected device. | |
2109 | ||
2110 | @return tuple containg a flag indicating success and an error message | |
2111 | @rtype tuple of (bool, str) | |
2112 | """ | |
2113 | # The WIZnet 5x00 interface cannot be switched off explicitly. That means, | |
2114 | # disconnect from the LAN is all we can do. | |
2115 | ||
2116 | return self.disconnectFromLan() | |
2117 | ||
10153 | 2118 | def writeLanAutoConnect(self, config, hostname): |
9878 | 2119 | """ |
2120 | Public method to generate a script and associated configuration to connect the | |
2121 | device to the LAN during boot time. | |
2122 | ||
2123 | @param config configuration for the connection (either the string 'dhcp' | |
2124 | for a dynamic address or a tuple of four strings with the IPv4 parameters. | |
2125 | @type str or tuple of (str, str, str, str) | |
10153 | 2126 | @param hostname host name of the device |
2127 | @type str | |
9878 | 2128 | @return tuple containing a flag indicating success and an error message |
2129 | @rtype tuple of (bool, str) | |
2130 | """ | |
2131 | command = """ | |
2132 | def modify_boot(): | |
2133 | add = True | |
2134 | try: | |
2135 | with open('/boot.py', 'r') as f: | |
2136 | for ln in f.readlines(): | |
2137 | if 'wiznet_connect' in ln: | |
2138 | add = False | |
2139 | break | |
2140 | except: | |
2141 | pass | |
2142 | if add: | |
2143 | with open('/boot.py', 'a') as f: | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2144 | f.write('\\n') |
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2145 | f.write('import wiznet_connect\\n') |
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2146 | f.write('nic = wiznet_connect.connect_lan()\\n') |
9878 | 2147 | print(True) |
2148 | ||
2149 | modify_boot() | |
2150 | del modify_boot | |
2151 | """ | |
10153 | 2152 | devconfig = "ifconfig = {0}\nhostname = {1}".format( |
2153 | "'dhcp'" if config == "dhcp" else config, | |
2154 | repr(hostname) if hostname else "''", | |
2155 | ) | |
9878 | 2156 | try: |
2157 | # write secrets file | |
10153 | 2158 | self.putData("/wiznet_config.py", devconfig.encode("utf-8")) |
9878 | 2159 | # copy auto-connect file |
2160 | self.put( | |
2161 | os.path.join( | |
2162 | os.path.dirname(__file__), "MCUScripts", "picoWiznetConnect.py" | |
2163 | ), | |
2164 | "/wiznet_connect.py", | |
2165 | ) | |
2166 | except OSError as err: | |
2167 | return False, str(err) | |
2168 | ||
2169 | # modify boot.py | |
9989 | 2170 | out, err = self.executeCommands(command, mode=self._submitMode) |
9878 | 2171 | if err: |
2172 | return False, err | |
2173 | ||
2174 | return out.decode("utf-8").strip() == "True", "" | |
2175 | ||
2176 | def removeLanAutoConnect(self): | |
2177 | """ | |
2178 | Public method to remove the saved IPv4 parameters from the connected device. | |
2179 | ||
2180 | Note: This disables the LAN auto-connect feature. | |
2181 | ||
2182 | @return tuple containing a flag indicating success and an error message | |
2183 | @rtype tuple of (bool, str) | |
2184 | """ | |
2185 | try: | |
2186 | self.rm("/wiznet_config.py") | |
2187 | except OSError as err: | |
2188 | return False, str(err) | |
2189 | ||
2190 | return True, "" | |
2191 | ||
2192 | ################################################################## | |
9868 | 2193 | ## Methods below implement NTP related methods |
2194 | ################################################################## | |
2195 | ||
2196 | def hasNetworkTime(self): | |
2197 | """ | |
2198 | Public method to check the availability of network time functions. | |
2199 | ||
2200 | @return flag indicating the availability of network time functions | |
2201 | @rtype bool | |
9870
0399d3607829
Fixed a few code formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9868
diff
changeset
|
2202 | @exception OSError raised to indicate an issue with the device |
9868 | 2203 | """ |
2204 | command = """ | |
2205 | def has_ntp(): | |
2206 | try: | |
2207 | import ntptime | |
2208 | return True | |
2209 | except ImportError: | |
2210 | return False | |
2211 | ||
2212 | print(has_ntp()) | |
2213 | del has_ntp | |
2214 | """ | |
9989 | 2215 | out, err = self.executeCommands(command, mode=self._submitMode) |
9868 | 2216 | if err: |
2217 | raise OSError(self._shortError(err)) | |
2218 | return out.strip() == b"True" | |
2219 | ||
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2220 | def setNetworkTime(self, server="pool.ntp.org", tzOffset=0, timeout=10): |
9868 | 2221 | """ |
2222 | Public method to set the time to the network time retrieved from an | |
2223 | NTP server. | |
2224 | ||
2225 | @param server name of the NTP server to get the network time from | |
2226 | (defaults to "0.pool.ntp.org") | |
2227 | @type str (optional) | |
2228 | @param tzOffset offset with respect to UTC (defaults to 0) | |
2229 | @type int (optional) | |
2230 | @param timeout maximum time to wait for a server response in seconds | |
2231 | (defaults to 10) | |
2232 | @type int | |
2233 | @return tuple containing a flag indicating success and an error string | |
2234 | @rtype tuple of (bool, str) | |
2235 | """ | |
2236 | command = """ | |
2237 | def set_ntp_time(server, tz_offset, timeout): | |
2238 | import network | |
2239 | import ntptime | |
2240 | import machine | |
2241 | ||
9878 | 2242 | if hasattr(network, 'WLAN') and not network.WLAN(network.STA_IF).isconnected(): |
9868 | 2243 | return False |
9878 | 2244 | elif hasattr(network, 'WIZNET5K'): |
2245 | try: | |
2246 | if not nic.isconnected(): | |
2247 | return False | |
2248 | except NameError: | |
2249 | return False | |
9868 | 2250 | |
2251 | ntptime.host = server | |
2252 | ntptime.timeout = timeout | |
2253 | ntptime.settime() | |
2254 | ||
2255 | rtc = machine.RTC() | |
2256 | t = list(rtc.datetime()) | |
2257 | t[4] += tz_offset | |
2258 | rtc.datetime(t) | |
2259 | ||
2260 | return True | |
2261 | ||
2262 | try: | |
2263 | print({{ | |
2264 | 'result': set_ntp_time({0}, {1}, {2}), | |
2265 | 'error': '', | |
2266 | }}) | |
2267 | except Exception as err: | |
2268 | print({{ | |
2269 | 'result': False, | |
2270 | 'error': str(err), | |
2271 | }}) | |
2272 | del set_ntp_time | |
2273 | """.format( | |
2274 | repr(server), tzOffset, timeout | |
2275 | ) | |
9989 | 2276 | out, err = self.executeCommands( |
9868 | 2277 | command, mode=self._submitMode, timeout=(timeout + 2) * 1000 |
2278 | ) | |
2279 | if err: | |
2280 | return False, err | |
2281 | else: | |
2282 | res = ast.literal_eval(out.decode("utf-8")) | |
2283 | return res["result"], res["error"] | |
2284 | ||
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2285 | |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
2286 | def createDevice(microPythonWidget, deviceType, _vid, _pid, _boardName, _serialNumber): |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2287 | """ |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2288 | Function to instantiate a MicroPython device object. |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2289 | |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2290 | @param microPythonWidget reference to the main MicroPython widget |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2291 | @type MicroPythonWidget |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2292 | @param deviceType device type assigned to this device interface |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2293 | @type str |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
2294 | @param _vid vendor ID (unused) |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2295 | @type int |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
2296 | @param _pid product ID (unused) |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2297 | @type int |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
2298 | @param _boardName name of the board (unused) |
9738 | 2299 | @type str |
10683
779cda568acb
Changed the source code and the source code documentation to improve the indication of unused method/function arguments.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10621
diff
changeset
|
2300 | @param _serialNumber serial number of the board (unused) |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
2301 | @type str |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2302 | @return reference to the instantiated device object |
10897 | 2303 | @rtype RP2Device |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2304 | """ |
10897 | 2305 | return RP2Device(microPythonWidget, deviceType) |