diff --git a/lighthub/candriver.h b/lighthub/candriver.h index 950d144..e1143e3 100644 --- a/lighthub/candriver.h +++ b/lighthub/candriver.h @@ -39,7 +39,8 @@ enum payloadType OTAFrame=4, auth=5, metric=6, - sysCmd=7 + sysCmd=7, + rawPinCtrl=8 }; enum metricType diff --git a/lighthub/main.cpp b/lighthub/main.cpp index c80dade..c3ef630 100644 --- a/lighthub/main.cpp +++ b/lighthub/main.cpp @@ -113,13 +113,13 @@ char cryptoKey[] = QUOTE(SHAREDSECRET); #if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) UID UniqueID; #endif - +uint8_t brokers = 0; char *deviceName = NULL; aJsonObject *topics = NULL; aJsonObject *root = NULL; aJsonObject *items = NULL; aJsonObject *inputs = NULL; - +aJsonObject *brokersArr = NULL; aJsonObject *mqttArr = NULL; #ifdef _modbus aJsonObject *modbusObj = NULL; @@ -246,8 +246,10 @@ debugSerial<child; +infoSerial<next; +if (!mqttArr) setFirstBroker(); + else infoSerial << F("MQTT: tryiyng nenxt broker")<50){ - errorSerial<child && (brokersArr->child->type == aJson_Array)) +{ + infoSerial<child; + +} +else + mqttArr=brokersArr; setupSyslog(); @@ -1574,42 +1600,6 @@ int loadConfigFromEEPROM() } -int loadConfigFromCAN() -{ - if (configLocked) return 0; - configLocked++; - - infoSerial<