Mercurial Repositories > eric / changeset

--- a/src/eric7/MicroPython/Devices/MCUScripts/circuitPy7WiFiConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/circuitPy7WiFiConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,7 +1,7 @@
 try:
     from secrets import secrets
 
-    def connectWiFi():
+    def connect_wifi():
         import wifi
 
         print("Connecting WiFi to '{0}' ...".format(secrets["ssid"]))
@@ -18,6 +18,6 @@
         else:
             print("WiFi connected:", wifi.radio.ipv4_address)
 
-    connectWiFi()
+    connect_wifi()
 except ImportError:
     print("WiFi secrets are kept in 'secrets.py', please add them there!")

--- a/src/eric7/MicroPython/Devices/MCUScripts/esp32WiFiConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/esp32WiFiConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,4 +1,4 @@
-def connectWiFi():
+def connect_wifi():
     import esp32
     import network
     from time import sleep
@@ -24,4 +24,4 @@
     except:
         print("WiFi secrets are kept in NVM. Please store them there!")
 
-connectWiFi()
+connect_wifi()

--- a/src/eric7/MicroPython/Devices/MCUScripts/mpyWiFiConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/mpyWiFiConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,7 +1,7 @@
 try:
     import secrets
 
-    def connectWiFi():
+    def connect_wifi():
         import network
         from time import sleep
 
@@ -21,6 +21,6 @@
         else:
             print("WiFi connection failed")
 
-    connectWiFi()
+    connect_wifi()
 except ImportError:
     print("WiFi secrets are kept in 'secrets.py', please add them there!")

--- a/src/eric7/MicroPython/Devices/MCUScripts/picoWiznetConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/picoWiznetConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,17 +1,23 @@
 try:
     import wiznet_config
 
-    def connectLan():
+    def connect_lan():
         import network
         import time
         from machine import Pin, SPI
 
+        try:
+            ifconfig = wiznet_config.ifconfig
+        except AttributeError:
+            print("The network configuration in 'wiznet_config.py' is invalid.")
+            return None
+
         spi = SPI(0, 2_000_000, mosi=Pin(19), miso=Pin(16), sck=Pin(18))
         nic = network.WIZNET5K(spi, Pin(17), Pin(20))
 
         nic.active(False)
         nic.active(True)
-        nic.ifconfig(wiznet_config.ifconfig)
+        nic.ifconfig(ifconfig)
         max_wait = 140
         while max_wait:
             if nic.isconnected():
@@ -30,5 +36,5 @@
     print(
         "The network configuration is kept in 'wiznet_config.py'. Please add it there."
     )
-    def connectLan():
+    def connect_lan():
         return None

--- a/src/eric7/MicroPython/Devices/MCUScripts/picowWiFiConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/picowWiFiConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,7 +1,7 @@
 try:
     import secrets
 
-    def connectWiFi():
+    def connect_wifi():
         import network
         import rp2
         from time import sleep
@@ -26,6 +26,6 @@
         else:
             print("WiFi connection failed")
 
-    connectWiFi()
+    connect_wifi()
 except ImportError:
     print("WiFi secrets are kept in 'secrets.py', please add them there!")

--- a/src/eric7/MicroPython/Devices/MCUScripts/pimoroniWiFiConnect.py	Tue Mar 14 13:18:54 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MCUScripts/pimoroniWiFiConnect.py	Tue Mar 14 13:19:33 2023 +0100
@@ -1,7 +1,7 @@
 try:
     import secrets
 
-    def connectWiFi():
+    def connect_wifi():
         import picowireless as pw
         from time import sleep
 
@@ -25,6 +25,6 @@
             pw.set_led(64, 0, 0)
             print("WiFi connection failed")
 
-    connectWiFi()
+    connect_wifi()
 except ImportError:
     print("WiFi secrets are kept in 'secrets.py', please add them there!")