Switch to gpiozero fully

Author: ShadowLight8

Dynamic_RDS.php

@@ -154,6 +154,11 @@ public static function isPython3SmbusInstalled(): bool {
         return !ShellCommandExecutor::isEmpty($output);
     }
 
+    public static function isPython3gpiozeroInstalled(): bool {
+        $output = ShellCommandExecutor::execute('dpkg -s python3-gpiozero | grep installed');
+        return !ShellCommandExecutor::isEmpty($output);
+    }
+
     public static function isEngineRunning(): bool {
         $output = ShellCommandExecutor::execute('ps -ef | grep python.*Dynamic_RDS_Engine.py | grep -v grep');
         if (!ShellCommandExecutor::isEmpty($output))
@@ -285,6 +290,10 @@ function renderDynamicRDSStatus(
         $status->addError('python3-smbus2 is missing <button name="ReinstallScript" onClick="DynRDSScriptStream(\'dependencies\')">Reinstall plugin dependencies</button>');
     }
 
+    if ($platform === PlatformType::RASPBERRY_PI && !DependencyChecker::isPython3gpiozeroInstalled()) {
+        $status->addError('python3-gpiozero is missing <button name="ReinstallScript" onClick="DynRDSScriptStream(\'dependencies\')">Reinstall plugin dependencies</button>');
+    }
+
     // Detect I2C bus
     $i2cBus = I2CBusDetector::detectBus($platform);
     if ($i2cBus === -1) {

basicPWM.py

@@ -59,35 +59,58 @@ def shutdown(self):
 
 class softwarePWM(basicPWM):
   def __init__(self, pinToUse=7):
-    logging.info('Initializing software PWM on pin %s', pinToUse)
-    global GPIO
-    from RPi import GPIO
+    logging.info('Initializing software PWM on GPIO pin %s (board pin %s)', self._board_to_bcm(pinToUse), pinToUse)
+    global PWMLED
+    from gpiozero import PWMLED
+    # Convert board pin to BCM GPIO number
+    bcm_pin = self._board_to_bcm(pinToUse)
     self.pinToUse = pinToUse
+    self.bcm_pin = bcm_pin
     self.pwm = None
-    # TODO: Ponder if import RPi.GPIO as GPIO is a good idea
-    # TODO: Look at switching to gpiozero
-    GPIO.setmode(GPIO.BOARD)
-    GPIO.setup(self.pinToUse, GPIO.OUT)
-    GPIO.output(self.pinToUse,0)
+
+    # Create PWMLED device (starts at 0% duty cycle, off)
+    self.pwm = PWMLED(bcm_pin, initial_value=0)
     super().__init__()
 
+  def _board_to_bcm(self, board_pin):
+    """Convert board pin number to BCM GPIO number."""
+    # Mapping for 40-pin Raspberry Pi header (board -> BCM)
+    board_to_bcm_map = {
+      7: 4,   8: 14,  10: 15,  11: 17,  12: 18,  13: 27,
+      15: 22, 16: 23, 18: 24,  19: 10,  21: 9,   22: 25,
+      23: 11, 24: 8,  26: 7,   27: 0,   28: 1,   29: 5,
+      31: 6,  32: 12, 33: 13,  35: 19,  36: 16,  37: 26,
+      38: 20, 40: 21
+    }
+
+    if board_pin not in board_to_bcm_map:
+      raise ValueError(f'Invalid board pin number: {board_pin}')
+
+    return board_to_bcm_map[board_pin]
+
   def startup(self, period=10000, dutyCycle=0):
-    logging.debug('Starting software PWM on pin %s with period of %s', self.pinToUse, period)
-    self.pwm = GPIO.PWM(self.pinToUse, period)
-    logging.info('Updating software PWM on pin %s initial duty cycle to %s', self.pinToUse, round(dutyCycle/3,2))
-    self.pwm.start(dutyCycle/3)
+    # gpiozero uses frequency in Hz, convert from period in microseconds
+    # frequency = 1 / (period / 1,000,000)
+    frequency = 1_000_000 / period
+    logging.debug('Starting software PWM on GPIO %s (board pin %s) with frequency %.2f Hz',self.bcm_pin, self.pinToUse, frequency)
+    self.pwm.frequency = frequency
+    initial_value = (dutyCycle / 3) / 100
+    logging.info('Setting software PWM on GPIO %s initial duty cycle to %.2f%%', self.bcm_pin, dutyCycle / 3)
+    self.pwm.value = initial_value
     super().startup()
 
   def update(self, dutyCycle=0):
-    logging.info('Updating software PWM on pin %s duty cycle to %s', self.pinToUse, round(dutyCycle/3,2))
-    self.pwm.ChangeDutyCycle(dutyCycle/3)
+    value = (dutyCycle / 3) / 100
+    logging.info('Updating software PWM on GPIO %s duty cycle to %.2f%%', self.bcm_pin, dutyCycle / 3)
+    self.pwm.value = value
     super().update()
 
   def shutdown(self):
-    logging.debug('Shutting down software PWM on pin %s', self.pinToUse)
-    self.pwm.stop()
-    logging.info('Cleaning up software PWM on pin %s', self.pinToUse)
-    GPIO.cleanup()
+    logging.debug('Shutting down software PWM on GPIO %s (board pin %s)', self.bcm_pin, self.pinToUse)
+    self.pwm.off()
+    logging.info('Cleaning up software PWM on GPIO %s', self.bcm_pin)
+    # gpiozero handles cleanup automatically, but explicitly close
+    self.pwm.close()
     super().shutdown()
 
 class hardwareBBBPWM(basicPWM):

callbacks.py

@@ -47,13 +47,12 @@ def check_engine_running():
 logging.debug('---')
 logging.debug('Args %s', argv[1:])
 
-# RPi.GPIO is used for software PWM on the RPi, fail if it is missing
-# TODO: Look at switching to gpiozero
+# gpiozero is used for software PWM on the RPi, fail if it is missing
 if os.getenv('FPPPLATFORM', '') == 'Raspberry Pi' and config['DynRDSTransmitter'] == "QN8066":
   try:
-    import RPi.GPIO
+    import gpiozero
   except ImportError as impErr:
-    logging.error("Failed to import RPi.GPIO %s", impErr.args[0])
+    logging.error("Failed to import gpiozero %s", impErr.args[0])
     sys.exit(1)
 
 # Environ has a few useful items when FPPD runs callbacks.py, but logging it all the time, even at debug, is too much

scripts/fpp_install.sh

@@ -7,8 +7,8 @@ echo -e "\nInstalling python3-smbus2..."
 sudo apt-get install -y python3-smbus2
 
 if test -f /boot/firmware/config.txt; then
-  echo -e "\nInstalling python3-rpi-lgpio..."
-  sudo apt-get install -y python3-rpi-lgpio
+  echo -e "\nInstalling python3-gpiozero..."
+  sudo apt-get install -y python3-gpiozero
 fi
 
 echo -e "\nRestarting FPP..."

scripts/fpp_uninstall.sh

@@ -10,7 +10,3 @@ else
  echo -e "\nLeaving modified optional config script"
 fi
 
-if test -f /boot/firmware/config.txt; then
- echo -e "\nYou can manually uninstall python3-rpi-lgpio if nothing else uses it."
- echo "Command is: sudo apt-get remove -y python3-rpi-lgpio"
-fi