Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixup scripts; add Makefile for buttons (not a.out) #19

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/pi-buttons/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
LIBS=-lpthread -lrt

buttons: buttons.o
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

.PHONY: clean

clean:
rm -vf *.o buttons
Binary file removed lib/pi-buttons/a.out
Binary file not shown.
5 changes: 0 additions & 5 deletions lib/pi-buttons/build.sh

This file was deleted.

48 changes: 39 additions & 9 deletions lib/pi-buttons/setup.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,45 @@
#!/bin/sh

echo 17 > /sys/class/gpio/export
echo 22 > /sys/class/gpio/export
echo 27 > /sys/class/gpio/export
if [ ! -w /sys/class/gpio/export ]; then
echo "$0 must be run with GPIO permissions (typically gpio group membership or root/sudo)"
exit 1
fi

sleep 3
for gpionum in 17 22 27; do
if [ ! -d /sys/class/gpio/gpio${gpionum} ]; then
echo "exporting GPIO ${gpionum}"
echo ${gpionum} > /sys/class/gpio/export
else
echo "GPIO ${gpionum} already exported"
fi
done

echo "in" > /sys/class/gpio/gpio17/direction
echo "both" > /sys/class/gpio/gpio17/edge
for gpionum in 17 27; do
if [ "$(/bin/cat /sys/class/gpio/gpio${gpionum}/direction)" != "in" ]; then
echo "setting GPIO ${gpionum} direction to inwards"
echo in > /sys/class/gpio/gpio${gpionum}/direction
else
echo "GPIO ${gpionum} already direction inwards"
fi
if [ "$(/bin/cat /sys/class/gpio/gpio${gpionum}/edge)" != "both" ]; then
echo "setting GPIO ${gpionum} signal edge to both"
echo both > /sys/class/gpio/gpio${gpionum}/edge
else
echo "GPIO ${gpionum} signal edge already both"
fi
done

echo "in" > /sys/class/gpio/gpio27/direction
echo "both" > /sys/class/gpio/gpio27/edge

echo "out" > /sys/class/gpio/gpio22/direction
if [ "$(/bin/cat /sys/class/gpio/gpio22/direction)" != "out" ]; then
echo "setting GPIO 22 direction to outwards"
echo out > /sys/class/gpio/gpio22/direction
else
echo "GPIO 22 already direction outwards"
fi

if [ ! -x $(dirname $0)/buttons ]; then
echo "building buttons executable"
/usr/bin/make -C $(dirname $0)
else
echo "buttons executable exists"
fi
13 changes: 11 additions & 2 deletions openaps-menu.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
#!/bin/bash
#!/bin/bash -e

(cd lib/pi-buttons/ && ./setup.sh && ./a.out) & node index.js
topdir=$(dirname $0)
buttonsdir=${topdir}/lib/pi-buttons

# GPIO setup and buttons utility build
${buttonsdir}/setup.sh

# needs to create a socket in cwd
(cd ${buttonsdir} && ./buttons &)

exec node ${topdir}/index.js