Fix lib structure and imports.

lib/AgXRPLib/agxrp_controller.py

@@ -10,7 +10,7 @@
 
 import time
 import uasyncio
-from lib.AgXRPLib.agxrp_water_pump import AgXRPWaterPump
+from .agxrp_water_pump import AgXRPWaterPump
 
 class AgXRPController:
     """!

lib/AgXRPLib/agxrp_sensor_as7343.py

@@ -8,8 +8,8 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-from lib.AgXRPLib.qwiic_as7343 import QwiicAS7343
-from lib.AgXRPLib.agxrp_sensor import AgXRPSensor
+from qwiic_as7343 import QwiicAS7343
+from .agxrp_sensor import AgXRPSensor
 
 class AgXRPSensorAS7343(AgXRPSensor):
     """!

lib/AgXRPLib/agxrp_sensor_kit copy.py

@@ -7,16 +7,16 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-import lib.qwiic_i2c as qwiic_i2c
-import lib.AgXRPLib.qwiic_oled as qwiic_oled
+import qwiic_i2c as qwiic_i2c
+import qwiic_oled as qwiic_oled
 import time
 import sys
 
-from lib.AgXRPLib.agxrp_sensor_scd4x import AgXRPSensorSCD4x
-from lib.AgXRPLib.agxrp_sensor_as7343 import AgXRPSensorAS7343
-from lib.AgXRPLib.agxrp_sensor_veml import AgXRPSensorVEML
-from lib.AgXRPLib.agxrp_sensor_soil import AgXRPSensorSoil
-from lib.AgXRPLib.agxrp_csv_logger import AgXRPCSVLogger
+from .agxrp_sensor_scd4x import AgXRPSensorSCD4x
+from .agxrp_sensor_as7343 import AgXRPSensorAS7343
+from .agxrp_sensor_veml import AgXRPSensorVEML
+from .agxrp_sensor_soil import AgXRPSensorSoil
+from .agxrp_csv_logger import AgXRPCSVLogger
 
 class AgXRPSensorKit:
     """!

lib/AgXRPLib/agxrp_sensor_kit.py

@@ -7,17 +7,17 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-import lib.qwiic_i2c as qwiic_i2c
-import lib.AgXRPLib.qwiic_oled as qwiic_oled
+import qwiic_i2c as qwiic_i2c
+import qwiic_oled as qwiic_oled
 import time
 import sys
 
-from lib.AgXRPLib.agxrp_sensor_scd4x import AgXRPSensorSCD4x
-from lib.AgXRPLib.agxrp_sensor_as7343 import AgXRPSensorAS7343
-from lib.AgXRPLib.agxrp_sensor_veml import AgXRPSensorVEML
-from lib.AgXRPLib.agxrp_sensor_soil import AgXRPSensorSoil
-from lib.AgXRPLib.agxrp_sensor_resistive_soil import AgXRPResistiveSoilSensor
-from lib.AgXRPLib.agxrp_csv_logger import AgXRPCSVLogger
+from .agxrp_sensor_scd4x import AgXRPSensorSCD4x
+from .agxrp_sensor_as7343 import AgXRPSensorAS7343
+from .agxrp_sensor_veml import AgXRPSensorVEML
+from .agxrp_sensor_soil import AgXRPSensorSoil
+from .agxrp_sensor_resistive_soil import AgXRPResistiveSoilSensor
+from .agxrp_csv_logger import AgXRPCSVLogger
 
 class AgXRPSensorKit:
     """!

lib/AgXRPLib/agxrp_sensor_kit_demo.py

@@ -10,7 +10,7 @@
 
 import sys
 import time
-from lib.AgXRPLib.agxrp_sensor_kit import AgXRPSensorKit
+from .agxrp_sensor_kit import AgXRPSensorKit
 
 def demo_full_configuration():
     """!

lib/AgXRPLib/agxrp_sensor_resistive_soil.py

@@ -8,8 +8,8 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-from lib.AgXRPLib.qwiic_soil_moisture_sensor import QwiicSoilMoistureSensor
-from lib.AgXRPLib.agxrp_sensor import AgXRPSensor
+from qwiic_soil_moisture_sensor import QwiicSoilMoistureSensor
+from .agxrp_sensor import AgXRPSensor
 
 
 # Raw ADC range from Qwiic soil moisture sensor (10-bit)

lib/AgXRPLib/agxrp_sensor_scd4x.py

@@ -8,8 +8,8 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-from lib.AgXRPLib.qwiic_scd4x import QwiicSCD4x
-from lib.AgXRPLib.agxrp_sensor import AgXRPSensor
+from qwiic_scd4x import QwiicSCD4x
+from .agxrp_sensor import AgXRPSensor
 
 class AgXRPSensorSCD4x(AgXRPSensor):
     """!

lib/AgXRPLib/agxrp_sensor_soil.py

@@ -8,8 +8,8 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-from lib.AgXRPLib.agxrp_sensor import AgXRPSensor
-from lib.AgXRPLib.qwiic_cy8cmbr3 import QwiicCY8CMBR3
+from .agxrp_sensor import AgXRPSensor
+from qwiic_cy8cmbr3 import QwiicCY8CMBR3
 
 class AgXRPSensorSoil(AgXRPSensor):
     """!

lib/AgXRPLib/agxrp_sensor_veml.py

@@ -8,8 +8,8 @@
 # Written for AgXRPSensorKit, 2024
 #===============================================================================
 
-from lib.AgXRPLib.qwiic_veml import QwiicVEML
-from lib.AgXRPLib.agxrp_sensor import AgXRPSensor
+from qwiic_veml import QwiicVEML
+from .agxrp_sensor import AgXRPSensor
 
 class AgXRPSensorVEML(AgXRPSensor):
     """!

lib/AgXRPLib/agxrp_water_pump.py

@@ -5,11 +5,10 @@
 # AgXRPWaterPump class for controlling peristaltic pumps using encoded motors.
 #-------------------------------------------------------------------------------
 
-from lib.XRPLib.encoded_motor import EncodedMotor
+from XRPLib.encoded_motor import EncodedMotor
 from machine import Timer, RTC
 import micropython
 import time
-import os
 
 class AgXRPWaterPump:
     """!

lib/AgXRPLib/agxrp_web_dashboard.py

@@ -10,14 +10,13 @@
 
 import json
 import random
-import time
 try:
     from machine import RTC as _MachineRTC
     _HAS_RTC = True
 except ImportError:
     _HAS_RTC = False
 from phew import server, access_point, dns, logging
-from lib.AgXRPLib.agxrp_water_pump import AgXRPWaterPump
+from .agxrp_water_pump import AgXRPWaterPump
 
 class AgXRPWebDashboard:
     """!

lib/AgXRPLib/qwiic_as7343.py → lib/qwiic_as7343.py

@@ -44,7 +44,7 @@
 
 # The Qwiic_I2C_Py platform driver is designed to work on almost any Python
 # platform, check it out here: https://github.com/sparkfun/Qwiic_I2C_Py
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class

lib/AgXRPLib/qwiic_bme280.py → lib/qwiic_bme280.py

@@ -59,7 +59,7 @@
 #-----------------------------------------------------------------------------
 import math
 import time
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class instance.

lib/AgXRPLib/qwiic_cy8cmbr3.py → lib/qwiic_cy8cmbr3.py

@@ -44,7 +44,7 @@
 
 # The Qwiic_I2C_Py platform driver is designed to work on almost any Python
 # platform, check it out here: https://github.com/sparkfun/Qwiic_I2C_Py
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class

lib/qwiic_i2c/__init__.py

@@ -79,7 +79,7 @@
 # append them to the driver list if so
 for module_name, class_name in _supported_platforms.items():
 	try:
-		sub_module = __import__("lib.qwiic_i2c." + module_name, None, None, [None])
+		sub_module = __import__("qwiic_i2c." + module_name, None, None, [None])
 		_drivers.append(getattr(sub_module, class_name))
 	except:
 		pass

lib/AgXRPLib/qwiic_oled/qwiic_large_oled.py → lib/qwiic_oled/qwiic_large_oled.py

@@ -53,9 +53,9 @@
 """
 
 import math
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
-from lib.AgXRPLib.qwiic_oled.qwiic_oled_base import QwiicOledBase
+from qwiic_oled import QwiicOledBase
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class instance.

lib/AgXRPLib/qwiic_oled/qwiic_micro_oled.py → lib/qwiic_oled/qwiic_micro_oled.py

@@ -53,9 +53,9 @@
 """
 
 import math
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
-from lib.AgXRPLib.qwiic_oled.qwiic_oled_base import QwiicOledBase
+from qwiic_oled import QwiicOledBase
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class instance.

lib/AgXRPLib/qwiic_oled/qwiic_oled_base.py → lib/qwiic_oled/qwiic_oled_base.py

@@ -57,7 +57,7 @@
 import math
 # import time
 
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
 from . import oled_fonts
 from . import oled_logos

lib/AgXRPLib/qwiic_oled/qwiic_oled_display.py → lib/qwiic_oled/qwiic_oled_display.py

@@ -53,9 +53,9 @@
 """
 
 import math
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
-from lib.AgXRPLib.qwiic_oled.qwiic_oled_base import QwiicOledBase
+from qwiic_oled import QwiicOledBase
 
 # Define the device name and I2C addresses. These are set in the class defintion
 # as class variables, making them avilable without having to create a class instance.

lib/AgXRPLib/qwiic_scd4x.py → lib/qwiic_scd4x.py

@@ -44,7 +44,7 @@
 
 # The Qwiic_I2C_Py platform driver is designed to work on almost any Python
 # platform, check it out here: https://github.com/sparkfun/Qwiic_I2C_Py
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 import time
 
 # Define the device name and I2C addresses. These are set in the class defintion

lib/AgXRPLib/qwiic_soil_moisture_sensor.py → lib/qwiic_soil_moisture_sensor.py

@@ -10,7 +10,7 @@
 New to qwiic? Take a look at the entire [SparkFun qwiic ecosystem](https://www.sparkfun.com/qwiic).
 """
 
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 
 #======================================================================
 # Basic setup of I2C commands and available I2C Addresses

lib/AgXRPLib/qwiic_veml.py → lib/qwiic_veml.py

@@ -52,7 +52,7 @@
 
 # The Qwiic_I2C_Py platform driver is designed to work on almost any Python
 # platform, check it out here: https://github.com/sparkfun/Qwiic_I2C_Py
-import lib.qwiic_i2c as qwiic_i2c
+import qwiic_i2c
 import time
 
 # Define the device name and I2C addresses. These are set in the class defintion

web_server.py

@@ -14,11 +14,11 @@
     _HAS_RTC = True
 except ImportError:
     _HAS_RTC = False
-from lib.AgXRPLib.agxrp_sensor_kit import AgXRPSensorKit
-from lib.AgXRPLib.agxrp_web_dashboard import AgXRPWebDashboard
-from lib.AgXRPLib.agxrp_web_configure import AgXRPWebConfigure
-from lib.AgXRPLib.agxrp_web_data_viewer import AgXRPWebDataViewer
-from lib.AgXRPLib.agxrp_controller import AgXRPController
+from AgXRPLib.agxrp_sensor_kit import AgXRPSensorKit
+from AgXRPLib.agxrp_web_dashboard import AgXRPWebDashboard
+from AgXRPLib.agxrp_web_configure import AgXRPWebConfigure
+from AgXRPLib.agxrp_web_data_viewer import AgXRPWebDataViewer
+from AgXRPLib.agxrp_controller import AgXRPController
 
 
 CONFIG_VERSION = 2