40 super().__init__() |
40 super().__init__() |
41 self.setupUi(self) |
41 self.setupUi(self) |
42 self.setObjectName("MicroPythonPage") |
42 self.setObjectName("MicroPythonPage") |
43 |
43 |
44 self.showPasswordButton.setIcon(EricPixmapCache.getIcon("showPassword")) |
44 self.showPasswordButton.setIcon(EricPixmapCache.getIcon("showPassword")) |
|
45 self.apShowPasswordButton.setIcon(EricPixmapCache.getIcon("showPassword")) |
45 |
46 |
46 self.workspacePicker.setMode(EricPathPickerModes.DIRECTORY_MODE) |
47 self.workspacePicker.setMode(EricPathPickerModes.DIRECTORY_MODE) |
47 |
48 |
48 self.colorSchemeComboBox.addItems(sorted(AnsiColorSchemes.keys())) |
49 self.colorSchemeComboBox.addItems(sorted(AnsiColorSchemes.keys())) |
49 |
50 |
80 self.mpyCrossPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) |
81 self.mpyCrossPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) |
81 self.mpyCrossPicker.setFilters(self.tr("All Files (*)")) |
82 self.mpyCrossPicker.setFilters(self.tr("All Files (*)")) |
82 |
83 |
83 self.dfuUtilPathPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) |
84 self.dfuUtilPathPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) |
84 self.dfuUtilPathPicker.setFilters(self.tr("All Files (*)")) |
85 self.dfuUtilPathPicker.setFilters(self.tr("All Files (*)")) |
|
86 |
|
87 # populate the WiFi security mode combo box |
|
88 self.apSecurityComboBox.addItem(self.tr("open"), 0) |
|
89 self.apSecurityComboBox.addItem("WEP", 1) |
|
90 self.apSecurityComboBox.addItem("WPA", 2) |
|
91 self.apSecurityComboBox.addItem("WPA2", 3) |
|
92 self.apSecurityComboBox.addItem("WPA/WPA2", 4) |
|
93 self.apSecurityComboBox.addItem("WPA2 (CCMP)", 5) |
|
94 self.apSecurityComboBox.addItem("WPA3", 6) |
|
95 self.apSecurityComboBox.addItem("WPA2/WPA3", 7) |
85 |
96 |
86 # set initial values |
97 # set initial values |
87 # workspace |
98 # workspace |
88 self.workspacePicker.setText( |
99 self.workspacePicker.setText( |
89 FileSystemUtilities.toNativeSeparators( |
100 FileSystemUtilities.toNativeSeparators( |
123 self.countryEdit.setText(Preferences.getMicroPython("WifiCountry").upper()) |
134 self.countryEdit.setText(Preferences.getMicroPython("WifiCountry").upper()) |
124 self.ssidEdit.setText(Preferences.getMicroPython("WifiName")) |
135 self.ssidEdit.setText(Preferences.getMicroPython("WifiName")) |
125 self.passwordEdit.setText(Preferences.getMicroPython("WifiPassword")) |
136 self.passwordEdit.setText(Preferences.getMicroPython("WifiPassword")) |
126 self.apSsidEdit.setText(Preferences.getMicroPython("WifiApName")) |
137 self.apSsidEdit.setText(Preferences.getMicroPython("WifiApName")) |
127 self.apPasswordEdit.setText(Preferences.getMicroPython("WifiApPassword")) |
138 self.apPasswordEdit.setText(Preferences.getMicroPython("WifiApPassword")) |
|
139 index = self.apSecurityComboBox.findData( |
|
140 Preferences.getMicroPython("WifiApAuthMode") |
|
141 ) |
|
142 if index == -1: |
|
143 index = 5 # default it to WPA/WPA2 in case of an issue |
|
144 self.apSecurityComboBox.setCurrentIndex(index) |
128 |
145 |
129 # MPY Cross Compiler |
146 # MPY Cross Compiler |
130 self.mpyCrossPicker.setText(Preferences.getMicroPython("MpyCrossCompiler")) |
147 self.mpyCrossPicker.setText(Preferences.getMicroPython("MpyCrossCompiler")) |
131 |
148 |
132 # PyBoard specifics |
149 # PyBoard specifics |
210 Preferences.setMicroPython("WifiCountry", self.countryEdit.text().upper()) |
227 Preferences.setMicroPython("WifiCountry", self.countryEdit.text().upper()) |
211 Preferences.setMicroPython("WifiName", self.ssidEdit.text()) |
228 Preferences.setMicroPython("WifiName", self.ssidEdit.text()) |
212 Preferences.setMicroPython("WifiPassword", self.passwordEdit.text()) |
229 Preferences.setMicroPython("WifiPassword", self.passwordEdit.text()) |
213 Preferences.setMicroPython("WifiApName", self.apSsidEdit.text()) |
230 Preferences.setMicroPython("WifiApName", self.apSsidEdit.text()) |
214 Preferences.setMicroPython("WifiApPassword", self.apPasswordEdit.text()) |
231 Preferences.setMicroPython("WifiApPassword", self.apPasswordEdit.text()) |
|
232 Preferences.setMicroPython( |
|
233 "WifiApAuthMode", self.apSecurityComboBox.currentData() |
|
234 ) |
215 |
235 |
216 # MPY Cross Compiler |
236 # MPY Cross Compiler |
217 Preferences.setMicroPython("MpyCrossCompiler", self.mpyCrossPicker.text()) |
237 Preferences.setMicroPython("MpyCrossCompiler", self.mpyCrossPicker.text()) |
218 |
238 |
219 # PyBoard specifics |
239 # PyBoard specifics |