Added sunrise suport
This commit is contained in:
58
main.cpp
58
main.cpp
@ -1,8 +1,6 @@
|
||||
#include <avr/io.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "serial.h"
|
||||
#include "writepin.h"
|
||||
#include "WirelessRelay.h"
|
||||
@ -31,7 +29,9 @@ inline static void printHelp(Serial* serial)
|
||||
rgb print : Print current RGB value.\n\
|
||||
rgb set [RRR] [GGG] [BBB] : Set RGB value, pattern must be 0.\n\
|
||||
rgb pattern [id] : RGB pattern\n\
|
||||
version : Print Version.\n\n");
|
||||
rgb preset [id] : set preset color\n\
|
||||
rgb fade [on/off] : turn Colorfade on or off\n\
|
||||
version : Print Version.\n");
|
||||
}
|
||||
|
||||
void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
|
||||
@ -47,12 +47,12 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
|
||||
EEPROM_write_char( 0, relays->count+1 );
|
||||
EEPROM_write_string( relays->count*2+1, (char*) &id, 2 );
|
||||
|
||||
sprintf(buffer, "Relay saved! NUMBER: %u ID: %X\n\n", relays->count, id);
|
||||
sprintf(buffer, "Relay saved! NUMBER: %u ID: %X\n", relays->count, id);
|
||||
serial->putString(buffer, 64);
|
||||
|
||||
relays->count++;
|
||||
}
|
||||
else serial->putString("Usage: relay add [id] [id] being a 16bit hex nummber\n\n");
|
||||
else serial->putString("Usage: relay add [id] [id] being a 16bit hex nummber\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "list", 4) == 0)
|
||||
{
|
||||
@ -71,7 +71,13 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
|
||||
if (selected <= relays->count)
|
||||
{
|
||||
relays->array[selected].on();
|
||||
|
||||
|
||||
char buffer[64];
|
||||
sprintf(buffer, "RELAY: %u turned on\n", selected);
|
||||
serial->putString(buffer, 64);
|
||||
}
|
||||
else serial->putString("No sutch Relay\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "off", 3) == 0 && inBuffer[3] != '\0')
|
||||
{
|
||||
@ -79,12 +85,17 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
|
||||
if (selected <= relays->count)
|
||||
{
|
||||
relays->array[selected].off();
|
||||
|
||||
char buffer[64];
|
||||
sprintf(buffer, "RELAY: %u turned off\n", selected);
|
||||
serial->putString(buffer, 64);
|
||||
}
|
||||
else serial->putString("No sutch Relay\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
serial->putString(inBuffer, COMMAND_BUFFER_SIZE-5);
|
||||
serial->putString(" is not a valid subcommand: relay [add/list/on/off]\n\n");
|
||||
serial->putString(" is not a valid subcommand: relay [add/list/on/off]\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,17 +104,17 @@ void rgbDispatch(RgbLed* rgbled, char* inBuffer, Serial* serial)
|
||||
if( strncmp(inBuffer, "on", 2) == 0 )
|
||||
{
|
||||
rgbled->on();
|
||||
serial->putString("RGB lights on\n\n");
|
||||
serial->putString("RGB lights on\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "off", 3) == 0 )
|
||||
{
|
||||
rgbled->off();
|
||||
serial->putString("RGB lights off\n\n");
|
||||
serial->putString("RGB lights off\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "print", 5) == 0 )
|
||||
{
|
||||
char buffer[64];
|
||||
sprintf(buffer, "Current RGB values:\nR: %u G: %u B: %u\n\n", rgbled->getR(), rgbled->getG(), rgbled->getB());
|
||||
sprintf(buffer, "Current RGB values:\nR: %u G: %u B: %u\n", rgbled->getR(), rgbled->getG(), rgbled->getB());
|
||||
serial->putString(buffer, 64);
|
||||
}
|
||||
else if( strncmp(inBuffer, "set", 3) == 0 )
|
||||
@ -115,22 +126,34 @@ void rgbDispatch(RgbLed* rgbled, char* inBuffer, Serial* serial)
|
||||
inBuffer[7] = '\0';
|
||||
inBuffer[11] = '\0';
|
||||
rgbled->setSolidColor(atoi(inBuffer+4), atoi(inBuffer+8), atoi(inBuffer+12));
|
||||
serial->putString("Set RGB values\n\n");
|
||||
serial->putString("Set RGB values\n");
|
||||
}
|
||||
else serial->putString("Usage: rgb set [RRR] [GGG] [BBB]\n\n");
|
||||
else serial->putString("Usage: rgb set [RRR] [GGG] [BBB]\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "pattern", 7) == 0 )
|
||||
{
|
||||
rgbled->setPattern(atoi(inBuffer+8));
|
||||
serial->putString("Set Pattern\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "preset", 6) == 0 )
|
||||
{
|
||||
rgbled->setPreset(atoi(inBuffer+7));
|
||||
serial->putString("Set Preset\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "fade on", 7) == 0 )
|
||||
{
|
||||
rgbled->setFade(true);
|
||||
serial->putString("Turned on Fade\n");
|
||||
}
|
||||
else if( strncmp(inBuffer, "fade off", 8) == 0 )
|
||||
{
|
||||
rgbled->setFade(false);
|
||||
serial->putString("Turned off Fade\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
serial->putString(inBuffer, COMMAND_BUFFER_SIZE-4);
|
||||
serial->putString(" is not a valid subcommand: rgb [/on/off/print/set/pattern/preset]\n\n");
|
||||
serial->putString(" is not a valid subcommand: rgb [/on/off/print/set/pattern/preset]\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -157,7 +180,8 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
|
||||
else if(length > 4 && strncmp(buffer, "erase", 5) == 0)
|
||||
{
|
||||
for(uint16_t i = 0; i < MAX_RELAYS*2+1; i++) EEPROM_write_char(i, 0);
|
||||
serial->putString("EEPROM erased\n\n");
|
||||
serial->putString("EEPROM erased\n");
|
||||
relays->count = 0;
|
||||
}
|
||||
else if(buffer[0] == '?' || ( length > 3 && strncmp(buffer, "help", 4) == 0))
|
||||
{
|
||||
@ -165,7 +189,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
|
||||
}
|
||||
else
|
||||
{
|
||||
serial->putString("Not a valid command\n\n");
|
||||
serial->putString("Not a valid command\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -215,12 +239,16 @@ int main()
|
||||
relays.count=0;
|
||||
restore_relays(&relays);
|
||||
|
||||
serial.putString("RGBController v0.2 starting\n\n");
|
||||
serial.putString("RGBController v0.3 starting\n");
|
||||
while(true)
|
||||
{
|
||||
serialDispatch(&serial, &relays, &rgbled);
|
||||
rgbled.logic();
|
||||
_delay_ms(2);
|
||||
/*
|
||||
char buffer[64];
|
||||
sprintf(buffer, "R: %u G: %u B: %u\n", rgbled.getR(), rgbled.getG(), rgbled.getB());
|
||||
serial.putString(buffer, 64);*/
|
||||
}
|
||||
|
||||
return 0; //master interupt.
|
||||
|
Reference in New Issue
Block a user