WIP: Network Refactor

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "vendor/micropython"]
 	path = vendor/micropython
-	url = https://github.com/damz/micropython.git
+	url = https://github.com/Ribbit-Network/micropython
 	branch = pr/mbedtls
 	ignore = dirty
 [submodule "vendor/microdot"]

modules/main.py

@@ -137,10 +137,21 @@ class Registry:
         ),
     )
 
+    if not in_simulator:
+        registry.i2c_bus = _i2c.LockableI2CBus(
+            0, scl=machine.Pin(4), sda=machine.Pin(3), freq=50000
+        )
+
+        # Turn on the I2C power:
+        machine.Pin(7, mode=machine.Pin.OUT, value=1, hold=True)
+
+    else:
+        registry.i2c_bus = None
+
     registry.config = _config.ConfigRegistry(config_schema, in_simulator=in_simulator)
 
     if not in_simulator:
-        registry.network = _network.NetworkManager(registry.config)
+        registry.network = _network.NetworkManager(registry.config, registry.i2c_bus)
         registry.time_manager = _time.TimeManager(registry.network)
 
     registry.golioth = _golioth.Golioth(
@@ -178,14 +189,6 @@ async def write(self, data):
 
     registry.sensors_output = Output()
 
-    if not in_simulator:
-        registry.i2c_bus = _i2c.LockableI2CBus(
-            0, scl=machine.Pin(4), sda=machine.Pin(3), freq=50000
-        )
-
-        # Turn on the I2C power:
-        machine.Pin(7, mode=machine.Pin.OUT, value=1, hold=True)
-
     _, sensors, _ = registry.config.get("sensors")
 
     for sensor in sensors:

modules/ribbit/config.py

@@ -201,7 +201,8 @@ def __init__(self, keys, stored=True, in_simulator=False):
         self._keys = collections.OrderedDict()
         for key in keys:
             self._keys[key.name] = key
-            key.default = key.hydrate(key.default)
+            if key.default is not None:
+                key.default = key.hydrate(key.default)
 
         self._stored = stored
         if in_simulator: