Avr/RGBController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Sate output

Browse Source
This commit is contained in:
IMback
2017-11-05 17:37:21 +01:00
parent b4d1844b68
commit 21b636aa98
48 changed files with 1363 additions and 3742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
main.cpp
View File

@ -14,16 +14,18 @@
struct WirelessRelayStore
{
WirelessRelay array[MAX_RELAYS];
bool states[MAX_RELAYS]={};
uint8_t count;
};
inline static void printHelp(Serial* serial)
{
serial->putString("Available Commands: \n\
serial->write("Available Commands: \n\
help : Show this prompt \n\
relay add [id] : Add Wireless Relay\n\
relay list : Print list of saved Wireless Relays \n\
relay [on/off] [nn] : Turn on/off nth relay\n\
relay state : Get full machine readable relay state\n\
erase : Erase epprom\n\
rgb [on/off] : Turn on/off RGB leds at current value.\n\
rgb print : Print current RGB value.\n\
@ -48,20 +50,20 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
EEPROM_write_string( relays->count*2+1, (char*) &id, 2 );
sprintf(buffer, "Relay saved! NUMBER: %u ID: %X\n", relays->count, id);
serial->putString(buffer, 64);
serial->write(buffer, 64);
relays->count++;
}
else serial->putString("Usage: relay add [id] [id] being a 16bit hex nummber\n");
else serial->write("Usage: relay add [id] [id] being a 16bit hex nummber\n");
}
else if( strncmp(inBuffer, "list", 4) == 0)
{
serial->putString("Relays:\n");
serial->write("Relays:\n");
for(uint8_t i = 0; i < relays->count; i++)
{
char buffer[64];
sprintf(buffer, "NUMBER: %u ID: %X\n", i, relays->array[i].getId());
serial->putString(buffer, 64);
serial->write(buffer, 64);
}
serial->putChar('\n');
}
@ -75,9 +77,9 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
char buffer[64];
sprintf(buffer, "RELAY: %u turned on\n", selected);
serial->putString(buffer, 64);
serial->write(buffer, 64);
}
else serial->putString("No sutch Relay\n");
else serial->write("No sutch Relay\n");
}
else if( strncmp(inBuffer, "off", 3) == 0 && inBuffer[3] != '\0')
{
@ -88,14 +90,22 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
char buffer[64];
sprintf(buffer, "RELAY: %u turned off\n", selected);
serial->putString(buffer, 64);
serial->write(buffer, 64);
}
else serial->putString("No sutch Relay\n");
else serial->write("No sutch Relay\n");
}
else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[3] != '\0')
{
serial->write("ST");
serial->write(relays->count);
serial->putChar(',');
for(uint8_t i = 0; i < relays->count; i++) relays->states[i] ? serial->putChar('1') : serial->putChar('0');
serial->putChar('\n');
}
else
{
serial->putString(inBuffer, COMMAND_BUFFER_SIZE-5);
serial->putString(" is not a valid subcommand: relay [add/list/on/off]\n");
serial->write(inBuffer, COMMAND_BUFFER_SIZE-5);
serial->write(" is not a valid subcommand: relay [add/list/on/off]\n");
}
}
@ -104,18 +114,18 @@ void rgbDispatch(RgbLed* rgbled, char* inBuffer, Serial* serial)
if( strncmp(inBuffer, "on", 2) == 0 )
{
rgbled->on();
serial->putString("RGB lights on\n");
serial->write("RGB lights on\n");
}
else if( strncmp(inBuffer, "off", 3) == 0 )
{
rgbled->off();
serial->putString("RGB lights off\n");
serial->write("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", rgbled->getR(), rgbled->getG(), rgbled->getB());
serial->putString(buffer, 64);
serial->write(buffer, 64);
}
else if( strncmp(inBuffer, "set", 3) == 0 )
{
@ -126,34 +136,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");
serial->write("Set RGB values\n");
}
else serial->putString("Usage: rgb set [RRR] [GGG] [BBB]\n");
else serial->write("Usage: rgb set [RRR] [GGG] [BBB]\n");
}
else if( strncmp(inBuffer, "pattern", 7) == 0 )
{
rgbled->setPattern(atoi(inBuffer+8));
serial->putString("Set Pattern\n");
serial->write("Set Pattern\n");
}
else if( strncmp(inBuffer, "preset", 6) == 0 )
{
rgbled->setPreset(atoi(inBuffer+7));
serial->putString("Set Preset\n");
serial->write("Set Preset\n");
}
else if( strncmp(inBuffer, "fade on", 7) == 0 )
{
rgbled->setFade(true);
serial->putString("Turned on Fade\n");
serial->write("Turned on Fade\n");
}
else if( strncmp(inBuffer, "fade off", 8) == 0 )
{
rgbled->setFade(false);
serial->putString("Turned off Fade\n");
serial->write("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");
serial->write(inBuffer, COMMAND_BUFFER_SIZE-4);
serial->write(" is not a valid subcommand: rgb [/on/off/print/set/pattern/preset]\n");
}
}
@ -166,9 +176,6 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
const int length = serial->getString(buffer, COMMAND_BUFFER_SIZE);
if(length != 0)
{
//serial->putString("InString: ");
//serial->putString(buffer, COMMAND_BUFFER_SIZE);
//serial->putChar('\n');
if(length > 4 && strncmp(buffer, "relay", 5) == 0)
{
relayDispatch(relays, buffer+6, serial);
@ -177,10 +184,14 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
{
rgbDispatch(rgbled, buffer+4, serial);
}
else if(length > 4 && strncmp(buffer, "state", 3) == 0)
{
rgbDispatch(rgbled, buffer+4, serial);
}
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");
serial->write("EEPROM erased\n");
relays->count = 0;
}
else if(buffer[0] == '?' || ( length > 3 && strncmp(buffer, "help", 4) == 0))
@ -189,7 +200,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
}
else
{
serial->putString("Not a valid command\n");
serial->write("Not a valid command\n");
}
}
}
@ -239,16 +250,12 @@ int main()
relays.count=0;
restore_relays(&relays);
serial.putString("RGBController v0.3 starting\n");
serial.write("RGBController v0.4 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.