Skip to content

Commit

Permalink
Merge pull request #16 from jasonbarry/master
Browse files Browse the repository at this point in the history 
Fixed typo of LDP[\d]+ to LPD[\d]+ globally
  • Loading branch information
@scottjgibson
scottjgibson committed Sep 19, 2013
2 parents c34c6db + 41ac1ab commit f3bbf88
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
52 changes: 26 additions & 26 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py strip --help
usage: pixelpi.py strip [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py strip [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME] [--refresh_rate REFRESH_RATE]
[--filename FILENAME] --array_height ARRAY_HEIGHT

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806} Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806} Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME Set the SPI device descriptor
--refresh_rate REFRESH_RATE Set the refresh rate in ms (default 500ms)
Expand All @@ -47,15 +47,15 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py array --help
usage: pixelpi.py array [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py array [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME] [--refresh_rate REFRESH_RATE]
[--filename FILENAME] --array_width ARRAY_WIDTH
--array_height ARRAY_HEIGHT

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -70,15 +70,15 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py pixelinvaders --help
usage: pixelpi.py pixelinvaders [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py pixelinvaders [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME]
[--refresh_rate REFRESH_RATE] --udp-ip UDP_IP
--udp-port UDP_PORT

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -89,14 +89,14 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py fade --help
usage: pixelpi.py fade [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py fade [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME] [--refresh_rate REFRESH_RATE]
--num_leds NUM_LEDS

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -107,14 +107,14 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py chase --help
usage: pixelpi.py chase [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py chase [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME] [--refresh_rate REFRESH_RATE]
--num_leds NUM_LEDS

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -125,15 +125,15 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py pan --help
usage: pixelpi.py pan [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py pan [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME] [--refresh_rate REFRESH_RATE]
[--filename FILENAME] --array_width ARRAY_WIDTH
--array_height ARRAY_HEIGHT

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -148,14 +148,14 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py all_on --help
usage: pixelpi.py all_on [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py all_on [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME]
[--refresh_rate REFRESH_RATE] --num_leds NUM_LEDS

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -166,14 +166,14 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py all_off --help
usage: pixelpi.py all_off [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py all_off [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME]
[--refresh_rate REFRESH_RATE] --num_leds NUM_LEDS

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand All @@ -184,14 +184,14 @@ http://thegreatgeekery.blogspot.ca/2012/08/raspberry-pi-and-ws2801.html


sudo python pixelpi.py wiimote --help
usage: pixelpi.py wiimote [-h] [--chip {WS2801,LDP8806}] [--verbose]
usage: pixelpi.py wiimote [-h] [--chip {WS2801,LPD8806}] [--verbose]
[--spi_dev SPI_DEV_NAME]
[--refresh_rate REFRESH_RATE] --num_leds NUM_LEDS

optional arguments:
-h, --help show this help message and exit
--chip {WS2801,LDP8806}
Specify chip type LDP8806 or WS2801
--chip {WS2801,LPD8806}
Specify chip type LPD8806 or WS2801
--verbose enable verbose mode
--spi_dev SPI_DEV_NAME
Set the SPI device descriptor
Expand Down
8 changes: 4 additions & 4 deletions pixelpi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
RAINBOW = [AQUA, AQUAMARINE, AZURE, BEIGE, BISQUE, BLANCHEDALMOND, BLUE, BLUEVIOLET, BROWN, BURLYWOOD, CADETBLUE, CHARTREUSE, CHOCOLATE, CORAL, CORNFLOWERBLUE, CORNSILK, CRIMSON, CYAN, DARKBLUE, DARKCYAN, DARKGOLDENROD, DARKGRAY, DARKGREY, DARKGREEN, DARKKHAKI, DARKMAGENTA, DARKOLIVEGREEN, DARKORANGE, DARKORCHID, DARKRED, DARKSALMON, DARKSEAGREEN, DARKSLATEBLUE, DARKSLATEGRAY, DARKSLATEGREY, DARKTURQUOISE, DARKVIOLET, DEEPPINK, DEEPSKYBLUE, DIMGRAY, DIMGREY, DODGERBLUE, FIREBRICK, FLORALWHITE, FORESTGREEN, FUCHSIA, GAINSBORO, GHOSTWHITE, GOLD, GOLDENROD, GRAY, GREY, GREEN, GREENYELLOW, HONEYDEW, HOTPINK, INDIANRED, INDIGO, IVORY, KHAKI, LAVENDER, LAVENDERBLUSH, LAWNGREEN, LEMONCHIFFON, LIGHTBLUE, LIGHTCORAL, LIGHTCYAN, LIGHTGOLDENRODYELLOW, LIGHTGRAY, LIGHTGREY, LIGHTGREEN, LIGHTPINK, LIGHTSALMON, LIGHTSEAGREEN, LIGHTSKYBLUE, LIGHTSLATEGRAY, LIGHTSLATEGREY, LIGHTSTEELBLUE, LIGHTYELLOW, LIME, LIMEGREEN, LINEN, MAGENTA, MAROON, MEDIUMAQUAMARINE, MEDIUMBLUE, MEDIUMORCHID, MEDIUMPURPLE, MEDIUMSEAGREEN, MEDIUMSLATEBLUE, MEDIUMSPRINGGREEN, MEDIUMTURQUOISE, MEDIUMVIOLETRED, MIDNIGHTBLUE, MINTCREAM, MISTYROSE, MOCCASIN, NAVAJOWHITE, NAVY, OLDLACE, OLIVE, OLIVEDRAB, ORANGE, ORANGERED, ORCHID, PALEGOLDENROD, PALEGREEN, PALETURQUOISE, PALEVIOLETRED, PAPAYAWHIP, PEACHPUFF, PERU, PINK, PLUM, POWDERBLUE, PURPLE, RED, ROSYBROWN, ROYALBLUE, SADDLEBROWN, SALMON, SANDYBROWN, SEAGREEN, SEASHELL, SIENNA, SILVER, SKYBLUE, SLATEBLUE, SLATEGRAY, SLATEGREY, SNOW, SPRINGGREEN, STEELBLUE, TAN, TEAL, THISTLE, TOMATO, TURQUOISE, VIOLET, WHEAT, WHITE, WHITESMOKE, YELLOW, YELLOWGREEN, YELLOWGREEN]

def write_stream(pixels):
if args.chip_type == "LDP6803":
if args.chip_type == "LPD6803":
pixel_out_bytes = bytearray(2)
spidev.write(bytearray(b'\x00\x00'))
pixel_count = len(pixels) / PIXEL_SIZE
Expand Down Expand Up @@ -445,7 +445,7 @@ def filter_pixel(input_pixel, brightness):
parser = argparse.ArgumentParser(add_help=True,version='1.0', prog='pixelpi.py')
subparsers = parser.add_subparsers(help='sub command help?')
common_parser = argparse.ArgumentParser(add_help=False)
common_parser.add_argument('--chip', action='store', dest='chip_type', default='WS2801', choices=['WS2801', 'LPD8806', 'LDP6803'], help='Specify chip type LDP6803, LPD8806 or WS2801')
common_parser.add_argument('--chip', action='store', dest='chip_type', default='WS2801', choices=['WS2801', 'LPD8806', 'LPD6803'], help='Specify chip type LPD6803, LPD8806 or WS2801')
common_parser.add_argument('--verbose', action='store_true', dest='verbose', default=True, help='enable verbose mode')
common_parser.add_argument('--spi_dev', action='store', dest='spi_dev_name', required=False, default='/dev/spidev0.0', help='Set the SPI device descriptor')
common_parser.add_argument('--refresh_rate', action='store', dest='refresh_rate', required=False, default=500, type=int, help='Set the refresh rate in ms (default 500ms)')
Expand Down Expand Up @@ -495,8 +495,8 @@ def filter_pixel(input_pixel, brightness):
for i in range(256):
gamma[i] = int(pow(float(i) / 255.0, 2.5) * 255.0 )

#LDP6803 has 5 bit color, this seems to work but is not exact.
if args.chip_type == "LDP6803":
#LPD6803 has 5 bit color, this seems to work but is not exact.
if args.chip_type == "LPD6803":
for i in range(256):
gamma[i] = int(pow(float(i) / 255.0, 2.0) * 255.0 + 0.5)
args.func()
Expand Down

0 comments on commit f3bbf88

Please sign in to comment.