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