Skip to content

Commit

Permalink
Merge pull request #1 from RogueM/commit
Browse files Browse the repository at this point in the history
typo fixes and review
  • Loading branch information
Gadgetoid authored Feb 28, 2017
2 parents cfa9556 + 2b0cff3 commit 79fc4c0
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 16 deletions.
1 change: 1 addition & 0 deletions examples/hue-control.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import phatbeat


print("""
pHAT BEAT: Hue Control
Expand Down
6 changes: 5 additions & 1 deletion examples/test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import phatbeat
#!/usr/bin/env python

import time

import phatbeat


@phatbeat.on(phatbeat.BTN_ONOFF)
def fast_forward(pin):
print("FF pressed!")
Expand Down
2 changes: 1 addition & 1 deletion library/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Pimoroni Ltd
Copyright (c) 2017 Pimoroni Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion library/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ include CHANGELOG.txt
include LICENSE.txt
include README.txt
include setup.py
include blinkt.py
include phatbeat/*
3 changes: 0 additions & 3 deletions library/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
all:
gcc -Wall -DTEST lib/blinkt.c -l bcm2835 -o blinkt

devel:
-rm -r build
python setup.py build
Expand Down
2 changes: 1 addition & 1 deletion library/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Python library for PHAT BEAT, a stero DAC, AMP and VU meter with 5 input buttons for the Raspberry Pi.
Python library for PHAT BEAT, a stereo DAC, AMP and VU meter with 5 input buttons for the Raspberry Pi.

Learn more: https://shop.pimoroni.com/products/phat-beat
3 changes: 2 additions & 1 deletion library/README.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Python library for PHAT BEAT, a stero DAC, AMP and VU meter with 5 input buttons for the Raspberry Pi.

Python library for PHAT BEAT, a stereo DAC, AMP and VU meter with 5 input buttons for the Raspberry Pi.

Learn more: https://shop.pimoroni.com/products/phat-beat
7 changes: 5 additions & 2 deletions library/phatbeat/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import atexit
import time
from sys import exit

import RPi.GPIO as GPIO
try:
import RPi.GPIO as GPIO
except ImportError:
exit("This library requires the RPi.GPIO module\nInstall with: sudo pip install RPi.GPIO")


__version__ = '0.0.1'
Expand Down Expand Up @@ -220,4 +224,3 @@ def set_clear_on_exit(value=True):

for button in BUTTONS:
GPIO.add_event_detect(button, GPIO.FALLING, callback=_handle_button, bouncetime=200)

2 changes: 1 addition & 1 deletion library/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

"""
Copyright (c) 2016 Pimoroni
Copyright (c) 2017 Pimoroni
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
3 changes: 1 addition & 2 deletions packaging/debian/README
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
README

Stereo amplifier, buttons and dual RGB VU meter for your Pi.
Stereo amplifier, buttons and dual RGB VU meter for your Raspberry Pi.

Learn more: https://shop.pimoroni.com/products/phat-beat
For examples run: `curl -sS get.pimoroni.com/phatbeat | bash`

4 changes: 2 additions & 2 deletions packaging/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Package: python-phatbeat
Architecture: all
Section: python
Depends: ${misc:Depends}, ${python:Depends}, python-smbus
Suggests: i2c-tools, python-psutil
Suggests: i2c-tools
Description: python library designed to control PHAT BEAT.
PHAT BEAT provides a stereo amplifier, VU meter and five buttons.
.
Expand All @@ -22,7 +22,7 @@ Package: python3-phatbeat
Architecture: all
Section: python
Depends: ${misc:Depends}, ${python3:Depends}, python3-smbus
Suggests: i2c-tools, python3-psutil
Suggests: i2c-tools
Description: python library designed to control PHAT BEAT.
PHAT BEAT provides a stereo amplifier, VU meter and five buttons.
.
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: phatbeat
Source: https://github.com/pimoroni/phat-beat

Files: *
Copyright: 2016 Pimoroni Ltd <[email protected]>
Copyright: 2017 Pimoroni Ltd <[email protected]>
License: MIT

License: MIT
Expand Down

0 comments on commit 79fc4c0

Please sign in to comment.