fixes for io devices/actions

packages/modules/internal_chargepoint_handler/add_on/api.py

@@ -6,7 +6,7 @@
 from modules.common.component_state import IoState
 from modules.common.configurable_io import ConfigurableIo
 from modules.common.store._io_internal import get_internal_io_value_store
-from modules.io_devices.add_on.config import AddOn, DigitalInputMapping, DigitalOutputMapping
+from modules.io_devices.add_on.config import AddOn, DigitalInputPinMapping, DigitalOutputPinMapping
 
 log = logging.getLogger(__name__)
 has_gpio = True
@@ -16,28 +16,32 @@
 except ImportError:
     has_gpio = False
     log.info("failed to import RPi.GPIO! maybe we are not running on a pi")
-    log.warning("RSE disabled!")
+    log.warning("AddOn-IO disabled!")
 
 
 def create_io(config: AddOn):
     def read() -> Tuple[bool, bool]:
         if has_gpio:
             return IoState(
-                digital_input={input.name: GPIO.input(input.value) == GPIO.LOW for input in DigitalInputMapping},
-                digital_output={output.name: GPIO.input(output.value) == GPIO.LOW for output in DigitalOutputMapping})
+                digital_input={input.name: GPIO.input(input.value) == GPIO.LOW for input in DigitalInputPinMapping},
+                digital_output={
+                    output.name: GPIO.input(output.value) == GPIO.HIGH
+                    for output in DigitalOutputPinMapping
+                })
         else:
             return IoState()
 
     def write(analog_output: Optional[Dict[str, int]], digital_output: Optional[Dict[str, bool]]):
         if has_gpio:
             for pin, value in digital_output.items():
-                GPIO.output(DigitalOutputMapping[pin].value, GPIO.HIGH if value else GPIO.LOW)
+                GPIO.output(DigitalOutputPinMapping[pin].value, GPIO.HIGH if value else GPIO.LOW)
 
     if has_gpio:
-        GPIO.setmode(GPIO.BOARD)
+        GPIO.setmode(GPIO.BOARD)  # switch to header pin numbering
         for pin in config.input["digital"].keys():
-            GPIO.setup(DigitalInputMapping[pin].value, GPIO.IN)
-        GPIO.setup([7, 16, 18], GPIO.OUT)
+            GPIO.setup(DigitalInputPinMapping[pin].value, GPIO.IN, pull_up_down=GPIO.PUD_UP)
+        for pin in config.output["digital"].keys():
+            GPIO.setup(DigitalOutputPinMapping[pin].value, GPIO.OUT)
 
     io = ConfigurableIo(config=config, component_reader=read, component_writer=write)
     io.store = get_internal_io_value_store()

packages/modules/io_devices/add_on/config.py

@@ -3,20 +3,20 @@
 from modules.common.io_setup import IoDeviceSetup
 
 
-class DigitalInputMapping(Enum):
-    RSE1 = 24
-    RSE2 = 21
-    nurPV = 31
-    SofortLa = 32
-    Stop = 33
-    MinPV = 36
-    Standby = 40
+class DigitalInputPinMapping(Enum):
+    RSE1 = 24  # Raspberry Pi GPIO 8
+    RSE2 = 21  # Raspberry Pi GPIO 9
+    nurPV = 31  # Raspberry Pi GPIO 6
+    SofortLa = 32  # Raspberry Pi GPIO 12
+    Stop = 33  # Raspberry Pi GPIO 13
+    MinPV = 36  # Raspberry Pi GPIO 16
+    Standby = 40  # Raspberry Pi GPIO 21
 
 
-class DigitalOutputMapping(Enum):
-    LED1 = 18
-    LED2 = 16
-    LED3 = 7
+class DigitalOutputPinMapping(Enum):
+    LED1 = 18  # Raspberry Pi GPIO 24
+    LED2 = 16  # Raspberry Pi GPIO 23
+    LED3 = 7  # Raspberry Pi GPIO 4
 
 
 class AddOnConfiguration:
@@ -26,12 +26,12 @@ def __init__(self, host: Optional[str] = None) -> None:
 
 def init_input():
     return {"analog": {},
-            "digital": {pin.name: False for pin in DigitalInputMapping}}
+            "digital": {pin.name: False for pin in DigitalInputPinMapping}}
 
 
 def init_output():
     return {"analog": {},
-            "digital": {pin.name: False for pin in DigitalOutputMapping}}
+            "digital": {pin.name: False for pin in DigitalOutputPinMapping}}
 
 
 class AddOn(IoDeviceSetup[AddOnConfiguration]):