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

Old serial system

Browse Source
This commit is contained in:
IMback
2018-09-01 21:19:29 +02:00
parent 1cbff35a33
commit 91971f5380
30 changed files with 2792 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
main.cpp
View File

@ -11,7 +11,7 @@
#define MAX_RELAYS 32
#define COMMAND_BUFFER_SIZE 32
#define SNPRINTF_BUFFER_SIZE 32
#define SNPRINTF_BUFFER_SIZE 64
char buffer[SNPRINTF_BUFFER_SIZE];
@ -29,25 +29,29 @@ inline static void printHelp(Serial* serial)
{
serial->write_p(PSTR("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 machine [on/off] : Get machine readable relay state when state changes\n\
relay [on/off] [nn] : Turn on/off nth relay\n\
relay state : Get machine readable relay state\n\
erase : Erase epprom\n\
help : Show this prompt.\n\
relay add [id] : Add Wireless Relay.\n\
relay delete : Delete last Relay.\n\
relay list : Print list of saved Wireless Relays.\n\
relay machine [on/off] : Get machine readable relay state when state changes.\n\
relay [on/off] [nn] : Turn on/off nth relay.\n\
relay state : Get 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\
rgb set [RRR] [GGG] [BBB] : Set RGB value, pattern must be 0.\n\
rgb pattern [id] : RGB pattern\n\
rgb preset [id] : set preset color\n\
rgb fade [on/off] : turn Colorfade on or off\n\
version : Print Version.\n"));
rgb pattern [id] : RGB pattern.\n\
rgb preset [id] : set preset color.\n\
rgb fade [on/off] : turn Colorfade on or off.\n\
aux [on/off] : Turn on/off PWM Channel.\n\
aux set [VAL] : Set PWM value, pattern must be 0.\n"));
}
void writeState( WirelessRelayStore* relays, Serial* serial )
void writeState( WirelessRelayStore* relays, Pwm16b* auxPwm, Serial* serial )
{
serial->write("ST");
serial->write(auxPwm.isOn() ? auxPwm.getValueA() : 0);
serial->putChar(',');
serial->write(relays->count);
for(uint8_t i = 0; i < relays->count; i++)
{
@ -61,7 +65,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
{
if( strncmp(inBuffer, "add", 3) == 0 && inBuffer[3] != '\0')
{
uint16_t id = strtol( inBuffer+4, nullptr, 16 );
uint16_t id = strtol( inBuffer+3, nullptr, 16 );
if(id != 0 && relays->count < MAX_RELAYS)
{
relays->array[relays->count].init(id);
@ -69,13 +73,20 @@ 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 );
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Relay saved! NUMBER: %u ID: %X\n", relays->count, id);
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
uint8_t size = snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Relay saved! NUMBER: %u ID: %X \n", relays->count, id);
serial->write(buffer, size);
relays->count++;
}
else serial->write_p(PSTR("Usage: relay add [id] [id] being a 16bit hex nummber\n"));
}
else if( strncmp(inBuffer, "delete", 6) == 0 && inBuffer[5] != '\0')
{
serial->write_p(PSTR("Relay: "));
serial->write(relays->count);
serial->write_p(PSTR(" deleted\n"));
relays->count--;
}
else if( strncmp(inBuffer, "list", 4) == 0)
{
serial->write_p(PSTR("Relays:\n"));
@ -112,14 +123,10 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
}
else serial->write("No sutch Relay\n");
}
else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[5] != '\0')
{
writeState(relays, serial);
}
else if( strncmp(inBuffer, "machine on", 7) == 0 )
{
relays->printState = true;
serial->write("Turned on State printing\n");
serial->write_p(PSTR("Turned on State printing\n"));
}
else if( strncmp(inBuffer, "machine off", 8) == 0 )
{
@ -129,7 +136,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
else
{
serial->write(inBuffer, COMMAND_BUFFER_SIZE-5);
serial->write_p(PSTR(" is not a valid subcommand: relay [add/list/on/off]\n"));
serial->write_p(PSTR(" is not a valid subcommand: relay [add/delete/list/on/off/state/machine]\n"));
}
}
@ -187,11 +194,42 @@ void rgbDispatch(RgbLed* rgbled, char* inBuffer, Serial* serial)
else
{
serial->write(inBuffer, COMMAND_BUFFER_SIZE-4);
serial->write_p(PSTR(" is not a valid subcommand: rgb [/on/off/print/set/pattern/preset]\n"));
serial->write_p(PSTR(" is not a valid subcommand: rgb [on/off/print/set/pattern/preset]\n"));
}
}
void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
void auxDispatch(Pwm16b* auxPwm, char* inBuffer, Serial* serial)
{
if( strncmp(inBuffer, "on", 2) == 0 )
{
auxPwm->on();
serial->write_p(PSTR("Aux pwm on\n"));
}
else if( strncmp(inBuffer, "off", 3) == 0 )
{
auxPwm->off();
serial->write_p(PSTR("Aux pwm off\n"));
}
else if( strncmp(inBuffer, "set", 3) == 0 )
{
uint8_t i = 0;
for(; inBuffer[i] != '\0' && i < COMMAND_BUFFER_SIZE-4; i++ );
if( i > 4)
{
auxPwm->setDutyA(atoi(inBuffer+4) << 8);
serial->write_p(PSTR("Set PWM value\n"));
}
else serial->write_p(PSTR("Usage: aux set [VALUE]\n"));
}
else
{
serial->write(inBuffer, COMMAND_BUFFER_SIZE-4);
serial->write_p(PSTR(" is not a valid subcommand: aux [on/off/set]\n"));
}
}
void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled, Pwm16b* auxPwm)
{
if(serial->dataIsWaiting())
@ -208,9 +246,13 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
{
rgbDispatch(rgbled, buffer+4, serial);
}
else if(length > 4 && strncmp(buffer, "state", 3) == 0)
else if(length > 2 && strncmp(buffer, "aux", 3) == 0)
{
rgbDispatch(rgbled, buffer+4, serial);
auxDispatch(auxPwm, buffer+4, serial);
}
else if(length > 4 && strncmp(buffer, "state", 5) == 0)
{
writeState(relays, auxPwm, serial);
}
else if(length > 4 && strncmp(buffer, "erase", 5) == 0)
{
@ -252,9 +294,15 @@ int main()
DDRB = (1 << PB5) | ( 1 << PB1);
DDRD = (1 << PD3) | (1 << PD5)| (1 << PD6);
PORTB = 0x00;
//door watcher
PORTB = (1<< PB3) | (1<< PB4); //Enable pull up on door watcher pins;
bool doorOne = readPin(&PINB, PB3);
bool doorTow = readPin(&PINB, PB4);
uint16_t openCount = 0;
sei();
Serial serial;
Pwm8b pwmTc0( &TCCR0A, &TCCR0B, &OCR0A, &OCR0B, 0b00000011, true, true );
@ -264,16 +312,48 @@ int main()
RgbLed rgbled( &pwmTc0, &pwmTc2 );
Pwm16b pwmTc1 ( &TCCR1A, &TCCR1B, &OCR1A, &OCR1B, &ICR1, 0b00000001, true, false);
relays.count=0;
restore_relays(&relays);
serial.write_p(PSTR("RGBController v0.4 starting\n"));
serial.write_p(PSTR("RGBController v0.6 starting\n"));
while(true)
{
serialDispatch(&serial, &relays, &rgbled);
serialDispatch(&serial, &relays, &rgbled, &pwmTc1);
rgbled.logic();
if(doorOne != readPin(&PINB, PB3))
{
_delay_ms(10);
if(doorOne != readPin(&PINB, PB3))
{
doorOne = readPin(&PINB, PB3);
serial.write("D1");
doorOne ? serial.write("O\n") : serial.write("C\n");
}
}
if(doorTow != readPin(&PINB, PB4))
{
_delay_ms(10);
if(doorTow != readPin(&PINB, PB4))
{
doorTow = readPin(&PINB, PB4);
serial.write("D2");
doorTow ? serial.write("O\n") : serial.write("C\n");
}
}
if(doorTow) openCount++;
if(openCount > 60000)
{
serial.write("Door Open Warning\n");
openCount = 0;
}
_delay_ms(2);
}
return 0; //master interupt.
return 0;
}