Skip to content

Commit

Permalink
Merge pull request #101 from Makuna/BufferCleanUp
Browse files Browse the repository at this point in the history
Better Naming
  • Loading branch information
Makuna committed Apr 16, 2016
2 parents 43f53a0 + 007268c commit fd18321
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 114 deletions.
4 changes: 2 additions & 2 deletions examples/NeoPixelBufferCylon/NeoPixelBufferCylon.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This example will move a Cylon Red Eye back and forth across the
// the full collection of pixels on the strip.
//
// This will demonstrate the use of the NeoPixelVerticalSpriteSheet
// This will demonstrate the use of the NeoVerticalSpriteSheet
//

#include <NeoPixelBus.h>
Expand All @@ -26,7 +26,7 @@ NeoPixelBus<MyPixelColorFeature, Neo800KbpsMethod> strip(PixelCount, PixelPin);
NeoPixelAnimator animations(AnimCount); // NeoPixel animation management object

// sprite sheet stored in progmem using the same pixel feature as the NeoPixelBus
NeoPixelVerticalSpriteSheet<NeoPixelBufferProgmemMethod<MyPixelColorFeature>> spriteSheet(
NeoVerticalSpriteSheet<NeoBufferProgmemMethod<MyPixelColorFeature>> spriteSheet(
myImageWidth, // image width and sprite width since its vertical sprite sheet
myImageHeight, // image height
1, // sprite is only one pixel high
Expand Down
8 changes: 4 additions & 4 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ NeoHueBlendClockwiseDirection KEYWORD1
NeoHueBlendCounterClockwiseDirection KEYWORD1
NeoBufferContext KEYWORD1
LayoutMapCallback KEYWORD1
NeoPixelBufferMethod KEYWORD1
NeoPixelBufferProgmemMethod KEYWORD1
NeoPixelBuffer KEYWORD1
NeoPixelVerticalSpriteSheet KEYWORD1
NeoBufferMethod KEYWORD1
NeoBufferProgmemMethod KEYWORD1
NeoBuffer KEYWORD1
NeoVerticalSpriteSheet KEYWORD1

#######################################
# Methods and Functions (KEYWORD2)
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/Makuna/NeoPixelBus"
},
"version": "2.1.0",
"version": "2.1.1",
"frameworks": "arduino",
"platforms": "*"
}
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=NeoPixelBus by Makuna
version=2.1.0
version=2.1.1
author=Michael C. Miller ([email protected])
maintainer=Michael C. Miller ([email protected])
sentence=A library that makes controlling NeoPixels (WS2811, WS2812 & SK6812) easy.
Expand Down
6 changes: 3 additions & 3 deletions src/NeoPixelBus.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ License along with NeoPixel. If not, see
#include "internal/NeoMosaic.h"

#include "internal/NeoBufferContext.h"
#include "internal/NeoPixelBufferMethods.h"
#include "internal/NeoPixelBuffer.h"
#include "internal/NeoPixelSpriteSheet.h"
#include "internal/NeoBufferMethods.h"
#include "internal/NeoBuffer.h"
#include "internal/NeoSpriteSheet.h"

#include "internal/NeoEase.h"
#include "internal/NeoGamma.h"
Expand Down
4 changes: 2 additions & 2 deletions src/internal/NeoPixelBuffer.h → src/internal/NeoBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ License along with NeoPixel. If not, see
-------------------------------------------------------------------------*/
#pragma once

template<typename T_BUFFER_METHOD> class NeoPixelBuffer
template<typename T_BUFFER_METHOD> class NeoBuffer
{
public:
NeoPixelBuffer(uint16_t width,
NeoBuffer(uint16_t width,
uint16_t height,
PGM_VOID_P pixels) :
_method(width, height, pixels)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ typedef std::function<uint16_t(int16_t x, int16_t y)> LayoutMapCallback;

#endif

template<typename T_COLOR_FEATURE> class NeoPixelBufferMethod
template<typename T_COLOR_FEATURE> class NeoBufferMethod
{
public:
NeoPixelBufferMethod(uint16_t width, uint16_t height, PGM_VOID_P pixels = NULL) :
NeoBufferMethod(uint16_t width, uint16_t height, PGM_VOID_P pixels = NULL) :
_width(width),
_height(height)
{
Expand Down Expand Up @@ -157,10 +157,10 @@ template<typename T_COLOR_FEATURE> class NeoPixelBufferMethod
uint8_t* _pixels;
};

template<typename T_COLOR_FEATURE> class NeoPixelBufferProgmemMethod
template<typename T_COLOR_FEATURE> class NeoBufferProgmemMethod
{
public:
NeoPixelBufferProgmemMethod(uint16_t width, uint16_t height, PGM_VOID_P pixels) :
NeoBufferProgmemMethod(uint16_t width, uint16_t height, PGM_VOID_P pixels) :
_width(width),
_height(height),
_pixels(pixels)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ License along with NeoPixel. If not, see
#pragma once


template<typename T_BUFFER_METHOD> class NeoPixelVerticalSpriteSheet
template<typename T_BUFFER_METHOD> class NeoVerticalSpriteSheet
{
public:
NeoPixelVerticalSpriteSheet(uint16_t width,
NeoVerticalSpriteSheet(uint16_t width,
uint16_t height,
uint16_t spriteHeight,
PGM_VOID_P pixels) :
Expand Down
95 changes: 0 additions & 95 deletions src/internal/NeoTexture.h

This file was deleted.

0 comments on commit fd18321

Please sign in to comment.