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

Changed static .data strings to PSTR(), removed oom situation

Browse Source
This commit is contained in:
IMback
2017-11-09 21:19:06 +01:00
parent 73f1bf57ae
commit 1cbff35a33
6 changed files with 79 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
main.cpp
View File

@ -1,6 +1,7 @@
#include <avr/io.h>
#include <stdio.h>
#include <stdlib.h>
#include <avr/pgmspace.h>
#include "serial.h"
#include "writepin.h"
#include "WirelessRelay.h"
@ -10,6 +11,9 @@
#define MAX_RELAYS 32
#define COMMAND_BUFFER_SIZE 32
#define SNPRINTF_BUFFER_SIZE 32
char buffer[SNPRINTF_BUFFER_SIZE];
struct WirelessRelayStore
{
@ -19,9 +23,12 @@ struct WirelessRelayStore
uint8_t count;
};
WirelessRelayStore relays;
inline static void printHelp(Serial* serial)
{
serial->write("Available Commands: \n\
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\
@ -35,7 +42,7 @@ inline static void printHelp(Serial* serial)
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");
version : Print Version.\n"));
}
void writeState( WirelessRelayStore* relays, Serial* serial )
@ -57,27 +64,25 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
uint16_t id = strtol( inBuffer+4, nullptr, 16 );
if(id != 0 && relays->count < MAX_RELAYS)
{
relays->array[relays->count].init(&PORTB, PB5, id);
char buffer[64];
relays->array[relays->count].init(id);
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", relays->count, id);
serial->write(buffer, 64);
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Relay saved! NUMBER: %u ID: %X\n", relays->count, id);
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
relays->count++;
}
else serial->write("Usage: relay add [id] [id] being a 16bit hex nummber\n");
else serial->write_p(PSTR("Usage: relay add [id] [id] being a 16bit hex nummber\n"));
}
else if( strncmp(inBuffer, "list", 4) == 0)
{
serial->write("Relays:\n");
serial->write_p(PSTR("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->write(buffer, 64);
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "NUMBER: %u ID: %X\n", i, relays->array[i].getId());
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
}
serial->putChar('\n');
}
@ -88,10 +93,8 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
{
relays->array[selected].on();
char buffer[64];
sprintf(buffer, "RELAY: %u turned on\n", selected);
serial->write(buffer, 64);
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "RELAY: %u turned on\n", selected);
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
if(relays->printState) writeState(relays, serial);
}
else serial->write("No sutch Relay\n");
@ -103,14 +106,13 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
{
relays->array[selected].off();
char buffer[64];
sprintf(buffer, "RELAY: %u turned off\n", selected);
serial->write(buffer, 64);
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "RELAY: %u turned off\n", selected);
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
if(relays->printState) writeState(relays, serial);
}
else serial->write("No sutch Relay\n");
}
else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[3] != '\0')
else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[5] != '\0')
{
writeState(relays, serial);
}
@ -127,7 +129,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
else
{
serial->write(inBuffer, COMMAND_BUFFER_SIZE-5);
serial->write(" is not a valid subcommand: relay [add/list/on/off]\n");
serial->write_p(PSTR(" is not a valid subcommand: relay [add/list/on/off]\n"));
}
}
@ -136,18 +138,18 @@ void rgbDispatch(RgbLed* rgbled, char* inBuffer, Serial* serial)
if( strncmp(inBuffer, "on", 2) == 0 )
{
rgbled->on();
serial->write("RGB lights on\n");
serial->write_p(PSTR("RGB lights on\n"));
}
else if( strncmp(inBuffer, "off", 3) == 0 )
{
rgbled->off();
serial->write("RGB lights off\n");
serial->write_p(PSTR("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->write(buffer, 64);
snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Current RGB values:\nR: %u G: %u B: %u\n", rgbled->getR(), rgbled->getG(), rgbled->getB());
serial->write(buffer, SNPRINTF_BUFFER_SIZE);
}
else if( strncmp(inBuffer, "set", 3) == 0 )
{
@ -158,34 +160,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->write("Set RGB values\n");
serial->write_p(PSTR("Set RGB values\n"));
}
else serial->write("Usage: rgb set [RRR] [GGG] [BBB]\n");
else serial->write_p(PSTR("Usage: rgb set [RRR] [GGG] [BBB]\n"));
}
else if( strncmp(inBuffer, "pattern", 7) == 0 )
{
rgbled->setPattern(atoi(inBuffer+8));
serial->write("Set Pattern\n");
serial->write_p(PSTR("Set Pattern\n"));
}
else if( strncmp(inBuffer, "preset", 6) == 0 )
{
rgbled->setPreset(atoi(inBuffer+7));
serial->write("Set Preset\n");
serial->write_p(PSTR("Set Preset\n"));
}
else if( strncmp(inBuffer, "fade on", 7) == 0 )
{
rgbled->setFade(true);
serial->write("Turned on Fade\n");
serial->write_p(PSTR("Turned on Fade\n"));
}
else if( strncmp(inBuffer, "fade off", 8) == 0 )
{
rgbled->setFade(false);
serial->write("Turned off Fade\n");
serial->write_p(PSTR("Turned off Fade\n"));
}
else
{
serial->write(inBuffer, COMMAND_BUFFER_SIZE-4);
serial->write(" 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"));
}
}
@ -196,7 +198,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled)
{
char buffer[COMMAND_BUFFER_SIZE];
unsigned int length = serial->getString(buffer, COMMAND_BUFFER_SIZE);
if(length != 0)
if(length > 2)
{
if(length > 4 && strncmp(buffer, "relay", 5) == 0)
{
@ -213,16 +215,16 @@ 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->write("EEPROM erased\n");
serial->write_p(PSTR("EEPROM erased\n"));
relays->count = 0;
}
else if(buffer[0] == '?' || ( length > 3 && strncmp(buffer, "help", 4) == 0))
else if(length > 3 && strncmp(buffer, "help", 4) == 0)
{
printHelp(serial);
}
else
{
serial->write("Not a valid command\n");
serial->write_p(PSTR("Not a valid command\n"));
}
}
}
@ -240,7 +242,7 @@ void restore_relays(WirelessRelayStore* relays)
{
uint16_t id;
EEPROM_read_string(1+i*2, (char*) &id, 2);
relays->array[i].init(&PORTB, PB5, id);
relays->array[i].init(id);
}
}
@ -255,12 +257,6 @@ int main()
sei();
Serial serial;
/*
Pwm16b pwmA;
pwmA.setDuty(10);
pwmA.on();
*/
Pwm8b pwmTc0( &TCCR0A, &TCCR0B, &OCR0A, &OCR0B, 0b00000011, true, true );
Pwm8b pwmTc2( &TCCR2A, &TCCR2B, &OCR2A, &OCR2B, 0b00000101, false, true );
pwmTc0.off();
@ -268,11 +264,10 @@ int main()
RgbLed rgbled( &pwmTc0, &pwmTc2 );
WirelessRelayStore relays;
relays.count=0;
restore_relays(&relays);
serial.write("RGBController v0.4 starting\n");
serial.write_p(PSTR("RGBController v0.4 starting\n"));
while(true)
{
serialDispatch(&serial, &relays, &rgbled);