From d94af12066678f40ecdf16da2c810472e452f5b8 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 12:35:22 +0100 Subject: Updated ledctl README. --- ledctl/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ledctl/README.md b/ledctl/README.md index 81eaf08..770d531 100644 --- a/ledctl/README.md +++ b/ledctl/README.md @@ -25,14 +25,15 @@ systemctl enable led-boot led-ready ## Usage -Use the ```ledctl``` script to set the LED color. +Use the `ledctl` script to set the LED color. -``` +` ledctl -``` +` Valid colors are - on, off - red, green, blue, yellow, pink, cyan - #rrggbb + +- on, off +- red, green, blue, yellow, pink, cyan +- \#rrggbb e.g. #ff0000 -- cgit v1.2.3 From 88a54148c9be32b09559dc74910f1496b24e3421 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 23:39:24 +0100 Subject: Renamed buttonctld to buttond. --- buttonctl/buttonctl.py | 16 ---------------- buttonctl/buttond.py | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 buttonctl/buttonctl.py create mode 100644 buttonctl/buttond.py diff --git a/buttonctl/buttonctl.py b/buttonctl/buttonctl.py deleted file mode 100644 index 26878f1..0000000 --- a/buttonctl/buttonctl.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python - -import RPi.GPIO as GPIO -import subprocess - - -GPIO.setmode(GPIO.BCM) -GPIO.setup(26, GPIO.IN, pull_up_down=GPIO.PUD_UP) -GPIO.wait_for_edge(26, GPIO.FALLING) - -print ('button pressed') - -subprocess.call(['ledctl', 'boot'], shell=False) - -subprocess.call(['shutdown', '-h', 'now'], shell=False) - diff --git a/buttonctl/buttond.py b/buttonctl/buttond.py new file mode 100644 index 0000000..26878f1 --- /dev/null +++ b/buttonctl/buttond.py @@ -0,0 +1,16 @@ +#!/usr/bin/python + +import RPi.GPIO as GPIO +import subprocess + + +GPIO.setmode(GPIO.BCM) +GPIO.setup(26, GPIO.IN, pull_up_down=GPIO.PUD_UP) +GPIO.wait_for_edge(26, GPIO.FALLING) + +print ('button pressed') + +subprocess.call(['ledctl', 'boot'], shell=False) + +subprocess.call(['shutdown', '-h', 'now'], shell=False) + -- cgit v1.2.3 From d368910ee1403ead0ffaa97d0b67a5ae84cd148c Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 23:39:50 +0100 Subject: Added Makefile for buttond installation. --- buttonctl/Makefile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 buttonctl/Makefile diff --git a/buttonctl/Makefile b/buttonctl/Makefile new file mode 100644 index 0000000..fb8dc5f --- /dev/null +++ b/buttonctl/Makefile @@ -0,0 +1,4 @@ +install: + install -m 744 buttond.py /usr/bin/buttond + install -m 644 systemd/buttond.service /etc/systemd/system/buttond.service + systemd daemon-reload -- cgit v1.2.3 From e6ef9ed4a3129da1e449f4f4f5e0d7719b8b04c5 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 23:42:04 +0100 Subject: Run systemctl daemon-reload at the end of make install. --- buttonctl/Makefile | 2 +- buttonctl/buttond.py | 4 +++- ledctl/Makefile | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buttonctl/Makefile b/buttonctl/Makefile index fb8dc5f..7b8c933 100644 --- a/buttonctl/Makefile +++ b/buttonctl/Makefile @@ -1,4 +1,4 @@ install: install -m 744 buttond.py /usr/bin/buttond install -m 644 systemd/buttond.service /etc/systemd/system/buttond.service - systemd daemon-reload + systemctl daemon-reload diff --git a/buttonctl/buttond.py b/buttonctl/buttond.py index 26878f1..a49b4e4 100644 --- a/buttonctl/buttond.py +++ b/buttonctl/buttond.py @@ -4,11 +4,13 @@ import RPi.GPIO as GPIO import subprocess +print ('waiting for button presses'); + GPIO.setmode(GPIO.BCM) GPIO.setup(26, GPIO.IN, pull_up_down=GPIO.PUD_UP) GPIO.wait_for_edge(26, GPIO.FALLING) -print ('button pressed') +print ('button pressed, shutting down') subprocess.call(['ledctl', 'boot'], shell=False) diff --git a/ledctl/Makefile b/ledctl/Makefile index 2777bb8..090ef1d 100644 --- a/ledctl/Makefile +++ b/ledctl/Makefile @@ -3,3 +3,4 @@ install: ln -sf /usr/bin/ledctl /usr/lib/systemd/system-shutdown/ install -m 644 systemd/led-boot.service /etc/systemd/system/led-boot.service install -m 644 systemd/led-ready.service /etc/systemd/system/led-ready.service + systemctl daemon-reload -- cgit v1.2.3 From 593ae61b1d4e8ca06bc66d59c19a430e2e966262 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 23:50:15 +0100 Subject: Corrected buttond service executable name. --- buttonctl/systemd/button.service | 10 ---------- buttonctl/systemd/buttond.service | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 buttonctl/systemd/button.service create mode 100644 buttonctl/systemd/buttond.service diff --git a/buttonctl/systemd/button.service b/buttonctl/systemd/button.service deleted file mode 100644 index e77edd2..0000000 --- a/buttonctl/systemd/button.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=watching soft button -After=local-fs.target - -[Service] -Type=simple -ExecStart=/usr/bin/buttonctl - -[Install] -WantedBy=multi-user.target diff --git a/buttonctl/systemd/buttond.service b/buttonctl/systemd/buttond.service new file mode 100644 index 0000000..e1975c9 --- /dev/null +++ b/buttonctl/systemd/buttond.service @@ -0,0 +1,10 @@ +[Unit] +Description=watching soft button +After=local-fs.target + +[Service] +Type=simple +ExecStart=/usr/bin/buttond + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3 From be644b94dc95c48608a5614a3de2f02d62321016 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 27 Feb 2022 23:50:47 +0100 Subject: Print buttond error messages to stderr. --- buttonctl/buttond.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buttonctl/buttond.py b/buttonctl/buttond.py index a49b4e4..661b2f6 100644 --- a/buttonctl/buttond.py +++ b/buttonctl/buttond.py @@ -2,15 +2,16 @@ import RPi.GPIO as GPIO import subprocess +import sys -print ('waiting for button presses'); +print ('Watching soft button GPIO26 for button presses...', file=sys.stderr); GPIO.setmode(GPIO.BCM) GPIO.setup(26, GPIO.IN, pull_up_down=GPIO.PUD_UP) GPIO.wait_for_edge(26, GPIO.FALLING) -print ('button pressed, shutting down') +print ('Soft button pressed, shutting down...', file=sys.stderr) subprocess.call(['ledctl', 'boot'], shell=False) -- cgit v1.2.3