bug fixes

Author: Zontex

Eduponics/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.2"

Eduponics/ads1x15.py

@@ -114,14 +114,14 @@
 
 
 class ADS1115:
-    def __init__(self, i2c, ads_address=0x48, gain=1, mcp_address=0x20):
+    def __init__(self, i2c, address=0x48, gain=1, mcp_address=0x20):
         self.i2c = i2c
         self.address = address
         self.mcp_address = mcp_address
         self.gain = gain
         self.temp2 = bytearray(2)
         # define MCP for activating MOSFET pins
-        mcp = mcp23017.MCP23017(self.i2c, mcp_address)
+        mcp = mcp23017.MCP23017(self.i2c, address=mcp_address)
         # define all the pins for the mosfets
         self.mcp_pins_sheet = {
             0:8,

Eduponics/tds.py

@@ -31,18 +31,18 @@
 
 class TDS():
 
-    def __init__(self,channel=0,temperature=25,i2c=None,mcp_address=None,ads_address=None):
+    def __init__(self, channel=0, temperature=25, i2c=None, mcp_address=0x20, ads_address=0x49):
         self.channel = channel
         self.kvalue = 1.0
         self.temperature = temperature
         self.values_buffer = [] # empty list of values for median average
         self.scount = 30 # how many times to take samples to make median average
         self.vref = 4.096 # analog reference voltage(Volt) of the ADC, based on ADS chip gain 1
         # Open i2c bus
-        self.ads_address = 0x49
-        self.mcp_address = 0x20
+        self.ads_address = ads_address
+        self.mcp_address = mcp_address
         self.gain = 1
-        self.adc = ads1x15.ADS1115(i2c, ads_address=self.ads_address, mcp_address=self.mcp_address, self.gain)
+        self.adc = ads1x15.ADS1115(i2c, address=self.ads_address, mcp_address=self.mcp_address, self.gain)
 
     def overwrite_buffer(self, item):
         self.values_buffer.insert(0, item)

setup.py

@@ -15,7 +15,7 @@
     packages=find_packages(),
     include_package_data=True,
     version=__version__,
-    download_url = 'https://github.com/STEMinds/micropython-eduponics/archive/1.0.1.tar.gz',
+    download_url = 'https://github.com/STEMinds/micropython-eduponics/archive/1.0.2.tar.gz',
     keywords = ['micropython','upython', 'eduponics-mini', 'esp32', 'ADS1x15', 'MCP23017'],
     description='',
     long_description='',