andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-10 21:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix of GROUP channels restoring from MQTT presistent, small default MAC simplification

Browse Source
This commit is contained in:
Andrey Klimov
2018-03-31 12:14:22 +03:00
parent a5f632417b
commit a0ba569d60
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lighthub/main.cpp
View File

@@ -170,6 +170,7 @@ void mqttCallback(char *topic, byte *payload, unsigned int length) {
Item item(subtopic); Item item(subtopic);
if (item.isValid()) { if (item.isValid()) {
if (item.itemType==CH_GROUP && retaining) return; //Do not restore group channels - they consist not relevant data
switch (cmd) { switch (cmd) {
case 0: { case 0: {
short i = 0; short i = 0;
@@ -885,14 +886,7 @@ void printFirmwareVersionAndBuildOptions() {
Serial.print(F("Config server:")); Serial.print(F("Config server:"));
Serial.println(F(CONFIG_SERVER)); Serial.println(F(CONFIG_SERVER));
Serial.print(F("Firmware MAC Address ")); Serial.print(F("Firmware MAC Address "));
#ifdef DEFAULT_FIRMWARE_MAC
Serial.println(F(Q(DEFAULT_FIRMWARE_MAC)));
#endif
#ifdef CUSTOM_FIRMWARE_MAC
Serial.println(F(QUOTE(CUSTOM_FIRMWARE_MAC))); Serial.println(F(QUOTE(CUSTOM_FIRMWARE_MAC)));
#endif
printMACAddress();
#ifdef DISABLE_FREERAM_PRINT #ifdef DISABLE_FREERAM_PRINT
Serial.println(F("(-)FreeRam printing")); Serial.println(F("(-)FreeRam printing"));
#else #else
@@ -903,13 +897,9 @@ void printFirmwareVersionAndBuildOptions() {
} }
void setupMacAddress() { void setupMacAddress() {
#ifdef DEFAULT_FIRMWARE_MAC
byte firmwareMacAddress[6] = DEFAULT_FIRMWARE_MAC;
#else
byte firmwareMacAddress[6]; byte firmwareMacAddress[6];
const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC); const char *macStr = QUOTE(CUSTOM_FIRMWARE_MAC);
parseBytes(macStr, ':', firmwareMacAddress, 6, 16); parseBytes(macStr, ':', firmwareMacAddress, 6, 16);
#endif
bool isMacValid = false; bool isMacValid = false;
for (short i = 0; i < 6; i++) { for (short i = 0; i < 6; i++) {

4
lighthub/options.h
View File

@@ -1,6 +1,6 @@
// Configuration of drivers enabled // Configuration of drivers enabled
#ifndef PIO_SRC_REV #ifndef PIO_SRC_REV
#define PIO_SRC_REV v0.99 #define PIO_SRC_REV v0.99.1
#endif #endif
#define TXEnablePin 13 #define TXEnablePin 13
@@ -26,7 +26,7 @@
#endif #endif
#ifndef CUSTOM_FIRMWARE_MAC #ifndef CUSTOM_FIRMWARE_MAC
#define DEFAULT_FIRMWARE_MAC {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0} #define CUDTOM_FIRMWARE_MAC {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0}
#endif #endif