Fri, 25 Apr 2025 16:23:02 +0200
MicroPython
- Extended the handling of Access Point security/authmode settings to be more dynamic.
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", | |
88 | 5: "WPA2 (CCMP)", | |
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", |
94 | 4: "WPA2 (CCMP)", | |
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. | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
516 | command = """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
517 | def has_wifi(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
518 | try: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
519 | import network |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
520 | if hasattr(network, 'WLAN'): |
11051 | 521 | wifi = network.WLAN(network.STA_IF) |
522 | if not wifi.active(): | |
523 | wifi.active(True) | |
524 | wifi.active(False) | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
525 | return True, 'picow' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
526 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
527 | try: |
9836 | 528 | import picowireless as pw |
529 | try: | |
530 | if pw.get_fw_version() != '': | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
531 | return True, 'picowireless' |
9836 | 532 | 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
|
533 | pw.init() |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
534 | return True, 'picowireless' |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
535 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
536 | pass |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
537 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
538 | return False, '' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
539 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
540 | print(has_wifi()) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
541 | del has_wifi |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
542 | """ |
10327
6b1e6d7b26f0
RP2040Devices
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10326
diff
changeset
|
543 | 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
|
544 | if err: |
9836 | 545 | if not err.startswith(b"Timeout "): |
9835 | 546 | raise OSError(self._shortError(err)) |
547 | else: | |
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
548 | # 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
|
549 | return False, "" |
11051 | 550 | if b"Failed to start CYW43" in out: |
551 | # network module present but no CYW43 chip | |
552 | # (pimoroni firmware has everything) | |
553 | return False, "" | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
554 | return ast.literal_eval(out.decode("utf-8")) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
555 | |
10153 | 556 | def hasWifiCountry(self): |
557 | """ | |
558 | Public method to check, if the device has support to set the WiFi country. | |
559 | ||
560 | @return flag indicating the support of WiFi country | |
561 | @rtype bool | |
562 | """ | |
563 | return self._deviceData["wifi_type"] == "picow" | |
564 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
565 | def getWifiData(self): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
566 | """ |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
567 | 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
|
568 | |
9798 | 569 | @return tuple of three dictionaries containing the WiFi status data |
570 | for the WiFi client, access point and overall data | |
571 | @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
|
572 | @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
|
573 | """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
574 | if self._deviceData["wifi_type"] == "picow": |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
575 | command = """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
576 | def wifi_status(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
577 | import ubinascii |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
578 | import ujson |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
579 | 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
|
580 | import rp2 |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
581 | |
11236 | 582 | def security_str(mode): |
583 | for sm in [e for e in dir(network.WLAN) if e.startswith('SEC_')]: | |
584 | if getattr(network.WLAN, sm, 0) == mode: | |
585 | return sm | |
586 | return "" | |
587 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
588 | wifi = network.WLAN(network.STA_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
589 | station = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
590 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
591 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
592 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
593 | 'ifconfig': wifi.ifconfig(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
594 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
595 | 'channel': wifi.config('channel'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
596 | 'txpower': wifi.config('txpower'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
597 | } |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
598 | print(ujson.dumps(station)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
599 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
600 | wifi = network.WLAN(network.AP_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
601 | ap = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
602 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
603 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
604 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
605 | 'ifconfig': wifi.ifconfig(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
606 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
607 | 'channel': wifi.config('channel'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
608 | 'txpower': wifi.config('txpower'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
609 | 'essid': wifi.config('essid'), |
11236 | 610 | 'ap_security': security_str(wifi.config('security')), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
611 | } |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
612 | print(ujson.dumps(ap)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
613 | |
9798 | 614 | overall = { |
615 | 'active': station['active'] or ap['active'] | |
616 | } | |
10153 | 617 | try: |
618 | overall['country'] = network.country() | |
619 | except AttributeError: | |
620 | overall['country'] = rp2.country() | |
621 | try: | |
622 | overall['hostname'] = network.hostname() | |
623 | except AttributeError: | |
624 | pass | |
9798 | 625 | print(ujson.dumps(overall)) |
626 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
627 | wifi_status() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
628 | del wifi_status |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
629 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
630 | elif self._deviceData["wifi_type"] == "picowireless": |
9835 | 631 | command = """ |
632 | def wifi_status(): | |
633 | import picowireless as pw | |
634 | import ubinascii | |
635 | import ujson | |
636 | ||
637 | def ip_str(ip): | |
638 | return '.'.join(str(i) for i in ip) | |
639 | ||
640 | station = { | |
641 | 'active': pw.get_connection_status() not in (0, 7, 8, 9), | |
642 | 'connected': pw.get_connection_status() == 3, | |
643 | 'status': pw.get_connection_status(), | |
644 | 'ifconfig': ( | |
645 | ip_str(pw.get_ip_address()), | |
646 | ip_str(pw.get_subnet_mask()), | |
647 | ip_str(pw.get_gateway_ip()), | |
648 | '0.0.0.0' | |
649 | ), | |
650 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), | |
651 | } | |
652 | if station['connected']: | |
653 | station.update({ | |
654 | 'ap_ssid': pw.get_current_ssid(), | |
9836 | 655 | 'ap_bssid': ubinascii.hexlify(pw.get_current_bssid(), ':'), |
9835 | 656 | 'ap_rssi': pw.get_current_rssi(), |
657 | 'ap_security': pw.get_current_encryption_type(), | |
658 | }) | |
659 | print(ujson.dumps(station)) | |
660 | ||
661 | ap = { | |
662 | 'active': pw.get_connection_status() in (7, 8, 9), | |
663 | 'connected': pw.get_connection_status() == 8, | |
664 | 'status': pw.get_connection_status(), | |
665 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), | |
666 | } | |
667 | if ap['active']: | |
668 | ap['essid'] = pw.get_current_ssid() | |
9836 | 669 | ap['ifconfig'] = ( |
670 | ip_str(pw.get_ip_address()), | |
671 | ip_str(pw.get_subnet_mask()), | |
672 | ip_str(pw.get_gateway_ip()), | |
673 | '0.0.0.0' | |
674 | ) | |
9835 | 675 | print(ujson.dumps(ap)) |
676 | ||
677 | overall = { | |
678 | 'active': pw.get_connection_status() != 0 | |
679 | } | |
680 | print(ujson.dumps(overall)) | |
681 | ||
682 | wifi_status() | |
683 | del wifi_status | |
684 | """ | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
685 | else: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
686 | return super().getWifiData() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
687 | |
9989 | 688 | 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
|
689 | if err: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
690 | raise OSError(self._shortError(err)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
691 | |
9798 | 692 | 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
|
693 | station = json.loads(stationStr) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
694 | ap = json.loads(apStr) |
9798 | 695 | overall = json.loads(overallStr) |
9836 | 696 | if "status" in station: |
697 | # translate the numerical status to a string | |
698 | try: | |
699 | station["status"] = self.__statusTranslations[ | |
700 | self._deviceData["wifi_type"] | |
701 | ][station["status"]] | |
702 | except KeyError: | |
703 | station["status"] = str(station["status"]) | |
10138 | 704 | if "status" in ap: |
9836 | 705 | # translate the numerical status to a string |
706 | try: | |
707 | ap["status"] = self.__statusTranslations[self._deviceData["wifi_type"]][ | |
11166
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
708 | ( |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
709 | 103 |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
710 | if self._deviceData["wifi_type"] == "picow" |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
711 | and ap["status"] == 3 |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
712 | else ap["status"] |
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
713 | ) |
9836 | 714 | ] |
715 | except KeyError: | |
716 | ap["status"] = str(ap["status"]) | |
717 | if "ap_security" in station: | |
718 | # translate the numerical AP security to a string | |
719 | try: | |
720 | station["ap_security"] = self.__securityTranslations[ | |
721 | self._deviceData["wifi_type"] | |
722 | ][station["ap_security"]] | |
723 | except KeyError: | |
724 | station["ap_security"] = self.tr("unknown ({0})").format( | |
725 | station["ap_security"] | |
726 | ) | |
11236 | 727 | if "ap_security" in ap and self._deviceData["wifi_type"] == "picow": |
728 | try: | |
729 | ap["ap_security"] = self.__securityMapping[ap["ap_security"]] | |
730 | except KeyError: | |
731 | ap["ap_security"] = self.tr("unknown ({0})").format(ap["ap_security"]) | |
732 | ||
9798 | 733 | return station, ap, overall |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
734 | |
10153 | 735 | 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
|
736 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
737 | 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
|
738 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
739 | @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
|
740 | @type str |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
741 | @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
|
742 | @type str |
10153 | 743 | @param hostname host name of the device |
744 | @type str | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
745 | @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
|
746 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
747 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
748 | 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
|
749 | 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
|
750 | command = """ |
10153 | 751 | 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
|
752 | 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
|
753 | 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
|
754 | import ujson |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
755 | 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
|
756 | |
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
|
757 | rp2.country(country) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
758 | |
10153 | 759 | if hostname: |
760 | try: | |
761 | network.hostname(hostname) | |
762 | except AttributeError: | |
763 | pass | |
764 | ||
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
765 | 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
|
766 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
767 | wifi.active(True) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
768 | 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
|
769 | max_wait = 140 |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
770 | while max_wait: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
771 | 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
|
772 | break |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
773 | max_wait -= 1 |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
774 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
775 | status = wifi.status() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
776 | 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
|
777 | |
10153 | 778 | 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
|
779 | 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
|
780 | """.format( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
781 | repr(ssid), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
782 | repr(password if password else ""), |
10153 | 783 | repr(hostname), |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
784 | repr(country if country else "XX"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
785 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
786 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 787 | command = """ |
788 | def connect_wifi(ssid, password): | |
789 | import picowireless as pw | |
790 | import ujson | |
791 | from time import sleep | |
792 | ||
793 | pw.init() | |
794 | if bool(password): | |
795 | pw.wifi_set_passphrase(ssid, password) | |
796 | else: | |
797 | pw.wifi_set_network(ssid) | |
798 | ||
799 | max_wait = 140 | |
800 | while max_wait: | |
801 | if pw.get_connection_status() == 3: | |
802 | break | |
803 | max_wait -= 1 | |
804 | sleep(0.1) | |
805 | status = pw.get_connection_status() | |
806 | if status == 3: | |
807 | pw.set_led(0, 64, 0) | |
808 | else: | |
809 | pw.set_led(64, 0, 0) | |
810 | print(ujson.dumps({{'connected': status == 3, 'status': status}})) | |
811 | ||
812 | connect_wifi({0}, {1}) | |
813 | del connect_wifi | |
814 | """.format( | |
815 | repr(ssid), | |
816 | repr(password if password else ""), | |
817 | ) | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
818 | else: |
10153 | 819 | 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
|
820 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
821 | with EricOverrideCursor(): |
9989 | 822 | out, err = self.executeCommands( |
9827 | 823 | command, mode=self._submitMode, timeout=15000 |
9799 | 824 | ) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
825 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
826 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
827 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
828 | 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
|
829 | if result["connected"]: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
830 | error = "" |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
831 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
832 | try: |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
833 | 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
|
834 | result["status"] |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
835 | ] |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
836 | except KeyError: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
837 | error = str(result["status"]) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
838 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
839 | return result["connected"], error |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
840 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
841 | def disconnectWifi(self): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
842 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
843 | 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
|
844 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
845 | @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
|
846 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
847 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
848 | 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
|
849 | command = """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
850 | def disconnect_wifi(): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
851 | import network |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
852 | from time import sleep |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
853 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
854 | 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
|
855 | wifi.disconnect() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
856 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
857 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
858 | print(not wifi.isconnected()) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
859 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
860 | disconnect_wifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
861 | del disconnect_wifi |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
862 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
863 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 864 | command = """ |
865 | def disconnect_wifi(): | |
866 | import picowireless as pw | |
867 | from time import sleep | |
868 | ||
869 | pw.disconnect() | |
870 | sleep(0.1) | |
871 | print(pw.get_connection_status() != 3) | |
872 | pw.set_led(0, 0, 0) | |
873 | ||
874 | disconnect_wifi() | |
875 | del disconnect_wifi | |
876 | """ | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
877 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
878 | return super().disconnectWifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
879 | |
9989 | 880 | 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
|
881 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
882 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
883 | |
10144 | 884 | return out.decode("utf-8").strip() == "True", "" |
885 | ||
886 | def isWifiClientConnected(self): | |
887 | """ | |
888 | Public method to check the WiFi connection status as client. | |
889 | ||
890 | @return flag indicating the WiFi connection status | |
891 | @rtype bool | |
892 | """ | |
893 | if self._deviceData["wifi_type"] == "picow": | |
894 | command = """ | |
895 | def wifi_connected(): | |
896 | import network | |
897 | ||
898 | wifi = network.WLAN(network.STA_IF) | |
899 | print(wifi.isconnected()) | |
900 | ||
901 | wifi_connected() | |
902 | del wifi_connected | |
903 | """ | |
904 | elif self._deviceData["wifi_type"] == "picowireless": | |
905 | command = """ | |
906 | def wifi_connected(): | |
907 | import picowireless as pw | |
908 | ||
909 | print(pw.get_connection_status() == 3) | |
910 | ||
911 | wifi_connected() | |
912 | del wifi_connected | |
913 | """ | |
914 | else: | |
915 | return super().isWifiClientConnected() | |
916 | ||
917 | out, err = self.executeCommands(command, mode=self._submitMode) | |
918 | if err: | |
919 | return False | |
10138 | 920 | |
10144 | 921 | return out.strip() == b"True" |
922 | ||
923 | def isWifiApConnected(self): | |
924 | """ | |
925 | Public method to check the WiFi connection status as access point. | |
926 | ||
927 | @return flag indicating the WiFi connection status | |
928 | @rtype bool | |
929 | """ | |
930 | if self._deviceData["wifi_type"] == "picow": | |
931 | command = """ | |
932 | def wifi_connected(): | |
933 | import network | |
934 | ||
935 | wifi = network.WLAN(network.AP_IF) | |
936 | print(wifi.isconnected()) | |
937 | ||
938 | wifi_connected() | |
939 | del wifi_connected | |
940 | """ | |
941 | elif self._deviceData["wifi_type"] == "picowireless": | |
942 | command = """ | |
943 | def wifi_connected(): | |
944 | import picowireless as pw | |
945 | ||
946 | print(pw.get_connection_status() == 8) | |
947 | ||
948 | wifi_connected() | |
949 | del wifi_connected | |
950 | """ | |
951 | else: | |
952 | return super().isWifiClientConnected() | |
953 | ||
954 | out, err = self.executeCommands(command, mode=self._submitMode) | |
955 | if err: | |
956 | return False | |
957 | ||
958 | 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
|
959 | |
10153 | 960 | 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
|
961 | """ |
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
|
962 | 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
|
963 | 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
|
964 | |
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
|
965 | @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
|
966 | @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
|
967 | @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
|
968 | @type str |
10153 | 969 | @param hostname host name of the device |
970 | @type str | |
971 | @param country WiFi country code | |
972 | @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
|
973 | @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
|
974 | @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
|
975 | """ |
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
|
976 | 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
|
977 | 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
|
978 | 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
|
979 | 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
|
980 | 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
|
981 | 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
|
982 | 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
|
983 | 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
|
984 | 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
|
985 | 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
|
986 | 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
|
987 | 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
|
988 | 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
|
989 | 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
|
990 | 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
|
991 | |
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
|
992 | 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
|
993 | 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
|
994 | """ |
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
|
995 | |
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
|
996 | if self._deviceData["wifi_type"] == "picow": |
10153 | 997 | secrets = ( |
998 | "WIFI_SSID = {0}\nWIFI_KEY = {1}\nWIFI_COUNTRY={2}\n" | |
999 | "WIFI_HOSTNAME = {3}\n" | |
1000 | ).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
|
1001 | 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
|
1002 | repr(password) if password else '""', |
10153 | 1003 | repr(country.upper()) if country else '""', |
1004 | 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
|
1005 | ) |
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
|
1006 | 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
|
1007 | 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
|
1008 | 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
|
1009 | 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
|
1010 | 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
|
1011 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1012 | if self._deviceData["wifi_type"] == "picowireless": |
9836 | 1013 | wifiConnectFile = "pimoroniWiFiConnect.py" |
1014 | else: | |
10153 | 1015 | secrets += "WIFI_HOSTNAME = {0}\n".format( |
1016 | repr(hostname if hostname else '""') | |
1017 | ) | |
9836 | 1018 | 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
|
1019 | 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
|
1020 | # 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
|
1021 | 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
|
1022 | # 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
|
1023 | self.put( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1024 | 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
|
1025 | "/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
|
1026 | ) |
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 | 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
|
1028 | 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
|
1029 | |
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 | # modify boot.py |
9989 | 1031 | 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
|
1032 | 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
|
1033 | 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
|
1034 | |
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
|
1035 | 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
|
1036 | |
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 | 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
|
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 | 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
|
1040 | |
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 | @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
|
1042 | @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
|
1043 | """ |
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 | 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
|
1045 | 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
|
1046 | 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
|
1047 | 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
|
1048 | |
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 | 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
|
1050 | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1051 | 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
|
1052 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1053 | 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
|
1054 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1055 | @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
|
1056 | @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
|
1057 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1058 | 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
|
1059 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1060 | 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
|
1061 | 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
|
1062 | 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
|
1063 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1064 | 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
|
1065 | 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
|
1066 | 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
|
1067 | try: |
10233
51a6649ba79d
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10170
diff
changeset
|
1068 | 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
|
1069 | 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
|
1070 | 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
|
1071 | except: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1072 | 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
|
1073 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1074 | 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
|
1075 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1076 | 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
|
1077 | 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
|
1078 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1079 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1080 | command = """ |
1081 | def check_internet(): | |
1082 | import picowireless as pw | |
1083 | ||
1084 | if pw.get_connection_status() == 3: | |
1085 | res = pw.ping((9, 9, 9, 9), 300) | |
1086 | print(res >= 0) | |
1087 | else: | |
1088 | print(False) | |
1089 | ||
1090 | check_internet() | |
1091 | del check_internet | |
1092 | """ | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1093 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1094 | 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
|
1095 | |
9989 | 1096 | 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
|
1097 | 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
|
1098 | 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
|
1099 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1100 | 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
|
1101 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1102 | 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
|
1103 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1104 | 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
|
1105 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1106 | @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
|
1107 | '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
|
1108 | @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
|
1109 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1110 | 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
|
1111 | 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
|
1112 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1113 | 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
|
1114 | 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
|
1115 | 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
|
1116 | |
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
|
1117 | 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
|
1118 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1119 | 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
|
1120 | 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
|
1121 | 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
|
1122 | 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
|
1123 | 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
|
1124 | 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
|
1125 | 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
|
1126 | 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
|
1127 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1128 | 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
|
1129 | del scan_networks |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1130 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1131 | repr(country if country else "XX") |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1132 | ) |
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
|
1133 | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1134 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1135 | command = """ |
1136 | def scan_networks(): | |
1137 | import picowireless as pw | |
1138 | ||
1139 | network_list = [] | |
1140 | pw.init() | |
1141 | pw.start_scan_networks() | |
1142 | networks = pw.get_scan_networks() | |
1143 | for n in range(networks): | |
1144 | network_list.append(( | |
1145 | pw.get_ssid_networks(n), | |
1146 | pw.get_bssid_networks(n), | |
1147 | pw.get_channel_networks(n), | |
1148 | pw.get_rssi_networks(n), | |
1149 | pw.get_enc_type_networks(n), | |
1150 | )) | |
1151 | print(network_list) | |
1152 | ||
1153 | scan_networks() | |
1154 | del scan_networks | |
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: |
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
|
1157 | 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
|
1158 | |
9989 | 1159 | 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
|
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 [], 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 | 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
|
1164 | networks = [] |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1165 | 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
|
1166 | if network[0]: |
9836 | 1167 | ssid = ( |
1168 | network[0].decode("utf-8") | |
1169 | if isinstance(network[0], bytes) | |
1170 | else network[0] | |
1171 | ) | |
1172 | mac = ( | |
1173 | binascii.hexlify(network[1], ":").decode("utf-8") | |
1174 | if network[1] is not None | |
1175 | else "" | |
1176 | ) | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1177 | 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
|
1178 | 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
|
1179 | try: |
9836 | 1180 | security = self.__securityTranslations[ |
1181 | self._deviceData["wifi_type"] | |
1182 | ][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
|
1183 | 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
|
1184 | 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
|
1185 | 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
|
1186 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1187 | 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
|
1188 | |
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
|
1189 | 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
|
1190 | """ |
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
|
1191 | 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
|
1192 | |
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
|
1193 | @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
|
1194 | 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
|
1195 | @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
|
1196 | @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
|
1197 | @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
|
1198 | @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
|
1199 | """ |
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
|
1200 | 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
|
1201 | 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
|
1202 | "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
|
1203 | ) |
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
|
1204 | |
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
|
1205 | 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
|
1206 | 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
|
1207 | 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
|
1208 | 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
|
1209 | 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
|
1210 | |
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
|
1211 | 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
|
1212 | 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
|
1213 | 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
|
1214 | 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
|
1215 | |
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
|
1216 | 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
|
1217 | del deactivate |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1218 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1219 | interface |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1220 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1221 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1222 | command = """ |
1223 | def deactivate(): | |
1224 | import picowireless as pw | |
1225 | ||
1226 | pw.init() | |
1227 | print(True) | |
1228 | ||
1229 | deactivate() | |
1230 | del deactivate | |
1231 | """ | |
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
|
1232 | 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
|
1233 | 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
|
1234 | |
9989 | 1235 | 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
|
1236 | 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
|
1237 | 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
|
1238 | 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
|
1239 | 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
|
1240 | |
10153 | 1241 | def startAccessPoint( |
1242 | self, | |
1243 | ssid, | |
1244 | security=None, | |
1245 | password=None, | |
1246 | hostname=None, | |
1247 | ifconfig=None, | |
1248 | ): | |
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
|
1249 | """ |
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
|
1250 | 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
|
1251 | |
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
|
1252 | @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
|
1253 | @type str |
11236 | 1254 | @param security security mode (defaults to None) (unused) |
1255 | @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
|
1256 | @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
|
1257 | @type str (optional) |
10153 | 1258 | @param hostname host name of the device (defaults to None) |
1259 | @type str (optional) | |
9797 | 1260 | @param ifconfig IPv4 configuration for the access point if not default |
1261 | (IPv4 address, netmask, gateway address, DNS server address) | |
1262 | @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
|
1263 | @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
|
1264 | @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
|
1265 | """ |
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
|
1266 | if security is None or password is None: |
11236 | 1267 | security = "SEC_OPEN" |
10170
6cf1ee737d8f
Corrected some more code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10153
diff
changeset
|
1268 | 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
|
1269 | |
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
|
1270 | 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
|
1271 | 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
|
1272 | command = """ |
11236 | 1273 | 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
|
1274 | 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
|
1275 | 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
|
1276 | 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
|
1277 | |
9797 | 1278 | 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
|
1279 | |
10153 | 1280 | if hostname: |
1281 | try: | |
1282 | network.hostname(hostname) | |
1283 | except AttributeError: | |
1284 | pass | |
1285 | ||
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
|
1286 | 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
|
1287 | ap.active(True) |
9797 | 1288 | if ifconfig: |
1289 | ap.ifconfig(ifconfig) | |
11236 | 1290 | 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
|
1291 | sleep(0.1) |
11166
fd914f897dcf
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
11148
diff
changeset
|
1292 | 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
|
1293 | |
11236 | 1294 | 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
|
1295 | del start_ap |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1296 | """.format( |
9797 | 1297 | repr(ssid), |
1298 | repr(password), | |
10153 | 1299 | repr(hostname), |
9797 | 1300 | ifconfig, |
1301 | repr(country if country else "XX"), | |
11236 | 1302 | security, |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1303 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1304 | elif self._deviceData["wifi_type"] == "picowireless": |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1305 | if ifconfig: |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1306 | return ( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1307 | False, |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1308 | self.tr( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1309 | "Pico Wireless does not support setting the IPv4 parameters of" |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1310 | " the WiFi access point." |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1311 | ), |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1312 | ) |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1313 | |
9836 | 1314 | # AP is fixed at channel 6 |
1315 | command = """ | |
1316 | def start_ap(ssid, password): | |
1317 | import picowireless as pw | |
1318 | ||
1319 | pw.init() | |
1320 | if bool(password): | |
1321 | res = pw.wifi_set_ap_passphrase(ssid, password, 6) | |
1322 | else: | |
1323 | res = pw.wifi_set_ap_network(ssid, 6) | |
1324 | status = pw.get_connection_status() | |
1325 | if status in (7, 8): | |
1326 | pw.set_led(0, 64, 0) | |
1327 | else: | |
1328 | pw.set_led(64, 0, 0) | |
1329 | print(res >= 0) | |
1330 | ||
1331 | start_ap({0}, {1}) | |
1332 | del start_ap | |
1333 | """.format( | |
1334 | repr(ssid), | |
1335 | repr(password if password else ""), | |
1336 | ) | |
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 | else: |
10153 | 1338 | return super().startAccessPoint( |
1339 | ssid, | |
1340 | security=security, | |
1341 | password=password, | |
1342 | hostname=hostname, | |
1343 | ifconfig=ifconfig, | |
1344 | ) | |
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
|
1345 | |
9989 | 1346 | 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
|
1347 | 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
|
1348 | 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
|
1349 | 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
|
1350 | 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
|
1351 | |
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
|
1352 | 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
|
1353 | """ |
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
|
1354 | 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
|
1355 | |
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
|
1356 | @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
|
1357 | @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
|
1358 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1359 | 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
|
1360 | 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
|
1361 | 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
|
1362 | 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
|
1363 | |
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
|
1364 | 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
|
1365 | """ |
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
|
1366 | 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
|
1367 | |
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
|
1368 | @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
|
1369 | 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
|
1370 | @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
|
1371 | """ |
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
|
1372 | 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
|
1373 | 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
|
1374 | 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
|
1375 | 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
|
1376 | |
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
|
1377 | 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
|
1378 | 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
|
1379 | 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
|
1380 | |
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
|
1381 | 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
|
1382 | 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
|
1383 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1384 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1385 | return ( |
1386 | [], | |
1387 | self.tr( | |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1388 | "Pico Wireless does not support reporting of connected clients." |
9836 | 1389 | ), |
1390 | ) | |
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
|
1391 | 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
|
1392 | 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
|
1393 | |
9989 | 1394 | 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
|
1395 | 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
|
1396 | 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
|
1397 | |
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
|
1398 | 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
|
1399 | 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
|
1400 | |
10022 | 1401 | def enableWebrepl(self, password): |
1402 | """ | |
1403 | Public method to write the given WebREPL password to the connected device and | |
1404 | modify the start script to start the WebREPL server. | |
1405 | ||
1406 | @param password password needed to authenticate | |
1407 | @type str | |
1408 | @return tuple containing a flag indicating success and an error message | |
1409 | @rtype tuple of (bool, str) | |
1410 | """ | |
1411 | command = """ | |
1412 | def modify_boot(): | |
1413 | import os | |
1414 | ||
1415 | try: | |
1416 | with open('/boot.py', 'r') as old_f, open('/boot.py.tmp', 'w') as new_f: | |
1417 | found = False | |
1418 | for l in old_f.read().splitlines(): | |
1419 | if 'webrepl' in l: | |
1420 | found = True | |
1421 | if l.startswith('#'): | |
1422 | l = l[1:] | |
1423 | new_f.write(l + '\\n') | |
1424 | if not found: | |
1425 | new_f.write('\\nimport webrepl\\nwebrepl.start()\\n') | |
1426 | ||
1427 | os.remove('/boot.py') | |
1428 | os.rename('/boot.py.tmp', '/boot.py') | |
1429 | except: | |
1430 | pass | |
1431 | ||
1432 | print(True) | |
1433 | ||
1434 | modify_boot() | |
1435 | del modify_boot | |
1436 | """ | |
1437 | ||
1438 | if self._deviceData["wifi_type"] == "picow": | |
1439 | config = "PASS = {0}\n".format(repr(password)) | |
1440 | else: | |
1441 | return False, self.tr("WebREPL is not supported on this device.") | |
1442 | ||
1443 | try: | |
1444 | # write config file | |
1445 | self.putData("/webrepl_cfg.py", config.encode("utf-8")) | |
1446 | except OSError as err: | |
1447 | return False, str(err) | |
1448 | ||
1449 | # modify boot.py | |
1450 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1451 | if err: | |
1452 | return False, err | |
1453 | ||
1454 | return out.decode("utf-8").strip() == "True", "" | |
1455 | ||
1456 | def disableWebrepl(self): | |
1457 | """ | |
1458 | Public method to write the given WebREPL password to the connected device and | |
1459 | modify the start script to start the WebREPL server. | |
1460 | ||
1461 | @return tuple containing a flag indicating success and an error message | |
1462 | @rtype tuple of (bool, str) | |
1463 | """ | |
1464 | command = """ | |
1465 | def modify_boot(): | |
1466 | import os | |
1467 | ||
1468 | try: | |
1469 | with open('/boot.py', 'r') as old_f, open('/boot.py.tmp', 'w') as new_f: | |
1470 | for l in old_f.read().splitlines(): | |
1471 | if 'webrepl' in l: | |
1472 | if not l.startswith('#'): | |
1473 | l = '#' + l | |
1474 | new_f.write(l + '\\n') | |
1475 | ||
1476 | os.remove('/boot.py') | |
1477 | os.rename('/boot.py.tmp', '/boot.py') | |
1478 | except: | |
1479 | pass | |
1480 | ||
1481 | print(True) | |
1482 | ||
1483 | modify_boot() | |
1484 | del modify_boot | |
1485 | """ | |
1486 | ||
1487 | # modify boot.py | |
1488 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1489 | if err: | |
1490 | return False, err | |
1491 | ||
1492 | return out.decode("utf-8").strip() == "True", "" | |
1493 | ||
10153 | 1494 | @pyqtSlot() |
1495 | def __setCountry(self): | |
1496 | """ | |
10897 | 1497 | Private slot to configure the country of the connected device. |
10153 | 1498 | |
1499 | The country is the two-letter ISO 3166-1 Alpha-2 country code. | |
1500 | """ | |
1501 | from ..WifiDialogs.WifiCountryDialog import WifiCountryDialog | |
1502 | ||
11005
b918c6c2736b
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10897
diff
changeset
|
1503 | dlg = WifiCountryDialog(parent=self.microPython) |
10153 | 1504 | if dlg.exec() == QDialog.DialogCode.Accepted: |
1505 | country, remember = dlg.getCountry() | |
1506 | if remember: | |
1507 | Preferences.setMicroPython("WifiCountry", country) | |
1508 | ||
1509 | command = """ | |
1510 | try: | |
1511 | import network | |
1512 | network.country({0}) | |
1513 | except AttributeError: | |
1514 | import rp2 | |
1515 | rp2.country({0}) | |
1516 | """.format( | |
1517 | repr(country) | |
1518 | ) | |
1519 | ||
1520 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1521 | if err: | |
1522 | self.microPython.showError("country()", err) | |
1523 | ||
1524 | @pyqtSlot() | |
1525 | def __resetCountry(self): | |
1526 | """ | |
1527 | Private slot to reset the country of the connected ESP32 device. | |
1528 | ||
1529 | The country is the two-letter ISO 3166-1 Alpha-2 country code. This method | |
1530 | resets it to the default code 'XX' representing the "worldwide" region. | |
1531 | """ | |
1532 | command = """ | |
1533 | try: | |
1534 | import network | |
1535 | network.country('XX') | |
1536 | except AttributeError: | |
1537 | pass | |
1538 | """ | |
1539 | ||
1540 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1541 | if err: | |
1542 | self.microPython.showError("country()", err) | |
1543 | ||
9868 | 1544 | ################################################################## |
10089 | 1545 | ## Methods below implement Bluetooth related methods |
1546 | ################################################################## | |
1547 | ||
1548 | def hasBluetooth(self): | |
1549 | """ | |
1550 | Public method to check the availability of Bluetooth. | |
1551 | ||
1552 | @return flag indicating the availability of Bluetooth | |
1553 | @rtype bool | |
1554 | @exception OSError raised to indicate an issue with the device | |
1555 | """ | |
1556 | command = """ | |
1557 | def has_bt(): | |
1558 | try: | |
1559 | import bluetooth | |
1560 | if hasattr(bluetooth, 'BLE'): | |
11051 | 1561 | ble = bluetooth.BLE() |
1562 | if not ble.active(): | |
1563 | ble.active(True) | |
1564 | ble.active(False) | |
10089 | 1565 | return True |
11051 | 1566 | except (ImportError, OSError): |
10089 | 1567 | pass |
1568 | ||
1569 | return False | |
1570 | ||
1571 | print(has_bt()) | |
1572 | del has_bt | |
1573 | """ | |
1574 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) | |
1575 | if err: | |
1576 | raise OSError(self._shortError(err)) | |
1577 | return out.strip() == b"True" | |
1578 | ||
1579 | def getBluetoothStatus(self): | |
1580 | """ | |
1581 | Public method to get Bluetooth status data of the connected board. | |
1582 | ||
1583 | @return list of tuples containing the translated status data label and | |
1584 | the associated value | |
1585 | @rtype list of tuples of (str, str) | |
1586 | @exception OSError raised to indicate an issue with the device | |
1587 | """ | |
1588 | command = """ | |
1589 | def ble_status(): | |
1590 | import bluetooth | |
1591 | import ubinascii | |
1592 | import ujson | |
1593 | ||
1594 | ble = bluetooth.BLE() | |
1595 | ||
1596 | ble_active = ble.active() | |
1597 | if not ble_active: | |
1598 | ble.active(True) | |
1599 | ||
1600 | res = { | |
1601 | 'active': ble_active, | |
1602 | 'mac': ubinascii.hexlify(ble.config('mac')[1], ':').decode(), | |
1603 | 'addr_type': ble.config('mac')[0], | |
1604 | 'name': ble.config('gap_name'), | |
1605 | 'mtu': ble.config('mtu'), | |
1606 | } | |
1607 | ||
1608 | if not ble_active: | |
1609 | ble.active(False) | |
1610 | ||
1611 | print(ujson.dumps(res)) | |
1612 | ||
1613 | ble_status() | |
1614 | del ble_status | |
1615 | """ | |
1616 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1617 | if err: | |
1618 | raise OSError(self._shortError(err)) | |
1619 | ||
1620 | status = [] | |
1621 | bleStatus = json.loads(out.decode("utf-8")) | |
1622 | status.append((self.tr("Active"), self.bool2str(bleStatus["active"]))) | |
1623 | status.append((self.tr("Name"), bleStatus["name"])) | |
1624 | status.append((self.tr("MAC-Address"), bleStatus["mac"])) | |
1625 | status.append( | |
1626 | ( | |
1627 | self.tr("Address Type"), | |
1628 | self.tr("Public") if bleStatus == 0 else self.tr("Random"), | |
1629 | ) | |
1630 | ) | |
1631 | status.append((self.tr("MTU"), self.tr("{0} Bytes").format(bleStatus["mtu"]))) | |
1632 | ||
1633 | return status | |
1634 | ||
1635 | def activateBluetoothInterface(self): | |
1636 | """ | |
1637 | Public method to activate the Bluetooth interface. | |
1638 | ||
1639 | @return flag indicating the new state of the Bluetooth interface | |
1640 | @rtype bool | |
1641 | @exception OSError raised to indicate an issue with the device | |
1642 | """ | |
1643 | command = """ | |
1644 | def activate_ble(): | |
1645 | import bluetooth | |
1646 | ||
1647 | ble = bluetooth.BLE() | |
1648 | if not ble.active(): | |
1649 | ble.active(True) | |
1650 | print(ble.active()) | |
1651 | ||
1652 | activate_ble() | |
1653 | del activate_ble | |
1654 | """ | |
1655 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1656 | if err: | |
1657 | raise OSError(self._shortError(err)) | |
1658 | ||
1659 | return out.strip() == b"True" | |
1660 | ||
1661 | def deactivateBluetoothInterface(self): | |
1662 | """ | |
1663 | Public method to deactivate the Bluetooth interface. | |
1664 | ||
1665 | @return flag indicating the new state of the Bluetooth interface | |
1666 | @rtype bool | |
1667 | @exception OSError raised to indicate an issue with the device | |
1668 | """ | |
1669 | command = """ | |
1670 | def deactivate_ble(): | |
1671 | import bluetooth | |
1672 | ||
1673 | ble = bluetooth.BLE() | |
1674 | if ble.active(): | |
1675 | ble.active(False) | |
1676 | print(ble.active()) | |
1677 | ||
1678 | deactivate_ble() | |
1679 | del deactivate_ble | |
1680 | """ | |
1681 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1682 | if err: | |
1683 | raise OSError(self._shortError(err)) | |
1684 | ||
1685 | return out.strip() == b"True" | |
1686 | ||
1687 | def getDeviceScan(self, timeout=10): | |
1688 | """ | |
1689 | Public method to perform a Bluetooth device scan. | |
1690 | ||
1691 | @param timeout duration of the device scan in seconds (defaults | |
1692 | to 10) | |
1693 | @type int (optional) | |
1694 | @return tuple containing a dictionary with the scan results and | |
1695 | an error string | |
1696 | @rtype tuple of (dict, str) | |
1697 | """ | |
1698 | from ..BluetoothDialogs.BluetoothAdvertisement import BluetoothAdvertisement | |
1699 | ||
1700 | command = """ | |
1701 | _scan_done = False | |
1702 | ||
1703 | def ble_scan(): | |
1704 | import bluetooth | |
1705 | import time | |
1706 | import ubinascii | |
1707 | ||
1708 | IRQ_SCAN_RESULT = 5 | |
1709 | IRQ_SCAN_DONE = 6 | |
1710 | ||
1711 | def _bleIrq(event, data): | |
1712 | global _scan_done | |
1713 | if event == IRQ_SCAN_RESULT: | |
1714 | addr_type, addr, adv_type, rssi, adv_data = data | |
1715 | if addr: | |
1716 | print({{ | |
1717 | 'address': ubinascii.hexlify(addr,':').decode('utf-8'), | |
1718 | 'rssi': rssi, | |
1719 | 'adv_type': adv_type, | |
1720 | 'advertisement': bytes(adv_data), | |
1721 | }}) | |
1722 | elif event == IRQ_SCAN_DONE: | |
1723 | _scan_done = True | |
1724 | ||
1725 | ble = bluetooth.BLE() | |
1726 | ||
1727 | ble_active = ble.active() | |
1728 | if not ble_active: | |
1729 | ble.active(True) | |
1730 | ||
1731 | ble.irq(_bleIrq) | |
1732 | ble.gap_scan({0} * 1000, 1000000, 50000, True) | |
1733 | while not _scan_done: | |
1734 | time.sleep(0.2) | |
1735 | ||
1736 | if not ble_active: | |
1737 | ble.active(False) | |
1738 | ||
1739 | ble_scan() | |
1740 | del ble_scan, _scan_done | |
1741 | """.format( | |
1742 | timeout | |
1743 | ) | |
1744 | out, err = self.executeCommands( | |
1745 | command, mode=self._submitMode, timeout=(timeout + 5) * 1000 | |
1746 | ) | |
1747 | if err: | |
1748 | return {}, err | |
1749 | ||
1750 | scanResults = {} | |
1751 | for line in out.decode("utf-8").splitlines(): | |
1752 | res = ast.literal_eval(line) | |
1753 | address = res["address"] | |
1754 | if address not in scanResults: | |
1755 | scanResults[address] = BluetoothAdvertisement(address) | |
1756 | scanResults[address].update( | |
1757 | res["adv_type"], res["rssi"], res["advertisement"] | |
1758 | ) | |
1759 | ||
1760 | return scanResults, "" | |
1761 | ||
11167 | 1762 | def supportsDeviceScan(self): |
1763 | """ | |
1764 | Public method to indicate, that the Bluetooth implementation supports | |
1765 | scanning for devices. | |
1766 | ||
1767 | @return flag indicating that the scanning function is supported | |
1768 | @rtype bool | |
1769 | """ | |
1770 | return True | |
1771 | ||
10089 | 1772 | ################################################################## |
9878 | 1773 | ## Methods below implement Ethernet related methods |
1774 | ################################################################## | |
1775 | ||
1776 | def hasEthernet(self): | |
1777 | """ | |
1778 | Public method to check the availability of Ethernet. | |
1779 | ||
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1780 | @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
|
1781 | 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
|
1782 | @rtype tuple of (bool, str) |
9878 | 1783 | @exception OSError raised to indicate an issue with the device |
1784 | """ | |
1785 | command = """ | |
1786 | def has_eth(): | |
1787 | try: | |
1788 | import network | |
1789 | if hasattr(network, 'WIZNET5K'): | |
1790 | return True, 'picowiz' | |
1791 | except ImportError: | |
1792 | pass | |
1793 | ||
1794 | return False, '' | |
1795 | ||
1796 | print(has_eth()) | |
1797 | del has_eth | |
1798 | """ | |
1799 | ||
9989 | 1800 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9878 | 1801 | if err: |
9880
f425c58cf8e9
Fixed a bug in the recently added µPy code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9878
diff
changeset
|
1802 | 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
|
1803 | |
9878 | 1804 | return ast.literal_eval(out.decode("utf-8")) |
1805 | ||
1806 | def getEthernetStatus(self): | |
1807 | """ | |
1808 | Public method to get Ethernet status data of the connected board. | |
1809 | ||
1810 | @return list of tuples containing the translated status data label and | |
1811 | the associated value | |
1812 | @rtype list of tuples of (str, str) | |
1813 | @exception OSError raised to indicate an issue with the device | |
1814 | """ | |
1815 | command = """{0} | |
1816 | def ethernet_status(): | |
1817 | import network | |
1818 | import ubinascii | |
1819 | import ujson | |
1820 | ||
1821 | w5x00_init() | |
1822 | ||
1823 | res = {{ | |
1824 | 'active': nic.active(), | |
1825 | 'connected': nic.isconnected(), | |
1826 | 'status': nic.status(), | |
1827 | 'ifconfig': nic.ifconfig(), | |
1828 | 'mac': ubinascii.hexlify(nic.config('mac'), ':').decode(), | |
1829 | }} | |
10153 | 1830 | try: |
1831 | res['hostname'] = network.hostname() | |
1832 | except AttributeError: | |
1833 | res['hostname'] = '' | |
9878 | 1834 | print(ujson.dumps(res)) |
1835 | ||
1836 | ethernet_status() | |
1837 | del ethernet_status, w5x00_init | |
1838 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
1839 | WiznetUtilities.mpyWiznetInit() |
9878 | 1840 | ) |
1841 | ||
9989 | 1842 | out, err = self.executeCommands(command, mode=self._submitMode) |
9878 | 1843 | if err: |
1844 | raise OSError(self._shortError(err)) | |
1845 | ||
1846 | status = [] | |
1847 | ethStatus = json.loads(out.decode("utf-8")) | |
1848 | status.append((self.tr("Active"), self.bool2str(ethStatus["active"]))) | |
1849 | status.append((self.tr("Connected"), self.bool2str(ethStatus["connected"]))) | |
1850 | status.append( | |
1851 | ( | |
1852 | self.tr("Status"), | |
1853 | self.__statusTranslations["picowiz"][ethStatus["status"]], | |
1854 | ) | |
1855 | ) | |
10153 | 1856 | status.append( |
1857 | ( | |
1858 | self.tr("Hostname"), | |
1859 | ethStatus["hostname"] if ethStatus["hostname"] else self.tr("unknown"), | |
1860 | ) | |
1861 | ) | |
9878 | 1862 | status.append((self.tr("IPv4 Address"), ethStatus["ifconfig"][0])) |
1863 | status.append((self.tr("Netmask"), ethStatus["ifconfig"][1])) | |
1864 | status.append((self.tr("Gateway"), ethStatus["ifconfig"][2])) | |
1865 | status.append((self.tr("DNS"), ethStatus["ifconfig"][3])) | |
1866 | status.append((self.tr("MAC-Address"), ethStatus["mac"])) | |
1867 | ||
1868 | return status | |
1869 | ||
10153 | 1870 | def connectToLan(self, config, hostname): |
9878 | 1871 | """ |
1872 | Public method to connect the connected device to the LAN. | |
1873 | ||
1874 | @param config configuration for the connection (either the string 'dhcp' | |
1875 | for a dynamic address or a tuple of four strings with the IPv4 parameters. | |
1876 | @type str or tuple of (str, str, str, str) | |
10153 | 1877 | @param hostname host name of the device |
1878 | @type str | |
9878 | 1879 | @return tuple containing a flag indicating success and an error message |
1880 | @rtype tuple of (bool, str) | |
1881 | """ | |
1882 | command = """{0} | |
10153 | 1883 | def connect_lan(config, hostname): |
1884 | import network | |
9878 | 1885 | import time |
1886 | ||
10153 | 1887 | if hostname: |
1888 | try: | |
1889 | network.hostname(hostname) | |
1890 | except AttributeError: | |
1891 | pass | |
1892 | ||
9878 | 1893 | w5x00_init() |
1894 | ||
1895 | nic.active(False) | |
1896 | nic.active(True) | |
1897 | nic.ifconfig(config) | |
1898 | max_wait = 140 | |
1899 | while max_wait: | |
1900 | if nic.isconnected(): | |
1901 | break | |
1902 | max_wait -= 1 | |
1903 | time.sleep(0.1) | |
1904 | print(nic.isconnected()) | |
1905 | ||
10153 | 1906 | connect_lan({1}, {2}) |
9878 | 1907 | del connect_lan, w5x00_init |
1908 | """.format( | |
10153 | 1909 | WiznetUtilities.mpyWiznetInit(), |
1910 | "'dhcp'" if config == "dhcp" else config, | |
1911 | repr(hostname) if hostname else "''", | |
9878 | 1912 | ) |
1913 | ||
1914 | with EricOverrideCursor(): | |
9989 | 1915 | out, err = self.executeCommands( |
9878 | 1916 | command, mode=self._submitMode, timeout=15000 |
1917 | ) | |
1918 | if err: | |
1919 | return False, err | |
1920 | ||
1921 | return out.strip() == b"True", "" | |
1922 | ||
1923 | def disconnectFromLan(self): | |
1924 | """ | |
1925 | Public method to disconnect from the LAN. | |
1926 | ||
1927 | @return tuple containing a flag indicating success and an error message | |
1928 | @rtype tuple of (bool, str) | |
1929 | """ | |
1930 | command = """{0} | |
1931 | def disconnect_lan(): | |
1932 | import time | |
1933 | ||
1934 | w5x00_init() | |
1935 | ||
1936 | nic.active(False) | |
1937 | time.sleep(0.1) | |
1938 | print(not nic.isconnected()) | |
1939 | ||
1940 | disconnect_lan() | |
1941 | del disconnect_lan, w5x00_init | |
1942 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
1943 | WiznetUtilities.mpyWiznetInit(), |
9878 | 1944 | ) |
1945 | ||
1946 | with EricOverrideCursor(): | |
9989 | 1947 | out, err = self.executeCommands( |
9878 | 1948 | command, mode=self._submitMode, timeout=15000 |
1949 | ) | |
1950 | if err: | |
1951 | return False, err | |
1952 | ||
10144 | 1953 | return out.strip() == b"True", "" |
1954 | ||
1955 | def isLanConnected(self): | |
1956 | """ | |
1957 | Public method to check the LAN connection status. | |
1958 | ||
1959 | @return flag indicating that the device is connected to the LAN | |
1960 | @rtype bool | |
1961 | """ | |
1962 | command = """{0} | |
1963 | def is_connected(): | |
1964 | import network | |
10138 | 1965 | |
10144 | 1966 | w5x00_init() |
1967 | ||
1968 | print(nic.isconnected()) | |
1969 | ||
1970 | is_connected() | |
1971 | del is_connected, w5x00_init | |
1972 | """.format( | |
1973 | WiznetUtilities.mpyWiznetInit(), | |
1974 | ) | |
1975 | ||
1976 | out, err = self.executeCommands(command, mode=self._submitMode) | |
1977 | if err: | |
1978 | return False | |
1979 | ||
1980 | return out.strip() == b"True" | |
9878 | 1981 | |
1982 | def checkInternetViaLan(self): | |
1983 | """ | |
1984 | Public method to check, if the internet can be reached (LAN variant). | |
1985 | ||
1986 | @return tuple containing a flag indicating reachability and an error string | |
1987 | @rtype tuple of (bool, str) | |
1988 | """ | |
1989 | command = """{0} | |
1990 | def check_internet(): | |
1991 | import network | |
1992 | import socket | |
1993 | ||
1994 | w5x00_init() | |
1995 | ||
1996 | if nic.isconnected(): | |
1997 | s = socket.socket() | |
1998 | try: | |
10233
51a6649ba79d
MicroPython Interface
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10170
diff
changeset
|
1999 | s.connect(socket.getaddrinfo('quad9.net', 443)[0][-1]) |
9878 | 2000 | s.close() |
2001 | print(True) | |
2002 | except: | |
2003 | print(False) | |
2004 | else: | |
2005 | print(False) | |
2006 | ||
2007 | check_internet() | |
2008 | del check_internet, w5x00_init | |
2009 | """.format( | |
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2010 | WiznetUtilities.mpyWiznetInit(), |
9878 | 2011 | ) |
2012 | ||
9989 | 2013 | out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
9878 | 2014 | if err: |
2015 | return False, err | |
2016 | ||
2017 | return out.strip() == b"True", "" | |
2018 | ||
2019 | def deactivateEthernet(self): | |
2020 | """ | |
2021 | Public method to deactivate the Ethernet interface of the connected device. | |
2022 | ||
2023 | @return tuple containg a flag indicating success and an error message | |
2024 | @rtype tuple of (bool, str) | |
2025 | """ | |
2026 | # The WIZnet 5x00 interface cannot be switched off explicitly. That means, | |
2027 | # disconnect from the LAN is all we can do. | |
2028 | ||
2029 | return self.disconnectFromLan() | |
2030 | ||
10153 | 2031 | def writeLanAutoConnect(self, config, hostname): |
9878 | 2032 | """ |
2033 | Public method to generate a script and associated configuration to connect the | |
2034 | device to the LAN during boot time. | |
2035 | ||
2036 | @param config configuration for the connection (either the string 'dhcp' | |
2037 | for a dynamic address or a tuple of four strings with the IPv4 parameters. | |
2038 | @type str or tuple of (str, str, str, str) | |
10153 | 2039 | @param hostname host name of the device |
2040 | @type str | |
9878 | 2041 | @return tuple containing a flag indicating success and an error message |
2042 | @rtype tuple of (bool, str) | |
2043 | """ | |
2044 | command = """ | |
2045 | def modify_boot(): | |
2046 | add = True | |
2047 | try: | |
2048 | with open('/boot.py', 'r') as f: | |
2049 | for ln in f.readlines(): | |
2050 | if 'wiznet_connect' in ln: | |
2051 | add = False | |
2052 | break | |
2053 | except: | |
2054 | pass | |
2055 | if add: | |
2056 | 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
|
2057 | f.write('\\n') |
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2058 | 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
|
2059 | f.write('nic = wiznet_connect.connect_lan()\\n') |
9878 | 2060 | print(True) |
2061 | ||
2062 | modify_boot() | |
2063 | del modify_boot | |
2064 | """ | |
10153 | 2065 | devconfig = "ifconfig = {0}\nhostname = {1}".format( |
2066 | "'dhcp'" if config == "dhcp" else config, | |
2067 | repr(hostname) if hostname else "''", | |
2068 | ) | |
9878 | 2069 | try: |
2070 | # write secrets file | |
10153 | 2071 | self.putData("/wiznet_config.py", devconfig.encode("utf-8")) |
9878 | 2072 | # copy auto-connect file |
2073 | self.put( | |
2074 | os.path.join( | |
2075 | os.path.dirname(__file__), "MCUScripts", "picoWiznetConnect.py" | |
2076 | ), | |
2077 | "/wiznet_connect.py", | |
2078 | ) | |
2079 | except OSError as err: | |
2080 | return False, str(err) | |
2081 | ||
2082 | # modify boot.py | |
9989 | 2083 | out, err = self.executeCommands(command, mode=self._submitMode) |
9878 | 2084 | if err: |
2085 | return False, err | |
2086 | ||
2087 | return out.decode("utf-8").strip() == "True", "" | |
2088 | ||
2089 | def removeLanAutoConnect(self): | |
2090 | """ | |
2091 | Public method to remove the saved IPv4 parameters from the connected device. | |
2092 | ||
2093 | Note: This disables the LAN auto-connect feature. | |
2094 | ||
2095 | @return tuple containing a flag indicating success and an error message | |
2096 | @rtype tuple of (bool, str) | |
2097 | """ | |
2098 | try: | |
2099 | self.rm("/wiznet_config.py") | |
2100 | except OSError as err: | |
2101 | return False, str(err) | |
2102 | ||
2103 | return True, "" | |
2104 | ||
2105 | ################################################################## | |
9868 | 2106 | ## Methods below implement NTP related methods |
2107 | ################################################################## | |
2108 | ||
2109 | def hasNetworkTime(self): | |
2110 | """ | |
2111 | Public method to check the availability of network time functions. | |
2112 | ||
2113 | @return flag indicating the availability of network time functions | |
2114 | @rtype bool | |
9870
0399d3607829
Fixed a few code formatting and style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9868
diff
changeset
|
2115 | @exception OSError raised to indicate an issue with the device |
9868 | 2116 | """ |
2117 | command = """ | |
2118 | def has_ntp(): | |
2119 | try: | |
2120 | import ntptime | |
2121 | return True | |
2122 | except ImportError: | |
2123 | return False | |
2124 | ||
2125 | print(has_ntp()) | |
2126 | del has_ntp | |
2127 | """ | |
9989 | 2128 | out, err = self.executeCommands(command, mode=self._submitMode) |
9868 | 2129 | if err: |
2130 | raise OSError(self._shortError(err)) | |
2131 | return out.strip() == b"True" | |
2132 | ||
9888
f76eeb80907b
Adapted RP2040Device to the renamed method of WiznetUtilities.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9880
diff
changeset
|
2133 | def setNetworkTime(self, server="pool.ntp.org", tzOffset=0, timeout=10): |
9868 | 2134 | """ |
2135 | Public method to set the time to the network time retrieved from an | |
2136 | NTP server. | |
2137 | ||
2138 | @param server name of the NTP server to get the network time from | |
2139 | (defaults to "0.pool.ntp.org") | |
2140 | @type str (optional) | |
2141 | @param tzOffset offset with respect to UTC (defaults to 0) | |
2142 | @type int (optional) | |
2143 | @param timeout maximum time to wait for a server response in seconds | |
2144 | (defaults to 10) | |
2145 | @type int | |
2146 | @return tuple containing a flag indicating success and an error string | |
2147 | @rtype tuple of (bool, str) | |
2148 | """ | |
2149 | command = """ | |
2150 | def set_ntp_time(server, tz_offset, timeout): | |
2151 | import network | |
2152 | import ntptime | |
2153 | import machine | |
2154 | ||
9878 | 2155 | if hasattr(network, 'WLAN') and not network.WLAN(network.STA_IF).isconnected(): |
9868 | 2156 | return False |
9878 | 2157 | elif hasattr(network, 'WIZNET5K'): |
2158 | try: | |
2159 | if not nic.isconnected(): | |
2160 | return False | |
2161 | except NameError: | |
2162 | return False | |
9868 | 2163 | |
2164 | ntptime.host = server | |
2165 | ntptime.timeout = timeout | |
2166 | ntptime.settime() | |
2167 | ||
2168 | rtc = machine.RTC() | |
2169 | t = list(rtc.datetime()) | |
2170 | t[4] += tz_offset | |
2171 | rtc.datetime(t) | |
2172 | ||
2173 | return True | |
2174 | ||
2175 | try: | |
2176 | print({{ | |
2177 | 'result': set_ntp_time({0}, {1}, {2}), | |
2178 | 'error': '', | |
2179 | }}) | |
2180 | except Exception as err: | |
2181 | print({{ | |
2182 | 'result': False, | |
2183 | 'error': str(err), | |
2184 | }}) | |
2185 | del set_ntp_time | |
2186 | """.format( | |
2187 | repr(server), tzOffset, timeout | |
2188 | ) | |
9989 | 2189 | out, err = self.executeCommands( |
9868 | 2190 | command, mode=self._submitMode, timeout=(timeout + 2) * 1000 |
2191 | ) | |
2192 | if err: | |
2193 | return False, err | |
2194 | else: | |
2195 | res = ast.literal_eval(out.decode("utf-8")) | |
2196 | return res["result"], res["error"] | |
2197 | ||
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2198 | |
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
|
2199 | 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
|
2200 | """ |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2201 | 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
|
2202 | |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2203 | @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
|
2204 | @type MicroPythonWidget |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2205 | @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
|
2206 | @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
|
2207 | @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
|
2208 | @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
|
2209 | @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
|
2210 | @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
|
2211 | @param _boardName name of the board (unused) |
9738 | 2212 | @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
|
2213 | @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
|
2214 | @type str |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2215 | @return reference to the instantiated device object |
10897 | 2216 | @rtype RP2Device |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
2217 | """ |
10897 | 2218 | return RP2Device(microPythonWidget, deviceType) |