combined repetitive dataclass

fixed a problem with circular dependency

Author: sjpark608

src/edgepi/gpio/gpio_configs.py

@@ -3,7 +3,7 @@
 from edgepi.gpio.gpio_constants import * 
 
 @dataclass(frozen = True)
-class GpioDACConfig:
+class GpioExpanderConfig:
     ''' Represents peripheral information for GPIOs used DAC
 
         Attributes:
@@ -18,84 +18,18 @@ class GpioDACConfig:
             dev_path (str): device path to the peripheral device file
     '''
 
-    name: str = 'dac'
-    device: str = 'i2c'
-    num_pins: int = 9
-    address: GpioExpanderAddress = GpioExpanderAddress
-    dev_path: str = '/dev/i2c-10'
-
-@dataclass(frozen = True)
-class GpioADCConfig:
-    ''' Represents peripheral information for GPIOs used ADC
-
-        Attributes:
-            name (str): name of config
-
-            device (str): peripheral device
-
-            num_pins (int): number of pins used for this configuration
-
-            address (GpioExpanderAdreess): addresses of i2c device
-
-            dev_path (str): device path to the peripheral device file
-    '''
-
-    name: str = 'adc'
-    device: str = 'i2c'
-    num_pins: int = 2
-    address: GpioExpanderAddress = GpioExpanderAddress
-    dev_path: str = '/dev/i2c-10'
-
-@dataclass(frozen = True)
-class GpioRTDConfig:
-    ''' Represents peripheral information for GPIOs used RTD
-
-        Attributes:
-            name (str): name of config
-
-            device (str): peripheral device
-
-            num_pins (int): number of pins used for this configuration
-
-            address (GpioExpanderAdreess): addresses of i2c device
-
-            dev_path (str): device path to the peripheral device file
-    '''
-
-    name: str = 'rtd'
-    device: str = 'i2c'
-    num_pins: int = 1
-    address: GpioExpanderAddress = GpioExpanderAddress
-    dev_path: str = '/dev/i2c-10'
-
-@dataclass(frozen = True)
-class GpioLEDConfig:
-    ''' Represents peripheral information for GPIOs used LED array
-
-        Attributes:
-            name (str): name of config
-
-            device (str): peripheral device
-
-            num_pins (int): number of pins used for this configuration
-
-            address (GpioExpanderAdreess): addresses of i2c device
-
-            dev_path (str): device path to the peripheral device file
-    '''
-
-    name: str = 'led'
-    device: str = 'i2c'
-    num_pins: int = 8
-    address: GpioExpanderAddress = GpioExpanderAddress
-    dev_path: str = '/dev/i2c-10'
+    name: str = None
+    device: str = None
+    num_pins: int = None
+    address: GpioExpanderAddress = None
+    dev_path: str = None
 
 @unique
 class GpioConfigs(Enum):
-    DAC = GpioDACConfig
-    ADC = GpioADCConfig
-    RTD = GpioRTDConfig
-    LED = GpioLEDConfig
+    DAC = GpioExpanderConfig(name = 'dac', device='i2c', num_pins=9, address=GpioExpanderAddress.EXP_ONE, dev_path='/dev/i2c-10')
+    ADC = GpioExpanderConfig(name = 'adc', device='i2c', num_pins=2, address=GpioExpanderAddress.EXP_TWO, dev_path='/dev/i2c-10')
+    RTD = GpioExpanderConfig(name = 'rtd', device='i2c', num_pins=1, address=GpioExpanderAddress.EXP_TWO, dev_path='/dev/i2c-10')
+    LED = GpioExpanderConfig(name = 'led', device='i2c', num_pins=8, address=GpioExpanderAddress.EXP_ONE, dev_path='/dev/i2c-10')
 
 @dataclass
 class I2cPinInfo:

src/edgepi/gpio/gpio_constants.py

@@ -1,8 +1,6 @@
 from enum import Enum, unique
 from edgepi.reg_helper.reg_helper import OpCode
-from edgepi.gpio.gpio_configs import *
 
-@unique
 class GpioExpanderAddress(Enum):
     EXP_ONE = 32
     EXP_TWO = 33

src/test_edgepi/test_gpio/test_edgepi_gpio.py

@@ -13,10 +13,10 @@ def fixture_test_edgepi_tc(mocker):
     mocker.patch('edgepi.peripherals.gpio.GPIO')
 
 @pytest.mark.parametrize("mock_expect,config, result",
-                        [(['/dev/i2c-10'],'dac',[GpioDACConfig]),
-                         (['/dev/i2c-10'],'adc',[GpioADCConfig]),
-                         (['/dev/i2c-10'],'rtd',[GpioRTDConfig]),
-                         (['/dev/i2c-10'],'led',[GpioLEDConfig]),
+                        [(['/dev/i2c-10'],'dac',[GpioConfigs.DAC.value]),
+                         (['/dev/i2c-10'],'adc',[GpioConfigs.ADC.value]),
+                         (['/dev/i2c-10'],'rtd',[GpioConfigs.RTD.value]),
+                         (['/dev/i2c-10'],'led',[GpioConfigs.LED.value]),
                         ])
 @patch('edgepi.peripherals.i2c.I2CDevice')
 def test_edgepi_gpio_init(i2c_mock, mock_expect, config, result):

src/test_edgepi/test_gpio/test_gpio_command.py

@@ -3,12 +3,12 @@
 from edgepi.gpio.gpio_configs import *
 
 @pytest.mark.parametrize('config, result', 
-                       [('dac', GpioDACConfig),
-                        ('adc', GpioADCConfig),
-                        ('rtd', GpioRTDConfig),
+                       [('dac', GpioConfigs.DAC.value),
+                        ('adc', GpioConfigs.ADC.value),
+                        ('rtd', GpioConfigs.RTD.value),
                         ('din', None),
                         ('dout', None),
-                        ('led', GpioLEDConfig),
+                        ('led', GpioConfigs.LED.value),
                         ( None, None)])
 def test_getPeriphConfig(config, result):
     assert getPeriphConfig(config) == result

src/test_edgepi/test_gpio/test_gpio_config.py

@@ -5,18 +5,17 @@
 
 
 @pytest.mark.parametrize('config, result', 
-                        [(GpioDACConfig, ['dac', 'i2c', 9, 32, 33, '/dev/i2c-10']),
-                         (GpioADCConfig, ['adc', 'i2c', 2, 32, 33, '/dev/i2c-10']),
-                         (GpioRTDConfig, ['rtd', 'i2c', 1, 32, 33, '/dev/i2c-10']),
-                         (GpioLEDConfig, ['led', 'i2c', 8, 32, 33, '/dev/i2c-10'])
+                        [(GpioConfigs.DAC.value, ['dac', 'i2c', 9, 32, '/dev/i2c-10']),
+                         (GpioConfigs.ADC.value, ['adc', 'i2c', 2, 33, '/dev/i2c-10']),
+                         (GpioConfigs.RTD.value, ['rtd', 'i2c', 1, 33, '/dev/i2c-10']),
+                         (GpioConfigs.LED.value, ['led', 'i2c', 8, 32, '/dev/i2c-10'])
                         ])
 def test_GpioModuleConfig(config, result):
     assert config.name == result[0]
     assert config.device == result[1]
     assert config.num_pins == result[2]
-    assert config.address.EXP_ONE.value == result[3]
-    assert config.address.EXP_TWO.value == result[4]
-    assert config.dev_path == result[5]
+    assert config.address.value == result[3]
+    assert config.dev_path == result[4]
 
 @pytest.mark.parametrize('name, setoutput, clearoutput, address, result', 
                         [('AO_EN1', GpioAOutputSet.SET_OUTPUT_1.value, GpioAOutputClear.CLEAR_OUTPUT_1.value, GpioExpanderAddress.EXP_ONE.value, ['AO_EN1', OpCode(1, 2, 0xFE), OpCode(0, 2, 0xFE), 32]),