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