Fri, 10 Mar 2023 18:04:06 +0100
MicroPython
- Added support for synchronizing the board time via NTP for network enabled boards.
8122 | 1 | # -*- coding: utf-8 -*- |
2 | ||
9653
e67609152c5e
Updated copyright for 2023.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9496
diff
changeset
|
3 | # Copyright (c) 2021 - 2023 Detlev Offenbach <detlev@die-offenbachs.de> |
8122 | 4 | # |
5 | ||
6 | """ | |
7 | Module implementing the device interface class for RP2040 based boards | |
8 | (e.g. Raspberry Pi Pico). | |
9 | """ | |
10 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
11 | import ast |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
12 | import binascii |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
13 | import json |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
14 | import os |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
15 | |
9747 | 16 | from PyQt6.QtCore import QUrl, pyqtSlot |
9820 | 17 | from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
18 | from PyQt6.QtWidgets import QDialog, QMenu |
8122 | 19 | |
9747 | 20 | from eric7 import Globals, Preferences |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
21 | from eric7.EricGui.EricOverrideCursor import EricOverrideCursor |
9747 | 22 | from eric7.EricWidgets import EricMessageBox |
23 | from eric7.EricWidgets.EricApplication import ericApp | |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
24 | |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
25 | from ..MicroPythonWidget import HAS_QTCHART |
9756
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
26 | from . import FirmwareGithubUrls |
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
27 | from .DeviceBase import BaseDevice |
8122 | 28 | |
29 | ||
9756
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
30 | class RP2040Device(BaseDevice): |
8122 | 31 | """ |
32 | Class implementing the device for RP2040 based boards. | |
33 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
34 | |
8122 | 35 | def __init__(self, microPythonWidget, deviceType, parent=None): |
36 | """ | |
37 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
38 | |
8122 | 39 | @param microPythonWidget reference to the main MicroPython widget |
40 | @type MicroPythonWidget | |
41 | @param deviceType device type assigned to this device interface | |
42 | @type str | |
43 | @param parent reference to the parent object | |
44 | @type QObject | |
45 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
46 | super().__init__(microPythonWidget, deviceType, parent) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
47 | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
48 | self.__createRP2040Menu() |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
49 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
50 | self.__statusTranslations = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
51 | "picow": { |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
52 | -3: self.tr("authentication failed"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
53 | -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
|
54 | -1: self.tr("connection failed"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
55 | 0: self.tr("idle"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
56 | 1: self.tr("connecting"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
57 | 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
|
58 | 3: self.tr("connected"), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
59 | }, |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
60 | "picowireless": { |
9835 | 61 | 0: self.tr("idle"), |
62 | 1: self.tr("no matching access point found"), | |
63 | 2: self.tr("network scan completed"), | |
64 | 3: self.tr("connected"), | |
65 | 4: self.tr("connection failed"), | |
66 | 5: self.tr("connection lost"), | |
67 | 6: self.tr("disconnected"), | |
68 | 7: self.tr("AP listening"), | |
69 | 8: self.tr("AP connected"), | |
70 | 9: self.tr("AP failed"), | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
71 | }, |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
72 | } |
9843
72e8270a5940
Removed an obsolete TODO marker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9841
diff
changeset
|
73 | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
74 | self.__securityTranslations = { |
9836 | 75 | "picow": { |
76 | 0: self.tr("open", "open WiFi network"), | |
77 | 1: "WEP", | |
78 | 2: "WPA", | |
79 | 3: "WPA2", | |
80 | 4: "WPA/WPA2", | |
81 | 5: "WPA2 (CCMP)", | |
82 | 6: "WPA3", | |
83 | 7: "WPA2/WPA3", | |
84 | }, | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
85 | "picowireless": { |
9836 | 86 | 2: "WPA", |
87 | 4: "WPA2 (CCMP)", | |
88 | 5: "WEP", | |
89 | 7: self.tr("open", "open WiFi network"), | |
90 | 8: self.tr("automatic"), | |
91 | }, | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
92 | } |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
93 | |
8122 | 94 | def setButtons(self): |
95 | """ | |
96 | Public method to enable the supported action buttons. | |
97 | """ | |
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
|
98 | 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
|
99 | |
8122 | 100 | self.microPython.setActionButtons( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
101 | 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
|
102 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
103 | |
8122 | 104 | def forceInterrupt(self): |
105 | """ | |
106 | Public method to determine the need for an interrupt when opening the | |
107 | serial connection. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
108 | |
8122 | 109 | @return flag indicating an interrupt is needed |
110 | @rtype bool | |
111 | """ | |
112 | return False | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
113 | |
8122 | 114 | def deviceName(self): |
115 | """ | |
116 | 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
|
117 | |
8122 | 118 | @return name of the device |
119 | @rtype str | |
120 | """ | |
121 | return self.tr("RP2040") | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
122 | |
8122 | 123 | def canStartRepl(self): |
124 | """ | |
125 | 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
|
126 | |
8122 | 127 | @return tuple containing a flag indicating it is safe to start a REPL |
128 | and a reason why it cannot. | |
129 | @rtype tuple of (bool, str) | |
130 | """ | |
131 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
132 | |
8122 | 133 | def canStartPlotter(self): |
134 | """ | |
135 | 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
|
136 | |
8122 | 137 | @return tuple containing a flag indicating it is safe to start a |
138 | Plotter and a reason why it cannot. | |
139 | @rtype tuple of (bool, str) | |
140 | """ | |
141 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
142 | |
8122 | 143 | def canRunScript(self): |
144 | """ | |
145 | 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
|
146 | |
8122 | 147 | @return tuple containing a flag indicating it is safe to start a |
148 | Plotter and a reason why it cannot. | |
149 | @rtype tuple of (bool, str) | |
150 | """ | |
151 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
152 | |
8122 | 153 | def runScript(self, script): |
154 | """ | |
155 | 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
|
156 | |
8122 | 157 | @param script script to be executed |
158 | @type str | |
159 | """ | |
160 | pythonScript = script.split("\n") | |
161 | self.sendCommands(pythonScript) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
162 | |
8122 | 163 | def canStartFileManager(self): |
164 | """ | |
165 | 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
|
166 | |
8122 | 167 | @return tuple containing a flag indicating it is safe to start a |
168 | File Manager and a reason why it cannot. | |
169 | @rtype tuple of (bool, str) | |
170 | """ | |
171 | return True, "" | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
172 | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
173 | def __createRP2040Menu(self): |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
174 | """ |
9755 | 175 | Private method to create the RO2040 submenu. |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
176 | """ |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
177 | self.__rp2040Menu = QMenu(self.tr("RP2040 Functions")) |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
178 | |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
179 | self.__showMpyAct = self.__rp2040Menu.addAction( |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
180 | 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
|
181 | ) |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
182 | self.__rp2040Menu.addSeparator() |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
183 | self.__bootloaderAct = self.__rp2040Menu.addAction( |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
184 | 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
|
185 | ) |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
186 | self.__flashMpyAct = self.__rp2040Menu.addAction( |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
187 | 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
|
188 | ) |
9835 | 189 | self.__rp2040Menu.addSeparator() |
190 | self.__resetAct = self.__rp2040Menu.addAction( | |
191 | self.tr("Reset Device"), self.__resetDevice | |
192 | ) | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
193 | |
8122 | 194 | def addDeviceMenuEntries(self, menu): |
195 | """ | |
196 | 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
|
197 | |
8122 | 198 | @param menu reference to the context menu |
199 | @type QMenu | |
200 | """ | |
201 | connected = self.microPython.isConnected() | |
9749 | 202 | linkConnected = self.microPython.isLinkConnected() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
203 | |
9752
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
204 | 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
|
205 | 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
|
206 | self.__flashMpyAct.setEnabled(not linkConnected) |
9835 | 207 | 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
|
208 | |
2b9546c0cbd9
Moved the MicroPython board specific functions to a separate submenu.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9751
diff
changeset
|
209 | menu.addMenu(self.__rp2040Menu) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
210 | |
8122 | 211 | def hasFlashMenuEntry(self): |
212 | """ | |
213 | 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
|
214 | |
8122 | 215 | @return flag indicating a specific flash menu entry |
216 | @rtype bool | |
217 | """ | |
218 | return True | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
219 | |
8122 | 220 | @pyqtSlot() |
221 | def __flashPython(self): | |
222 | """ | |
223 | Private slot to flash a MicroPython firmware to the device. | |
224 | """ | |
9756
9854647c8c5c
Reorganized the MicroPython package.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9755
diff
changeset
|
225 | from ..UF2FlashDialog import UF2FlashDialog |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
226 | |
8122 | 227 | dlg = UF2FlashDialog(boardType="rp2040") |
228 | dlg.exec() | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
229 | |
9820 | 230 | @pyqtSlot() |
8122 | 231 | def __activateBootloader(self): |
232 | """ | |
9820 | 233 | Private slot to switch the board into 'bootloader' mode. |
8122 | 234 | """ |
235 | if self.microPython.isConnected(): | |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
236 | self.microPython.deviceInterface().execute( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
237 | [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
238 | "import machine", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
239 | "machine.bootloader()", |
9835 | 240 | ], |
241 | mode=self._submitMode, | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
242 | ) |
8122 | 243 | # simulate pressing the disconnect button |
244 | 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
|
245 | |
9747 | 246 | @pyqtSlot() |
247 | def __showFirmwareVersions(self): | |
248 | """ | |
249 | Private slot to show the firmware version of the connected device and the | |
250 | available firmware version. | |
251 | """ | |
252 | 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
|
253 | 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
|
254 | EricMessageBox.critical( |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
255 | None, |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
256 | 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
|
257 | self.tr( |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
258 | """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
|
259 | """ 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
|
260 | """ Aborting...""" |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
261 | ), |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
262 | ) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
263 | 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
|
264 | 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
|
265 | # 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
|
266 | url = QUrl(FirmwareGithubUrls["pimoroni_pico"]) |
9747 | 267 | else: |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
268 | 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
|
269 | 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
|
270 | request = QNetworkRequest(url) |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
271 | 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
|
272 | reply.finished.connect(lambda: self.__firmwareVersionResponse(reply)) |
9747 | 273 | |
9820 | 274 | @pyqtSlot(QNetworkReply) |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
275 | def __firmwareVersionResponse(self, reply): |
9747 | 276 | """ |
9820 | 277 | Private slot handling the response of the latest version request. |
9747 | 278 | |
279 | @param reply reference to the reply object | |
280 | @type QNetworkReply | |
281 | """ | |
282 | latestUrl = reply.url().toString() | |
283 | tag = latestUrl.rsplit("/", 1)[-1] | |
284 | while tag and not tag[0].isdecimal(): | |
285 | # get rid of leading non-decimal characters | |
286 | tag = tag[1:] | |
287 | latestVersion = Globals.versionToTuple(tag) | |
288 | ||
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
289 | if self._deviceData["mpy_version"] == "unknown": |
9747 | 290 | currentVersionStr = self.tr("unknown") |
291 | currentVersion = (0, 0, 0) | |
292 | 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
|
293 | 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
|
294 | 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
|
295 | 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
|
296 | 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
|
297 | ) |
9747 | 298 | currentVersion = Globals.versionToTuple(currentVersionStr) |
299 | ||
300 | msg = self.tr( | |
301 | "<h4>MicroPython Version Information</h4>" | |
302 | "<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
|
303 | "<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
|
304 | "<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
|
305 | "{2}" |
9747 | 306 | "</table>" |
307 | ).format( | |
308 | currentVersionStr, | |
309 | tag, | |
9786
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
310 | self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( |
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
311 | self._deviceData["mpy_variant"] |
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
312 | ) |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
313 | if self._deviceData["mpy_variant"] |
9747 | 314 | else "", |
315 | ) | |
9786
f94b530722af
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
316 | 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
|
317 | self._deviceData["mpy_variant_version"] |
9747 | 318 | ): |
9772
06ef28082c4d
Changed the RP2040 related code of the MicroPython package to show the version info for a MicroPython variant (like Pimoroni Pico) if such is available (e.g. Pimoroni Pico 1.19.14 or newer).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9765
diff
changeset
|
319 | # 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
|
320 | 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
|
321 | elif currentVersion < latestVersion: |
9747 | 322 | msg += self.tr("<p><b>Update available!</b></p>") |
323 | ||
324 | EricMessageBox.information( | |
325 | None, | |
326 | self.tr("MicroPython Version"), | |
327 | msg, | |
328 | ) | |
329 | ||
9835 | 330 | @pyqtSlot() |
331 | def __resetDevice(self): | |
332 | """ | |
333 | Private slot to reset the connected device. | |
334 | """ | |
335 | self.microPython.deviceInterface().execute( | |
336 | "import machine\nmachine.reset()\n", mode=self._submitMode | |
337 | ) | |
338 | ||
8122 | 339 | def getDocumentationUrl(self): |
340 | """ | |
341 | 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
|
342 | |
8122 | 343 | @return documentation URL of the device |
344 | @rtype str | |
345 | """ | |
346 | return Preferences.getMicroPython("MicroPythonDocuUrl") | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
347 | |
8122 | 348 | def getDownloadMenuEntries(self): |
349 | """ | |
350 | 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
|
351 | |
8122 | 352 | @return list of tuples with menu text and URL to be opened for each |
353 | entry | |
354 | @rtype list of tuple of (str, str) | |
355 | """ | |
356 | return [ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
357 | ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
358 | self.tr("MicroPython Firmware"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
359 | Preferences.getMicroPython("MicroPythonFirmwareUrl"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
360 | ), |
8122 | 361 | ("<separator>", ""), |
9748 | 362 | (self.tr("Pimoroni Pico Firmware"), FirmwareGithubUrls["pimoroni_pico"]), |
9747 | 363 | ("<separator>", ""), |
364 | ( | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
365 | self.tr("CircuitPython Firmware"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
366 | Preferences.getMicroPython("CircuitPythonFirmwareUrl"), |
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 | ( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
369 | self.tr("CircuitPython Libraries"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
370 | Preferences.getMicroPython("CircuitPythonLibrariesUrl"), |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
371 | ), |
8122 | 372 | ] |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
373 | |
9765
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
374 | ################################################################## |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
375 | ## time related methods below |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
376 | ################################################################## |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
377 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
378 | def _getSetTimeCode(self): |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
379 | """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
380 | 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
|
381 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
382 | 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
|
383 | subclasses. |
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 | @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
|
386 | @rtype str |
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 | # rtc_time[0] - year 4 digit |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
389 | # rtc_time[1] - month 1..12 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
390 | # rtc_time[2] - day 1..31 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
391 | # 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
|
392 | # rtc_time[4] - hour 0..23 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
393 | # rtc_time[5] - minute 0..59 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
394 | # rtc_time[6] - second 0..59 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
395 | # rtc_time[7] - yearday 1..366 |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
396 | # 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
|
397 | |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
398 | # 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
|
399 | # (year, month, day, weekday, hour, minute, second, subseconds) |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
400 | # __IGNORE_WARNING_M891__ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
401 | # 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
|
402 | return """ |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
403 | def set_time(rtc_time): |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
404 | import machine |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
405 | rtc = machine.RTC() |
6378da868bb0
Reorganized the MicroPython code even more.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9763
diff
changeset
|
406 | rtc.datetime(rtc_time[:7] + (0,)) |
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 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
409 | ################################################################## |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
410 | ## Methods below implement WiFi related methods |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
411 | ################################################################## |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
412 | |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
413 | 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
|
414 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
415 | 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
|
416 | |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
417 | @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
|
418 | @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
|
419 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
420 | 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
|
421 | 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
|
422 | 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
|
423 | ) |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
424 | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
425 | def hasWifi(self): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
426 | """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
427 | Public method to check the availability of WiFi. |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
428 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
429 | @return tuple containing a flag indicating the availability of WiFi |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
430 | and the WiFi type (picow or picowireless) |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
431 | @rtype tuple of (bool, str) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
432 | @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
|
433 | """ |
9835 | 434 | # picowireless: |
435 | # It seems to take up to 20 sec to detect, that no Pico Wireless Pack is | |
436 | # attached. Therefore the command will timeout before. | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
437 | command = """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
438 | def has_wifi(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
439 | try: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
440 | import network |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
441 | if hasattr(network, 'WLAN'): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
442 | return True, 'picow' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
443 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
444 | try: |
9836 | 445 | import picowireless as pw |
446 | try: | |
447 | if pw.get_fw_version() != '': | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
448 | return True, 'picowireless' |
9836 | 449 | except RuntimeError: |
450 | picowireless.init() | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
451 | return True, 'picowireless' |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
452 | except ImportError: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
453 | pass |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
454 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
455 | return False, '' |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
456 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
457 | print(has_wifi()) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
458 | del has_wifi |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
459 | """ |
9828 | 460 | out, err = self._interface.execute( |
461 | command, mode=self._submitMode, timeout=10000 | |
462 | ) | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
463 | if err: |
9836 | 464 | if not err.startswith(b"Timeout "): |
9835 | 465 | raise OSError(self._shortError(err)) |
466 | else: | |
467 | return False # pimoroni firmware loaded but no pico wireless present | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
468 | return ast.literal_eval(out.decode("utf-8")) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
469 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
470 | def getWifiData(self): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
471 | """ |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
472 | 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
|
473 | |
9798 | 474 | @return tuple of three dictionaries containing the WiFi status data |
475 | for the WiFi client, access point and overall data | |
476 | @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
|
477 | @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
|
478 | """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
479 | if self._deviceData["wifi_type"] == "picow": |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
480 | command = """ |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
481 | def wifi_status(): |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
482 | import ubinascii |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
483 | import ujson |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
484 | 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
|
485 | import rp2 |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
486 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
487 | wifi = network.WLAN(network.STA_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
488 | station = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
489 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
490 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
491 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
492 | 'ifconfig': wifi.ifconfig(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
493 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
494 | 'channel': wifi.config('channel'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
495 | 'txpower': wifi.config('txpower'), |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
496 | 'country': rp2.country(), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
497 | } |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
498 | print(ujson.dumps(station)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
499 | |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
500 | wifi = network.WLAN(network.AP_IF) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
501 | ap = { |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
502 | 'active': wifi.active(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
503 | 'connected': wifi.isconnected(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
504 | 'status': wifi.status(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
505 | 'ifconfig': wifi.ifconfig(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
506 | 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
507 | 'channel': wifi.config('channel'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
508 | 'txpower': wifi.config('txpower'), |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
509 | 'essid': wifi.config('essid'), |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
510 | 'country': rp2.country(), |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
511 | } |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
512 | print(ujson.dumps(ap)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
513 | |
9798 | 514 | overall = { |
515 | 'active': station['active'] or ap['active'] | |
516 | } | |
517 | print(ujson.dumps(overall)) | |
518 | ||
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
519 | wifi_status() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
520 | del wifi_status |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
521 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
522 | elif self._deviceData["wifi_type"] == "picowireless": |
9835 | 523 | command = """ |
524 | def wifi_status(): | |
525 | import picowireless as pw | |
526 | import ubinascii | |
527 | import ujson | |
528 | ||
529 | def ip_str(ip): | |
530 | return '.'.join(str(i) for i in ip) | |
531 | ||
532 | station = { | |
533 | 'active': pw.get_connection_status() not in (0, 7, 8, 9), | |
534 | 'connected': pw.get_connection_status() == 3, | |
535 | 'status': pw.get_connection_status(), | |
536 | 'ifconfig': ( | |
537 | ip_str(pw.get_ip_address()), | |
538 | ip_str(pw.get_subnet_mask()), | |
539 | ip_str(pw.get_gateway_ip()), | |
540 | '0.0.0.0' | |
541 | ), | |
542 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), | |
543 | } | |
544 | if station['connected']: | |
545 | station.update({ | |
546 | 'ap_ssid': pw.get_current_ssid(), | |
9836 | 547 | 'ap_bssid': ubinascii.hexlify(pw.get_current_bssid(), ':'), |
9835 | 548 | 'ap_rssi': pw.get_current_rssi(), |
549 | 'ap_security': pw.get_current_encryption_type(), | |
550 | }) | |
551 | print(ujson.dumps(station)) | |
552 | ||
553 | ap = { | |
554 | 'active': pw.get_connection_status() in (7, 8, 9), | |
555 | 'connected': pw.get_connection_status() == 8, | |
556 | 'status': pw.get_connection_status(), | |
557 | 'mac': ubinascii.hexlify(pw.get_mac_address(), ':').decode(), | |
558 | } | |
559 | if ap['active']: | |
560 | ap['essid'] = pw.get_current_ssid() | |
9836 | 561 | ap['ifconfig'] = ( |
562 | ip_str(pw.get_ip_address()), | |
563 | ip_str(pw.get_subnet_mask()), | |
564 | ip_str(pw.get_gateway_ip()), | |
565 | '0.0.0.0' | |
566 | ) | |
9835 | 567 | print(ujson.dumps(ap)) |
568 | ||
569 | overall = { | |
570 | 'active': pw.get_connection_status() != 0 | |
571 | } | |
572 | print(ujson.dumps(overall)) | |
573 | ||
574 | wifi_status() | |
575 | del wifi_status | |
576 | """ | |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
577 | else: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
578 | return super().getWifiData() |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
579 | |
9827 | 580 | out, err = self._interface.execute(command, mode=self._submitMode) |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
581 | if err: |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
582 | raise OSError(self._shortError(err)) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
583 | |
9798 | 584 | 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
|
585 | station = json.loads(stationStr) |
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
586 | ap = json.loads(apStr) |
9798 | 587 | overall = json.loads(overallStr) |
9836 | 588 | if "status" in station: |
589 | # translate the numerical status to a string | |
590 | try: | |
591 | station["status"] = self.__statusTranslations[ | |
592 | self._deviceData["wifi_type"] | |
593 | ][station["status"]] | |
594 | except KeyError: | |
595 | station["status"] = str(station["status"]) | |
596 | if "status" in station: | |
597 | # translate the numerical status to a string | |
598 | try: | |
599 | ap["status"] = self.__statusTranslations[self._deviceData["wifi_type"]][ | |
600 | ap["status"] | |
601 | ] | |
602 | except KeyError: | |
603 | ap["status"] = str(ap["status"]) | |
604 | if "ap_security" in station: | |
605 | # translate the numerical AP security to a string | |
606 | try: | |
607 | station["ap_security"] = self.__securityTranslations[ | |
608 | self._deviceData["wifi_type"] | |
609 | ][station["ap_security"]] | |
610 | except KeyError: | |
611 | station["ap_security"] = self.tr("unknown ({0})").format( | |
612 | station["ap_security"] | |
613 | ) | |
9798 | 614 | return station, ap, overall |
9775
c6806d24468b
Created new branch <mpy_network>.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9772
diff
changeset
|
615 | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
616 | def connectWifi(self, ssid, password): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
617 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
618 | 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
|
619 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
620 | @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
|
621 | @type str |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
622 | @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
|
623 | @type str |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
624 | @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
|
625 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
626 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
627 | 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
|
628 | 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
|
629 | command = """ |
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
|
630 | def connect_wifi(ssid, password, country): |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
631 | 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
|
632 | 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
|
633 | import ujson |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
634 | 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
|
635 | |
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
|
636 | rp2.country(country) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
637 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
638 | 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
|
639 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
640 | wifi.active(True) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
641 | 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
|
642 | max_wait = 140 |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
643 | while max_wait: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
644 | 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
|
645 | break |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
646 | max_wait -= 1 |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
647 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
648 | status = wifi.status() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
649 | 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
|
650 | |
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
|
651 | connect_wifi({0}, {1}, {2}) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
652 | 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
|
653 | """.format( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
654 | repr(ssid), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
655 | repr(password if password else ""), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
656 | repr(country if country else "XX"), |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
657 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
658 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 659 | command = """ |
660 | def connect_wifi(ssid, password): | |
661 | import picowireless as pw | |
662 | import ujson | |
663 | from time import sleep | |
664 | ||
665 | pw.init() | |
666 | if bool(password): | |
667 | pw.wifi_set_passphrase(ssid, password) | |
668 | else: | |
669 | pw.wifi_set_network(ssid) | |
670 | ||
671 | max_wait = 140 | |
672 | while max_wait: | |
673 | if pw.get_connection_status() == 3: | |
674 | break | |
675 | max_wait -= 1 | |
676 | sleep(0.1) | |
677 | status = pw.get_connection_status() | |
678 | if status == 3: | |
679 | pw.set_led(0, 64, 0) | |
680 | else: | |
681 | pw.set_led(64, 0, 0) | |
682 | print(ujson.dumps({{'connected': status == 3, 'status': status}})) | |
683 | ||
684 | connect_wifi({0}, {1}) | |
685 | del connect_wifi | |
686 | """.format( | |
687 | repr(ssid), | |
688 | repr(password if password else ""), | |
689 | ) | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
690 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
691 | return super().connectWifi(ssid, password) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
692 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
693 | with EricOverrideCursor(): |
9799 | 694 | out, err = self._interface.execute( |
9827 | 695 | command, mode=self._submitMode, timeout=15000 |
9799 | 696 | ) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
697 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
698 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
699 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
700 | 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
|
701 | if result["connected"]: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
702 | error = "" |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
703 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
704 | try: |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
705 | 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
|
706 | result["status"] |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
707 | ] |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
708 | except KeyError: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
709 | error = str(result["status"]) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
710 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
711 | return result["connected"], error |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
712 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
713 | def disconnectWifi(self): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
714 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
715 | 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
|
716 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
717 | @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
|
718 | @rtype tuple of (bool, str) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
719 | """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
720 | 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
|
721 | command = """ |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
722 | def disconnect_wifi(): |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
723 | import network |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
724 | from time import sleep |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
725 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
726 | 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
|
727 | wifi.disconnect() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
728 | wifi.active(False) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
729 | sleep(0.1) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
730 | print(not wifi.isconnected()) |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
731 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
732 | disconnect_wifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
733 | del disconnect_wifi |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
734 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
735 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 736 | command = """ |
737 | def disconnect_wifi(): | |
738 | import picowireless as pw | |
739 | from time import sleep | |
740 | ||
741 | pw.disconnect() | |
742 | sleep(0.1) | |
743 | print(pw.get_connection_status() != 3) | |
744 | pw.set_led(0, 0, 0) | |
745 | ||
746 | disconnect_wifi() | |
747 | del disconnect_wifi | |
748 | """ | |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
749 | else: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
750 | return super().disconnectWifi() |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
751 | |
9827 | 752 | out, err = self._interface.execute(command, mode=self._submitMode) |
9776
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
753 | if err: |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
754 | return False, err |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
755 | |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
756 | return out.decode("utf-8").strip() == "True", "" |
210bf87ae5c7
Continued implementing WiFi functionality for RP2040 based devices.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9775
diff
changeset
|
757 | |
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
|
758 | def writeCredentials(self, ssid, password): |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
759 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
760 | 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
|
761 | 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
|
762 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
763 | @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
|
764 | @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
|
765 | @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
|
766 | @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
|
767 | @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
|
768 | @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
|
769 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
770 | 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
|
771 | 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
|
772 | 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
|
773 | 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
|
774 | 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
|
775 | 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
|
776 | 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
|
777 | 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
|
778 | 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
|
779 | 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
|
780 | 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
|
781 | 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
|
782 | 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
|
783 | 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
|
784 | 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
|
785 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
786 | 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
|
787 | 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
|
788 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
789 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
790 | 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
|
791 | 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
|
792 | secrets = "WIFI_SSID = {0}\nWIFI_KEY = {1}\nWIFI_COUNTRY={2}".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
|
793 | 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
|
794 | repr(password) if password else '""', |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
795 | repr(country) if country 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
|
796 | ) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
797 | 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
|
798 | 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
|
799 | 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
|
800 | 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
|
801 | 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
|
802 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
803 | if self._deviceData["wifi_type"] == "picowireless": |
9836 | 804 | wifiConnectFile = "pimoroniWiFiConnect.py" |
805 | else: | |
806 | 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
|
807 | 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
|
808 | # 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
|
809 | 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
|
810 | # 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
|
811 | self.put( |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
812 | 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
|
813 | "/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
|
814 | ) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
815 | 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
|
816 | 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
|
817 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
818 | # modify boot.py |
9827 | 819 | out, err = self._interface.execute(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
|
820 | 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
|
821 | 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
|
822 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
823 | 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
|
824 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
825 | 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
|
826 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
827 | 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
|
828 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
829 | @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
|
830 | @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
|
831 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
832 | 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
|
833 | 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
|
834 | 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
|
835 | 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
|
836 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
837 | 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
|
838 | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
839 | 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
|
840 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
841 | 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
|
842 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
843 | @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
|
844 | @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
|
845 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
846 | 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
|
847 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
848 | 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
|
849 | 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
|
850 | 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
|
851 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
852 | 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
|
853 | 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
|
854 | 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
|
855 | try: |
9836 | 856 | s.connect(socket.getaddrinfo('quad9.net', 80)[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
|
857 | 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
|
858 | 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
|
859 | except: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
860 | 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
|
861 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
862 | 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
|
863 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
864 | 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
|
865 | 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
|
866 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
867 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 868 | command = """ |
869 | def check_internet(): | |
870 | import picowireless as pw | |
871 | ||
872 | if pw.get_connection_status() == 3: | |
873 | res = pw.ping((9, 9, 9, 9), 300) | |
874 | print(res >= 0) | |
875 | else: | |
876 | print(False) | |
877 | ||
878 | check_internet() | |
879 | del check_internet | |
880 | """ | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
881 | else: |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
882 | 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
|
883 | |
9836 | 884 | out, err = self._interface.execute( |
885 | command, mode=self._submitMode, timeout=10000 | |
886 | ) | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
887 | 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
|
888 | 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
|
889 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
890 | 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
|
891 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
892 | 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
|
893 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
894 | 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
|
895 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
896 | @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
|
897 | '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
|
898 | @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
|
899 | """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
900 | 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
|
901 | 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
|
902 | command = """ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
903 | 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
|
904 | 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
|
905 | 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
|
906 | |
163511257f24
Continued implementing WiFi functionality for 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 | 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
|
908 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
909 | 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
|
910 | 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
|
911 | 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
|
912 | 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
|
913 | 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
|
914 | 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
|
915 | 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
|
916 | 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
|
917 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
918 | 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
|
919 | del scan_networks |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
920 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
921 | repr(country if country else "XX") |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
922 | ) |
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
|
923 | |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
924 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 925 | command = """ |
926 | def scan_networks(): | |
927 | import picowireless as pw | |
928 | ||
929 | network_list = [] | |
930 | pw.init() | |
931 | pw.start_scan_networks() | |
932 | networks = pw.get_scan_networks() | |
933 | for n in range(networks): | |
934 | network_list.append(( | |
935 | pw.get_ssid_networks(n), | |
936 | pw.get_bssid_networks(n), | |
937 | pw.get_channel_networks(n), | |
938 | pw.get_rssi_networks(n), | |
939 | pw.get_enc_type_networks(n), | |
940 | )) | |
941 | print(network_list) | |
942 | ||
943 | scan_networks() | |
944 | del scan_networks | |
945 | """ | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
946 | 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
|
947 | 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
|
948 | |
9828 | 949 | out, err = self._interface.execute( |
950 | command, mode=self._submitMode, timeout=15000 | |
951 | ) | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
952 | 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
|
953 | 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
|
954 | |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
955 | 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
|
956 | networks = [] |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
957 | 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
|
958 | if network[0]: |
9836 | 959 | ssid = ( |
960 | network[0].decode("utf-8") | |
961 | if isinstance(network[0], bytes) | |
962 | else network[0] | |
963 | ) | |
964 | mac = ( | |
965 | binascii.hexlify(network[1], ":").decode("utf-8") | |
966 | if network[1] is not None | |
967 | else "" | |
968 | ) | |
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
969 | 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
|
970 | 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
|
971 | try: |
9836 | 972 | security = self.__securityTranslations[ |
973 | self._deviceData["wifi_type"] | |
974 | ][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
|
975 | 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
|
976 | 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
|
977 | 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
|
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 | 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
|
980 | |
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
|
981 | 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
|
982 | """ |
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
|
983 | 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
|
984 | |
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
|
985 | @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
|
986 | 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
|
987 | @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
|
988 | @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
|
989 | @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
|
990 | @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
|
991 | """ |
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
|
992 | 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
|
993 | 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
|
994 | "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
|
995 | ) |
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
|
996 | |
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
|
997 | 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
|
998 | 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
|
999 | 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
|
1000 | 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
|
1001 | 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
|
1002 | |
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
|
1003 | 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
|
1004 | 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
|
1005 | 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
|
1006 | 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
|
1007 | |
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
|
1008 | 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
|
1009 | del deactivate |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1010 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1011 | interface |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1012 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1013 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1014 | command = """ |
1015 | def deactivate(): | |
1016 | import picowireless as pw | |
1017 | ||
1018 | pw.init() | |
1019 | print(True) | |
1020 | ||
1021 | deactivate() | |
1022 | del deactivate | |
1023 | """ | |
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
|
1024 | 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
|
1025 | 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
|
1026 | |
9827 | 1027 | out, err = self._interface.execute(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
|
1028 | 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
|
1029 | 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
|
1030 | 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
|
1031 | 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
|
1032 | |
9797 | 1033 | def startAccessPoint(self, ssid, security=None, password=None, ifconfig=None): |
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
|
1034 | """ |
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
|
1035 | 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
|
1036 | |
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
|
1037 | @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
|
1038 | @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
|
1039 | @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
|
1040 | @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
|
1041 | @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
|
1042 | @type str (optional) |
9797 | 1043 | @param ifconfig IPv4 configuration for the access point if not default |
1044 | (IPv4 address, netmask, gateway address, DNS server address) | |
1045 | @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
|
1046 | @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
|
1047 | @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
|
1048 | """ |
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
|
1049 | 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
|
1050 | security = 0 |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1051 | password = "" |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1052 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1053 | 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
|
1054 | 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
|
1055 | 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
|
1056 | 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
|
1057 | command = """ |
9797 | 1058 | def start_ap(ssid, security, password, 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
|
1059 | 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
|
1060 | 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
|
1061 | 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
|
1062 | |
9797 | 1063 | 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
|
1064 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1065 | 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
|
1066 | ap.active(True) |
9797 | 1067 | if ifconfig: |
1068 | ap.ifconfig(ifconfig) | |
1069 | 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
|
1070 | sleep(0.1) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1071 | print(ap.isconnected()) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1072 | |
9797 | 1073 | start_ap({0}, {1}, {2}, {3}, {4}) |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1074 | del start_ap |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1075 | """.format( |
9797 | 1076 | repr(ssid), |
1077 | security, | |
1078 | repr(password), | |
1079 | ifconfig, | |
1080 | 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
|
1081 | ) |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1082 | elif self._deviceData["wifi_type"] == "picowireless": |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1083 | if ifconfig: |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1084 | return ( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1085 | False, |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1086 | self.tr( |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1087 | "Pico Wireless does not support setting the IPv4 parameters of" |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1088 | " the WiFi access point." |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1089 | ), |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1090 | ) |
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1091 | |
9836 | 1092 | # AP is fixed at channel 6 |
1093 | command = """ | |
1094 | def start_ap(ssid, password): | |
1095 | import picowireless as pw | |
1096 | ||
1097 | pw.init() | |
1098 | if bool(password): | |
1099 | res = pw.wifi_set_ap_passphrase(ssid, password, 6) | |
1100 | else: | |
1101 | res = pw.wifi_set_ap_network(ssid, 6) | |
1102 | status = pw.get_connection_status() | |
1103 | if status in (7, 8): | |
1104 | pw.set_led(0, 64, 0) | |
1105 | else: | |
1106 | pw.set_led(64, 0, 0) | |
1107 | print(res >= 0) | |
1108 | ||
1109 | start_ap({0}, {1}) | |
1110 | del start_ap | |
1111 | """.format( | |
1112 | repr(ssid), | |
1113 | repr(password if password else ""), | |
1114 | ) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1115 | 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
|
1116 | return super().startAccessPoint(ssid, security=security, password=password) |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1117 | |
9828 | 1118 | out, err = self._interface.execute( |
1119 | command, mode=self._submitMode, timeout=15000 | |
1120 | ) | |
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
|
1121 | 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
|
1122 | 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
|
1123 | 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
|
1124 | 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
|
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 | 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
|
1127 | """ |
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 | 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
|
1129 | |
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 | @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
|
1131 | @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
|
1132 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1133 | 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
|
1134 | 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
|
1135 | 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
|
1136 | 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
|
1137 | |
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
|
1138 | 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
|
1139 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1140 | 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
|
1141 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1142 | @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
|
1143 | 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
|
1144 | @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
|
1145 | """ |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1146 | 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
|
1147 | 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
|
1148 | 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
|
1149 | 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
|
1150 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1151 | 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
|
1152 | 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
|
1153 | 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
|
1154 | |
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1155 | 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
|
1156 | 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
|
1157 | """ |
9838
d6b87ef03c13
MicroPython, RP2040
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9836
diff
changeset
|
1158 | elif self._deviceData["wifi_type"] == "picowireless": |
9836 | 1159 | return ( |
1160 | [], | |
1161 | self.tr( | |
9841
3c6118eee33e
Updated translations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9838
diff
changeset
|
1162 | "Pico Wireless does not support reporting of connected clients." |
9836 | 1163 | ), |
1164 | ) | |
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
|
1165 | 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
|
1166 | 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
|
1167 | |
9828 | 1168 | out, err = self._interface.execute( |
1169 | command, mode=self._submitMode, timeout=10000 | |
1170 | ) | |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1171 | if 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
|
1172 | 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
|
1173 | |
163511257f24
Continued implementing WiFi functionality for 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 | 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
|
1175 | 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
|
1176 | |
9868 | 1177 | ################################################################## |
1178 | ## Methods below implement NTP related methods | |
1179 | ################################################################## | |
1180 | ||
1181 | def hasNetworkTime(self): | |
1182 | """ | |
1183 | Public method to check the availability of network time functions. | |
1184 | ||
1185 | @return flag indicating the availability of network time functions | |
1186 | @rtype bool | |
1187 | """ | |
1188 | command = """ | |
1189 | def has_ntp(): | |
1190 | try: | |
1191 | import ntptime | |
1192 | return True | |
1193 | except ImportError: | |
1194 | return False | |
1195 | ||
1196 | print(has_ntp()) | |
1197 | del has_ntp | |
1198 | """ | |
1199 | out, err = self._interface.execute(command, mode=self._submitMode) | |
1200 | if err: | |
1201 | raise OSError(self._shortError(err)) | |
1202 | return out.strip() == b"True" | |
1203 | ||
1204 | def setNetworkTime(self, server="0.pool.ntp.org", tzOffset=0, timeout=10): | |
1205 | """ | |
1206 | Public method to set the time to the network time retrieved from an | |
1207 | NTP server. | |
1208 | ||
1209 | @param server name of the NTP server to get the network time from | |
1210 | (defaults to "0.pool.ntp.org") | |
1211 | @type str (optional) | |
1212 | @param tzOffset offset with respect to UTC (defaults to 0) | |
1213 | @type int (optional) | |
1214 | @param timeout maximum time to wait for a server response in seconds | |
1215 | (defaults to 10) | |
1216 | @type int | |
1217 | @return tuple containing a flag indicating success and an error string | |
1218 | @rtype tuple of (bool, str) | |
1219 | """ | |
1220 | command = """ | |
1221 | def set_ntp_time(server, tz_offset, timeout): | |
1222 | import network | |
1223 | import ntptime | |
1224 | import machine | |
1225 | ||
1226 | if not network.WLAN(network.STA_IF).isconnected(): | |
1227 | return False | |
1228 | ||
1229 | ntptime.host = server | |
1230 | ntptime.timeout = timeout | |
1231 | ntptime.settime() | |
1232 | ||
1233 | rtc = machine.RTC() | |
1234 | t = list(rtc.datetime()) | |
1235 | t[4] += tz_offset | |
1236 | rtc.datetime(t) | |
1237 | ||
1238 | return True | |
1239 | ||
1240 | try: | |
1241 | print({{ | |
1242 | 'result': set_ntp_time({0}, {1}, {2}), | |
1243 | 'error': '', | |
1244 | }}) | |
1245 | except Exception as err: | |
1246 | print({{ | |
1247 | 'result': False, | |
1248 | 'error': str(err), | |
1249 | }}) | |
1250 | del set_ntp_time | |
1251 | """.format( | |
1252 | repr(server), tzOffset, timeout | |
1253 | ) | |
1254 | out, err = self._interface.execute( | |
1255 | command, mode=self._submitMode, timeout=(timeout + 2) * 1000 | |
1256 | ) | |
1257 | if err: | |
1258 | return False, err | |
1259 | else: | |
1260 | res = ast.literal_eval(out.decode("utf-8")) | |
1261 | return res["result"], res["error"] | |
1262 | ||
9781
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1263 | ############################################################################ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1264 | ## RP2 only methods below |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1265 | ############################################################################ |
3112f77f722b
Continued implementing WiFi functionality for RP2040 based devices (internet connection, network scan).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9779
diff
changeset
|
1266 | |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1267 | @pyqtSlot() |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1268 | def __setCountry(self): |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1269 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1270 | Private slot to configure the country of the connected RP2040 device. |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1271 | |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1272 | The country is the two letter country code. |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1273 | """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1274 | from ..WifiDialogs.WifiCountryDialog import WifiCountryDialog |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1275 | |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1276 | dlg = WifiCountryDialog() |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1277 | if dlg.exec() == QDialog.DialogCode.Accepted: |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1278 | country, remember = dlg.getCountry() |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1279 | if remember: |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1280 | Preferences.setMicroPython("WifiCountry", country) |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1281 | |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1282 | command = """ |
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1283 | 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
|
1284 | rp2.country({0}) |
9789
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1285 | """.format( |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1286 | repr(country) |
d8e0ab86ddca
Corrected some code style and formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9788
diff
changeset
|
1287 | ) |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1288 | |
9827 | 1289 | out, err = self._interface.execute(command, mode=self._submitMode) |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1290 | if err: |
9787
163511257f24
Continued implementing WiFi functionality for RP2040 based devices (show connected stations, save/remove credentials, boot script for Pico W).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9782
diff
changeset
|
1291 | self.microPython.showError("rp2.country()", err) |
9779
8d3c7c991085
Continued implementing WiFi functionality for RP2040 based devices (set country, menu hierarchy).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9776
diff
changeset
|
1292 | |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1293 | |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
1294 | 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
|
1295 | """ |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1296 | 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
|
1297 | |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1298 | @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
|
1299 | @type MicroPythonWidget |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1300 | @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
|
1301 | @type str |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1302 | @param vid vendor ID |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1303 | @type int |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1304 | @param pid product ID |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1305 | @type int |
9738 | 1306 | @param boardName name of the board |
1307 | @type str | |
9751
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
1308 | @param serialNumber serial number of the board |
606ac0e26533
Various enhancements and improvements to the MicroPython/CircuitPython related modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9749
diff
changeset
|
1309 | @type str |
9496
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1310 | @return reference to the instantiated device object |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1311 | @rtype RP2040Device |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1312 | """ |
05017f795c24
Changed MicroPython device imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
1313 | return RP2040Device(microPythonWidget, deviceType) |