Skip to content
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
29 changes: 15 additions & 14 deletions src/LedControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ void LedControl::setIntensity(int addr, int intensity) {
}

void LedControl::clearDisplay(int addr) {
int offset;

if(addr<0 || addr>=maxDevices)
return;
offset=addr*8;
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
int offset=addr*8;
#endif
for(int i=0;i<8;i++) {
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
status[offset+i]=0;
Expand All @@ -123,7 +123,7 @@ void LedControl::setLed(int addr, int row, int column, boolean state) {
if(row<0 || row>7 || column<0 || column>7)
return;
offset=addr*8;
val=B10000000 >> column;
val=0b10000000 >> column;
if(state)
status[offset+row]=status[offset+row]|val;
else {
Expand Down Expand Up @@ -160,40 +160,41 @@ void LedControl::setColumn(int addr, int col, byte value) {
#endif

void LedControl::setDigit(int addr, int digit, byte value, boolean dp) {
int offset;
byte v;

if(addr<0 || addr>=maxDevices)
return;
if(digit<0 || digit>7 || value>15)
return;
offset=addr*8;
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
int offset=addr*8;
#endif
byte v;
v=pgm_read_byte_near(charTable + value);
if(dp)
v|=B10000000;
v|=0b10000000;
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
status[offset+digit]=v;
#endif
spiTransfer(addr, digit+1,v);
}

void LedControl::setChar(int addr, int digit, char value, boolean dp) {
int offset;
byte index,v;

if(addr<0 || addr>=maxDevices)
return;
if(digit<0 || digit>7)
return;
offset=addr*8;
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
int offset=addr*8;
#endif
byte index,v;

index=(byte)value;
if(index >127) {
//nothing define we use the space char
value=32;
}
v=pgm_read_byte_near(charTable + index);
if(dp)
v|=B10000000;
v|=0b10000000;
#ifndef MF_REDUCE_FUNCT_LEDCONTROL
status[offset+digit]=v;
#endif
Expand Down
6 changes: 0 additions & 6 deletions src/LedControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@
#ifndef LedControl_h
#define LedControl_h

#include <avr/pgmspace.h>

#if (ARDUINO >= 100)
#include <Arduino.h>
#else
#include <WProgram.h>
#endif

/*
* Segments to be switched on for characters and digits on
Expand Down