Cut SRAM usage by 6 bytes.

This commit is contained in:
Adrian Courrèges
2015-02-08 17:27:04 +09:00
parent 2de1ae4522
commit cac325a305
3 changed files with 10 additions and 15 deletions

View File

@@ -17,11 +17,9 @@
#include <Arduino.h>
#include "FullColorLed.h"
#include "timer.h"
#include "pins.h"
FullColorLed::FullColorLed(int pinR, int pinG, int pinB) :
pinR_(pinR),
pinG_(pinG),
pinB_(pinB),
FullColorLed::FullColorLed() :
blinkOn_(0),
blinkMode_(ALWAYS_ON),
blink_timer_(TIMER_OFF)
@@ -49,14 +47,14 @@ void FullColorLed::onTimer() {
if ( blinkOn_ || (blinkMode_ == ALWAYS_ON) ) {
// not blinking = always on
digitalWrite(pinR_, colorR_);
digitalWrite(pinG_, colorG_);
digitalWrite(pinB_, colorB_);
digitalWrite(FULLCOLOR_LED_R, colorR_);
digitalWrite(FULLCOLOR_LED_G, colorG_);
digitalWrite(FULLCOLOR_LED_B, colorB_);
}
else {
digitalWrite(pinR_, LOW);
digitalWrite(pinG_, LOW);
digitalWrite(pinB_, LOW);
digitalWrite(FULLCOLOR_LED_R, LOW);
digitalWrite(FULLCOLOR_LED_G, LOW);
digitalWrite(FULLCOLOR_LED_B, LOW);
}
TIMER_TICK(blink_timer_);

View File

@@ -28,7 +28,7 @@ public:
BLINK_THEN_OFF = 2 // LED blinks, then turns off.
} LightMode;
FullColorLed(int pinR, int pinG, int pinB);
FullColorLed();
// Lights-up the LED with a specific color, with optional blinking parameters.
void setLedColor(
@@ -44,9 +44,6 @@ public:
void onTimer();
private:
int pinR_;
int pinG_;
int pinB_;
bool colorR_;
bool colorG_;
bool colorB_;

View File

@@ -36,7 +36,7 @@
static struct long_press_button_state_t long_press_button_state;
static volatile uint8_t reconnect_timer = TIMER_OFF;
static char commands_data[COMMAND_QUEUE_SIZE];
static FullColorLed color( FULLCOLOR_LED_R, FULLCOLOR_LED_G, FULLCOLOR_LED_B );
static FullColorLed color;
struct RingBuffer commands;
GSwifi gs(&Serial1X);