adafruit-mirror/Raspberry-Pi-Installer-Scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #281 from makermelissa/main

Browse source 
Allow 'disabled' to be passed in via command line in spi-reassign script
This commit is contained in:
Melissa LeBlanc-Williams 2023-12-22 11:20:53 -08:00 committed by GitHub
commit 30b4c740b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
raspi-spi-reassign.py
View file

@ -31,14 +31,24 @@ For now this will only ask about SPI0, but we can later add SPI1
def valid_pins(ce0_pin, ce1_pin): def valid_pins(ce0_pin, ce1_pin):
if ce0_pin is None and ce1_pin is not None: if ce0_pin is None and ce1_pin is not None:
return False return False
if ce0_pin == ce1_pin: if ce0_pin is not None and ce0_pin == ce1_pin:
return False return False
if int(ce0_pin) not in allowed_gpios: if ce0_pin is not None and int(ce0_pin) not in allowed_gpios:
return False return False
if int(ce1_pin) not in allowed_gpios: if ce1_pin is not None and int(ce1_pin) not in allowed_gpios:
return False return False
return True return True
def convert_option(pin):
if pin == "disabled":
return None
return int(pin)
def valid_options(ce0_option, ce1_option):
if ce0_option is None or ce1_option is None:
return False
return valid_pins(convert_option(ce0_option), convert_option(ce1_option))
def disable_spi(): def disable_spi():
print("Disabling SPI") print("Disabling SPI")
shell.run_command("sudo raspi-config nonint do_spi 1") shell.run_command("sudo raspi-config nonint do_spi 1")
@ -78,8 +88,8 @@ def write_new_custom(ce0_pin, ce1_pin):
shell.write_text_file(f"{boot_dir}/config.txt", overlay_command + "\n") shell.write_text_file(f"{boot_dir}/config.txt", overlay_command + "\n")
@click.command() @click.command()
@click.option('--ce0', nargs=1, default=None, help="Specify a GPIO for CE0") @click.option('--ce0', nargs=1, default=None, help="Specify a GPIO for CE0 or 'disabled' to disable", type=str)
@click.option('--ce1', nargs=1, default=None, help="Specify a GPIO for CE1") @click.option('--ce1', nargs=1, default=None, help="Specify a GPIO for CE1 or 'disabled' to disable", type=str)
@click.option('--reboot', nargs=1, default=None, type=click.Choice(['yes', 'no']), help="Specify whether to reboot after the script is finished") @click.option('--reboot', nargs=1, default=None, type=click.Choice(['yes', 'no']), help="Specify whether to reboot after the script is finished")
def main(ce0, ce1, reboot): def main(ce0, ce1, reboot):
ask_reboot = True ask_reboot = True
@ -87,7 +97,9 @@ def main(ce0, ce1, reboot):
if reboot is not None: if reboot is not None:
ask_reboot = False ask_reboot = False
auto_reboot = reboot.lower() == 'yes' auto_reboot = reboot.lower() == 'yes'
if valid_pins(ce0, ce1): if valid_options(ce0, ce1):
ce0 = convert_option(ce0)
ce1 = convert_option(ce1)
remove_custom() remove_custom()
write_new_custom(ce0, ce1) write_new_custom(ce0, ce1)
if auto_reboot: if auto_reboot: