feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Better String Convert (#448)

Browse Source
This commit is contained in:
Michael Miller
2021-03-13 15:23:20 -08:00
committed by GitHub
parent e54a06736e
commit dccf8d5709
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keywords.txt
View File

@@ -571,6 +571,7 @@ PixelCount KEYWORD2
SetPixelColor KEYWORD2 SetPixelColor KEYWORD2
GetPixelColor KEYWORD2 GetPixelColor KEYWORD2
SwapPixelColor KEYWORD2 SwapPixelColor KEYWORD2
SetString KEYWORD2
CalculateBrightness KEYWORD2 CalculateBrightness KEYWORD2
Dim KEYWORD2 Dim KEYWORD2
Brighten KEYWORD2 Brighten KEYWORD2

22
src/internal/SegmentDigit.cpp
View File

@@ -35,13 +35,13 @@ const uint8_t SevenSegDigit::DecodeNumbers[] = {
const uint8_t SevenSegDigit::DecodeAlphaCaps[] = { const uint8_t SevenSegDigit::DecodeAlphaCaps[] = {
// A B C D E F G // A B C D E F G
0x77, 0x00, 0x39, 0x00, 0x79, 0x71, 0x3D, 0x77, 0x7F, 0x39, 0x00, 0x79, 0x71, 0x3D,
// H I J K L M N // H I J K L M N
0x76, 0x30, 0x1E, 0x00, 0x38, 0x00, 0x00, 0x76, 0x30, 0x1E, 0x00, 0x38, 0x00, 0x00,
// O P Q R S // O P Q R S
0x3F, 0x73, 0x00, 0x00, 0x6D, 0x3F, 0x73, 0x00, 0x00, 0x6D,
// T U V W X Y Z // T U V W X Y Z
0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x00, 0x3E, 0x00, 0x00, 0x76, 0x00, 0x00 };
const uint8_t SevenSegDigit::DecodeAlpha[] = { const uint8_t SevenSegDigit::DecodeAlpha[] = {
// a b c d e f g // a b c d e f g
@@ -71,7 +71,7 @@ SevenSegDigit::SevenSegDigit(uint8_t bitmask, uint8_t brightness, uint8_t defaul
init(bitmask, brightness, defaultBrightness); init(bitmask, brightness, defaultBrightness);
}; };
SevenSegDigit::SevenSegDigit(char letter, uint8_t brightness, uint8_t defaultBrightness) SevenSegDigit::SevenSegDigit(char letter, uint8_t brightness, uint8_t defaultBrightness, bool maintainCase)
{ {
if (letter >= '0' && letter <= '9') if (letter >= '0' && letter <= '9')
{ {
@@ -79,11 +79,23 @@ SevenSegDigit::SevenSegDigit(char letter, uint8_t brightness, uint8_t defaultBri
} }
else if (letter >= 'a' && letter <= 'z') else if (letter >= 'a' && letter <= 'z')
{ {
init(DecodeAlpha[letter - 'a'], brightness, defaultBrightness); uint8_t index = letter - 'a';
uint8_t bitmask = DecodeAlpha[index];
if (!bitmask && !maintainCase)
{
bitmask = DecodeAlphaCaps[index];
}
init(bitmask, brightness, defaultBrightness);
} }
else if (letter >= 'A' && letter <= 'Z') else if (letter >= 'A' && letter <= 'Z')
{ {
init(DecodeAlphaCaps[letter - 'A'], brightness, defaultBrightness); uint8_t index = letter - 'A';
uint8_t bitmask = DecodeAlphaCaps[index];
if (!bitmask && !maintainCase)
{
bitmask = DecodeAlpha[index];
}
init(bitmask, brightness, defaultBrightness);
} }
else if (letter >= ',' && letter <= '/') else if (letter >= ',' && letter <= '/')
{ {

2
src/internal/SegmentDigit.h
View File

@@ -92,7 +92,7 @@ struct SevenSegDigit
// the brightness to apply to them, (0-255) // the brightness to apply to them, (0-255)
// the default brightness to apply to those not set in the bitmask (0-255) // the default brightness to apply to those not set in the bitmask (0-255)
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
SevenSegDigit(char letter, uint8_t brightness, uint8_t defaultBrightness = 0); SevenSegDigit(char letter, uint8_t brightness, uint8_t defaultBrightness = 0, bool maintainCase = false);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Construct a SevenSegDigit that will have its values set in latter operations // Construct a SevenSegDigit that will have its values set in latter operations