Merge pull request #83 from Retro-I/feature-68-settings-datei-gpio-pins

Feature 68 settings datei gpio pins

Author: felixholfelder

components/RotaryBass.py

@@ -4,17 +4,19 @@
 
 from helper.Audio import Audio
 from helper.AudioEffects import AudioEffects
+from helper.GpioHelper import GpioHelper
 
 audio_helper = Audio()
 audio_effects = AudioEffects()
+gpio_helper = GpioHelper()
 
 
 class RotaryBass:
     COUNTER = 0
     BASS_STEP = 2
 
-    CLK_PIN = 4  # PIN 7
-    DT_PIN = 14  # PIN 8
+    CLK_PIN = gpio_helper.rotary_bass_up()
+    DT_PIN = gpio_helper.rotary_bass_down()
 
     def __init__(self, on_taskbar_update):
         rotary = pyky040.Encoder(CLK=self.CLK_PIN, DT=self.DT_PIN)

components/RotaryPitch.py

@@ -3,15 +3,17 @@
 from pyky040 import pyky040
 
 from helper.AudioEffects import AudioEffects
+from helper.GpioHelper import GpioHelper
 
 audio_effects = AudioEffects()
+gpio_helper = GpioHelper()
 
 
 class RotaryPitch:
     COUNTER = 0
     PITCH_STEP = 1
-    CLK_PIN = 11  # PIN 23
-    DT_PIN = 8  # PIN 24
+    CLK_PIN = gpio_helper.rotary_pitch_up()
+    DT_PIN = gpio_helper.rotary_pitch_down()
 
     taskbar = None
 

components/RotaryVolume.py

@@ -3,16 +3,18 @@
 from pyky040 import pyky040
 
 from helper.Audio import Audio
+from helper.GpioHelper import GpioHelper
 
 audio_helper = Audio()
+gpio_helper = GpioHelper()
 
 
 class RotaryVolume:
     COUNTER = 0
     VOLUME_STEP = 6
-    SW_PIN = 13  # PIN 33
-    DT_PIN = 12  # PIN 32
-    CLK_PIN = 6  # PIN 31
+    SW_PIN = gpio_helper.rotary_volume_up()
+    DT_PIN = gpio_helper.rotary_volume_down()
+    CLK_PIN = gpio_helper.rotary_volume_press()
 
     def __init__(self, on_taskbar_update, on_strip_toggle_mute, on_strip_update_sound):
         rotary = pyky040.Encoder(CLK=self.CLK_PIN, DT=self.DT_PIN, SW=self.SW_PIN)

helper/GpioHelper.py

@@ -0,0 +1,38 @@
+import json
+
+from helper.Constants import Constants
+
+c = Constants()
+
+
+class GpioHelper:
+    GPIO_SETTINGS_PATH = f"{c.settings_path()}/gpio-pin-mapping.json"
+
+    def get_mappings(self) -> dict:
+        with open(self.GPIO_SETTINGS_PATH) as file:
+            data = json.load(file)
+            return data
+
+    def rotary_volume_up(self) -> int:
+        return self.get_mappings()["ROTARY_VOLUME_UP"]
+
+    def rotary_volume_down(self) -> int:
+        return self.get_mappings()["ROTARY_VOLUME_DOWN"]
+
+    def rotary_volume_press(self) -> int:
+        return self.get_mappings()["ROTARY_VOLUME_PRESS"]
+
+    def rotary_bass_up(self) -> int:
+        return self.get_mappings()["ROTARY_BASS_UP"]
+
+    def rotary_bass_down(self) -> int:
+        return self.get_mappings()["ROTARY_BASS_DOWN"]
+
+    def rotary_pitch_up(self) -> int:
+        return self.get_mappings()["ROTARY_PITCH_UP"]
+
+    def rotary_pitch_down(self) -> int:
+        return self.get_mappings()["ROTARY_PITCH_DOWN"]
+
+    def start_party_button(self) -> int:
+        return self.get_mappings()["START_PARTY_MODE_BUTTON"]

scripts/button.py

@@ -2,15 +2,18 @@
 
 import RPi.GPIO as GPIO
 
+from helper.GpioHelper import GpioHelper
 from helper.SystemHelper import SystemHelper
 
+gpio_helper = GpioHelper()
+
 # Hierbei handelt es sich um ein Überbleibsel aus Zeiten des Radio's des BSZ Wiesau, um bei offiziellen Veranstaltungen
 # das Soundboard zu verstecken. Dabei muss dieses Skript in der main.py importiert werden.
 # Um das Soundboard zu aktivieren, ...
 
 GPIO.setmode(GPIO.BCM)
 
-PIN = 21
+PIN = gpio_helper.start_party_button()
 
 GPIO.setup(PIN, GPIO.IN, pull_up_down=GPIO.PUD_UP)
 

settings/gpio-pin-mapping.json

@@ -0,0 +1,10 @@
+{
+  "ROTARY_VOLUME_UP": 6,
+  "ROTARY_VOLUME_DOWN": 12,
+  "ROTARY_VOLUME_PRESS": 13,
+  "ROTARY_BASS_UP": 4,
+  "ROTARY_BASS_DOWN": 14,
+  "ROTARY_PITCH_UP": 11,
+  "ROTARY_PITCH_DOWN": 8,
+  "START_PARTY_MODE_BUTTON": 21
+}