From f963c5b312aa6d5d919d9aeacd959a494f619533 Mon Sep 17 00:00:00 2001 From: IMback Date: Mon, 5 Nov 2018 21:58:16 +0100 Subject: [PATCH] changed status reporting system --- WirelessRelay.cpp | 6 +-- WirelessRelay.h | 5 +- main.cpp | 120 +++++++++++++++++++++------------------------- serial.cpp | 19 ++++---- serial.h | 2 +- staticvector.h | 11 +++-- 6 files changed, 76 insertions(+), 87 deletions(-) diff --git a/WirelessRelay.cpp b/WirelessRelay.cpp index a6288cf..09a9090 100644 --- a/WirelessRelay.cpp +++ b/WirelessRelay.cpp @@ -56,6 +56,7 @@ void WirelessRelay::sync() void WirelessRelay::on() { + _state = true; for(short z = 0; z<10; z++) { sendId(); @@ -63,11 +64,11 @@ void WirelessRelay::on() sendBit(false); sync(); } - _state = true; } void WirelessRelay::off() { + _state = false; for(short z = 0; z<10; z++) { sendId(); @@ -75,7 +76,6 @@ void WirelessRelay::off() sendBit(true); sync(); } - _state = false; } uint16_t WirelessRelay::getId() @@ -85,7 +85,7 @@ uint16_t WirelessRelay::getId() bool WirelessRelay::getExpectedState() { - return _state; + return _state;//_state; } char* WirelessRelay::getName() diff --git a/WirelessRelay.h b/WirelessRelay.h index 453d79a..4460ada 100644 --- a/WirelessRelay.h +++ b/WirelessRelay.h @@ -10,14 +10,13 @@ public: static const uint16_t LARGE_TIME = 750; static const uint8_t SMALL_TIME = 250; - static const uint16_t MAX_NAME_LENGTH = 32; + static const uint16_t MAX_NAME_LENGTH = 16; private: bool _state = false; - uint16_t _nameAddr; uint16_t _id; char _name[MAX_NAME_LENGTH]; - void sendBit( const bool i); + void sendBit(const bool i); void sync(); void sendId(); diff --git a/main.cpp b/main.cpp index 8c57f15..1644ac1 100644 --- a/main.cpp +++ b/main.cpp @@ -15,14 +15,13 @@ #define COMMAND_BUFFER_SIZE 64 #define SNPRINTF_BUFFER_SIZE 64 -#define MAX_RELAYS 16 +#define MAX_RELAYS 32 #define RELAY_VECTOR_EEPROM_ADDR 32 char buffer[SNPRINTF_BUFFER_SIZE]; SVector relays; - ISR(PCINT1_vect) { W433DataReciver::staticInterrupt(); @@ -37,7 +36,6 @@ inline static void printHelp(Serial* serial) help : Show this prompt.\n\ relay add [id] [name] : Add Wireless Relay.\n\ relay delete : Delete last Relay.\n\ - relay list : Print list of saved Wireless Relays.\n\ relay [on/off] [nn] : Turn on/off nth relay.\n\ state : Get machine readable state.\n\ erase : Erase epprom.\n\ @@ -65,18 +63,17 @@ void load() EEPROM_read_class< SVector > (RELAY_VECTOR_EEPROM_ADDR, &relays); } -void writeState( SVector* relays, Pwm16b* auxPwm, Serial* serial ) +void writeRelayState(Serial* serial, WirelessRelay* relay, uint8_t number) { - serial->write("ST"); - serial->write(auxPwm->isOn() ? auxPwm->getValueA() >> 8 : 0); - serial->putChar(','); - serial->write(relays->count()); - for(uint8_t i = 0; i < relays->count(); i++) - { - serial->putChar(','); - relays->at(i).getExpectedState() ? serial->putChar('1') : serial->putChar('0'); - } - serial->putChar('\n'); + uint16_t id = relay->getId(); + snprintf(buffer, SNPRINTF_BUFFER_SIZE, "RELAY NUMBER: %u ID: %s%s%s NAME: %s STATE: %u\n", number, + bit_rep[ id >> 12], + bit_rep[(id & 0x0F00) >> 8 ], + bit_rep[(id & 0x00F0) >> 4 ], + relay->getName(), + relay->getExpectedState() + ); + serial->write(buffer, SNPRINTF_BUFFER_SIZE); } void relayDispatch(SVector* relays, Pwm16b* auxPwm, char* token, Serial* serial) @@ -100,8 +97,7 @@ void relayDispatch(SVector* relays, Pwm16b* auxPwm, c WirelessRelay relay(id, token); relays->push_back(relay); } - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Adding relay NUMBER: %u NAME: %s\n", relays->count()-1, relays->back().getName()); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); + writeRelayState(serial, &relays->back(), relays->count()-1); save(); } else if(relays->remainingCapacity() == 0) serial->write_p(PSTR("Relay storage full.\n")); @@ -109,59 +105,45 @@ void relayDispatch(SVector* relays, Pwm16b* auxPwm, c } else if( strcmp(token, "delete") == 0 ) { - relays->erase(relays->count()); - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Deleting relay NUMBER: %u NAME: %s\n", relays->count(), relays->at(relays->count()).getName()); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); - save(); - } - else if( strcmp(token, "list") == 0 ) - { - serial->write_p(PSTR("Relays:\n")); - for(uint8_t i = 0; i < relays->count(); i++) - { - uint16_t id = relays->at(i).getId(); - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "NUMBER: %u ID: %s%s%s NAME: %s\n", i, - bit_rep[ id >> 12], - bit_rep[(id & 0x0F00) >> 8 ], - bit_rep[(id & 0x00F0) >> 4 ], - relays->at(i).getName()); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); - } - serial->write_p(PSTR("EOL\n")); + if(relays->count() > 0) + { + relays->erase(relays->count()); + snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Deleting relay NUMBER: %u NAME: %s\n", relays->count(), relays->at(relays->count()).getName()); + serial->write(buffer, SNPRINTF_BUFFER_SIZE); + save(); + } } else if( strcmp(token, "on") == 0 ) { char* token = strtok(NULL, " \n"); if( token != NULL) { - uint8_t selected = atoi(token); - if (selected <= relays->count()) + uint8_t selected = strtol(token, nullptr, 10);; + if (selected < relays->count()) { - relays->at(selected).on(); - - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "RELAY: %u turned on\n", selected); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); - writeState(relays, auxPwm, serial); + relays->at(selected).on(); + + writeRelayState(serial, &relays->at(selected), selected); } - else serial->write("No sutch Relay\n"); + else serial->write(PSTR("No sutch Relay\n")); } + else serial->write(PSTR("Usage: relay on [nn]\n")); } else if( strcmp(token, "off") == 0 ) { char* token = strtok(NULL, " \n"); if( token != NULL) { - uint8_t selected = atoi(token); - if (selected <= relays->count()) + uint8_t selected = strtol(token, nullptr, 10); + if (selected < relays->count()) { relays->at(selected).off(); - snprintf(buffer, SNPRINTF_BUFFER_SIZE, "RELAY: %u turned off\n", selected); - serial->write(buffer, SNPRINTF_BUFFER_SIZE); - writeState(relays, auxPwm, serial); + writeRelayState(serial, &relays->at(selected), selected); } - else serial->write("No sutch Relay\n"); + else serial->write(PSTR("No sutch Relay\n")); } + else serial->write(PSTR("Usage: relay off [nn]\n")); } else { @@ -184,7 +166,7 @@ void rgbDispatch(RgbLed* rgbled, char* token, Serial* serial) } else if( strcmp(token, "print") == 0 ) { -// snprintf(buffer, SNPRINTF_BUFFER_SIZE, "Current RGB values:\nR: %u G: %u B: %u\n", rgbled->getR(), rgbled->getG(), rgbled->getB()); + 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( strcmp(token, "set") == 0 ) @@ -295,7 +277,6 @@ void serialDispatch(Serial* serial, SVector* relays, else if(strcmp(token, "aux") == 0) { auxDispatch(auxPwm, strtok(NULL, " \n"), serial); - writeState(relays, auxPwm, serial); } else if(strcmp(token, "pause") == 0) { @@ -309,7 +290,12 @@ void serialDispatch(Serial* serial, SVector* relays, } else if(strcmp(token, "state") == 0) { - writeState(relays, auxPwm, serial); + serial->write_p(PSTR("Relays:\n")); + for(uint8_t i = 0; i < relays->count(); i++) + { + writeRelayState(serial, &relays->at(i), i); + } + serial->write_p(PSTR("EOL\n")); } else if(strcmp(token, "erase") == 0) { @@ -344,18 +330,20 @@ void temperaturePacketRecived(uint32_t data, void* userData) if(!sensorsPaused) { Serial* serial = reinterpret_cast(userData); - if(data >> 24 == 1) - { - serial->write_p(PSTR("SENSOR TYPE: ")); - serial->write(data >> 24); - serial->write_p(PSTR(" ID: ")); - serial->write((data & 0x00FF0000) >> 16); - serial->write_p(PSTR(" TEMPERATURE: ")); - serial->write((data & 0x0000FF00) >> 8); - serial->write_p(PSTR(" HUMIDITY: ")); - serial->write(data & 0x000000FF); - serial->putChar('\n'); - } + + uint16_t field = data & 0x0000FFFF; + + serial->write_p(PSTR("SENSOR TYPE: ")); + serial->write(data >> 24); + serial->write_p(PSTR(" ID: ")); + serial->write((data & 0x00FF0000) >> 16); + + if(data >> 24 == 1) serial->write_p(PSTR(" TEMPERATURE: ")); + else if(data >> 24 == 2) serial->write_p(PSTR(" HUMIDITY: ")); + else serial->write_p(PSTR(" FIELD: ")); + + serial->write(field); + serial->putChar('\n'); } } @@ -388,7 +376,7 @@ int main() setBit(&PCMSK1, PCINT8, true); W433DataReciver reciver(&PINC, PC0, &TCNT1, &TIFR1, &temperaturePacketRecived, reinterpret_cast(&serial)); - serial.write_p(PSTR("RGBController v0.8 starting\n")); + serial.write_p(PSTR("RGBController v0.9 starting\n")); load(); @@ -419,7 +407,7 @@ int main() _delay_ms(10); if(doorTow != readPin(&PINB, PB4)) { - doorTow = readPin(&PINB, PB3); + doorTow = readPin(&PINB, PB4); serial.write_p(PSTR("SENSOR TYPE: ")); serial.putChar('0'); serial.write_p(PSTR(" ID: ")); diff --git a/serial.cpp b/serial.cpp index b4366a3..be7b44c 100644 --- a/serial.cpp +++ b/serial.cpp @@ -1,19 +1,19 @@ #include "serial.h" #include "ringbuffer.h" -RingBuffer rxBuffer; +volatile RingBuffer rxBuffer; bool stopped = false; -ISR (USART_RX_vect) //I have seen worse interrupt sintax +ISR(USART_RX_vect) //I have seen worse interrupt sintax { rxBuffer.write(UDR0); - if(serialFlowControl && !stopped && rxBuffer.isOverun(32)) - { - loop_until_bit_is_set(UCSR0A, UDRE0); - UDR0 = 0x13; - stopped = true; - } + if(serialFlowControl && !stopped && rxBuffer.remainingCapacity() < 32) + { + loop_until_bit_is_set(UCSR0A, UDRE0); + UDR0 = 0x13; + stopped = true; + } } Serial::Serial() @@ -23,6 +23,7 @@ Serial::Serial() UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); UCSR0B = _BV(RXEN0) | _BV(TXEN0); //Enable RX and TX UCSR0B |= (1 << RXCIE0); //Enable Rx interuppt + sei(); } void Serial::putChar(const char c) @@ -98,7 +99,7 @@ char Serial::getChar() { if(!rxBuffer.isEmpty()) { - if(serialFlowControl && stopped && !rxBuffer.isOverun(32)) + if(serialFlowControl && stopped && rxBuffer.remainingCapacity() > 32 ) { loop_until_bit_is_set(UCSR0A, UDRE0); UDR0 = 0x11; diff --git a/serial.h b/serial.h index 7153bf2..3610289 100644 --- a/serial.h +++ b/serial.h @@ -2,7 +2,7 @@ #define SERIAL_H #define BAUD 38400 -#define SERIAL_BUFFER_SIZE 128 +#define SERIAL_BUFFER_SIZE 256 #include #include diff --git a/staticvector.h b/staticvector.h index 0d9eab7..d63dfc7 100644 --- a/staticvector.h +++ b/staticvector.h @@ -10,27 +10,27 @@ private: public: - constexpr T* data() + T* data() { return array; } - T operator[](size_t i) + T& operator[](size_t i) { return array[i]; } - T at(size_t i) + T& at(size_t i) { return array[i]; } - T front() + T& front() { return array[0]; } - T back() + T& back() { return array[stored-1]; } @@ -77,6 +77,7 @@ public: void clear() { + for( size_t i = 0; i < stored; i++ ) array[i].~T(); stored = 0; } };