Merge pull request #42 from anklimov/develop

Develop

check_custom_build_flags_lighthub21.sh

@@ -1,5 +1,6 @@
 #! /bin/bash
 export FLAGS="$FLAGS -DWiz5500"
+export FLAGS="$FLAGS -DW5500_CS_PIN=53"
 export FLAGS="$FLAGS -DARTNET_ENABLE"
 export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
 CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_due-5500.sh

lighthub/inputs.cpp

@@ -115,13 +115,16 @@ void Input::setup()
 if (!isValid() || (!root)) return;
 
 #ifndef CSSHDC_DISABLE
-  in_ccs811  ccs811(this);
-  in_hdc1080 hdc1080(this);
-
     if (inType == IN_CCS811)
+      {
+        in_ccs811  ccs811(this);
         ccs811.Setup(pin);
+      }
     else if (inType == IN_HDC1080)
+      {
+        in_hdc1080 hdc1080(this);
         hdc1080.Setup(pin);
+       }
 // TODO rest types setup
 #endif
 
@@ -470,7 +473,7 @@ void Input::analogPoll() {
     // Mapping
     if (inputMap && inputMap->type == aJson_Array)
      {
-     int max;
+     int max=1024;
      if (aJson.getArraySize(inputMap)>=4)
         mappedInputVal  = map (mappedInputVal,
               aJson.getArrayItem(inputMap, 0)->valueint,

lighthub/main.cpp

@@ -119,8 +119,10 @@ lan_status lanStatus = INITIAL_STATE;
 const char configserver[] PROGMEM = CONFIG_SERVER;
 const char verval_P[] PROGMEM = QUOTE(PIO_SRC_REV);
 
+#if defined(__SAM3X8E__)
+UID UniqueID;
+#endif
 
-unsigned int UniqueID[5] = {0,0,0,0,0};
 char *deviceName = NULL;
 aJsonObject *topics = NULL;
 aJsonObject *root = NULL;
@@ -243,7 +245,8 @@ else
 
     itemName=topic+pfxlen;
 
-    if(!strcmp(itemName,CMDTOPIC)) {
+    if(!strcmp(itemName,CMDTOPIC) && payload && (strlen((char*) payload)>1)) {
+      //  mqttClient.publish(topic, "");
         cmd_parse((char *)payload);
         return;
     }
@@ -273,12 +276,15 @@ else
 void printMACAddress() {
     debugSerial<<F("MAC:");
     for (byte i = 0; i < 6; i++)
+{
+  if (mac[i]<16) debugSerial<<"0";
 #ifdef WITH_PRINTEX_LIB
         (i < 5) ?debugSerial<<hex <<(mac[i])<<F(":"):debugSerial<<hex<<(mac[i])<<endl;
 #else
         (i < 5) ?debugSerial<<_HEX(mac[i])<<F(":"):debugSerial<<_HEX(mac[i])<<endl;
 #endif
 }
+}
 
 
 lan_status lanLoop() {
@@ -560,6 +566,11 @@ void ip_ready_config_loaded_connecting_to_broker() {
 
 
         debugSerial<<F("\nAttempting MQTT connection to ")<<servername<<F(":")<<port<<F(" user:")<<user<<F(" ...");
+        if (!strlen(user))
+          {
+            user = NULL;
+            password= NULL;
+          }
         //    wdt_dis();  //potential unsafe for ethernetIdle(), but needed to avoid cyclic reboot if mosquitto out of order
         if (mqttClient.connect(deviceName, user, password,willTopic,MQTTQOS1,true,willMessage)) {
             mqttErrorRate = 0;
@@ -593,7 +604,7 @@ void ip_ready_config_loaded_connecting_to_broker() {
             nextLanCheckTime = millis() + 5000;
             debugSerial<<F("Awaiting for retained topics");
         } else {
-            debugSerial<<F("failed, rc=")<<mqttClient.state()<<F(" try again in 5 seconds");
+            debugSerial<<F("failed, rc=")<<mqttClient.state()<<F(" try again in 5 seconds")<<endl;
             nextLanCheckTime = millis() + 5000;
 #ifdef RESTART_LAN_ON_MQTT_ERRORS
             mqttErrorRate++;
@@ -630,7 +641,7 @@ void onInitialStateInitLAN() {
                     wifi_connection_wait -= 500;
                     debugSerial<<".";
                 }
-                wifiInitialized = true;
+                wifiInitialized = true; //???
             }
 #else
 // Wifi Manager
@@ -1142,7 +1153,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
 {
     int responseStatusCode = 0;
     char ch;
-    char URI[40];
+    char URI[64];
     char configServer[32]="";
     if (arg_cnt > 1) {
         strncpy(configServer, args[1], sizeof(configServer) - 1);
@@ -1150,13 +1161,13 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
     } else if (!loadFlash(OFFSET_CONFIGSERVER, configServer))
         strncpy_P(configServer,configserver,sizeof(configServer));
 #ifndef DEVICE_NAME
-    snprintf(URI, sizeof(URI), "/%02x-%02x-%02x-%02x-%02x-%02x.config.json", mac[0], mac[1], mac[2], mac[3], mac[4],
+    snprintf(URI, sizeof(URI), "/cnf/%02x-%02x-%02x-%02x-%02x-%02x.config.json", mac[0], mac[1], mac[2], mac[3], mac[4],
              mac[5]);
 #else
 #ifndef FLASH_64KB
-    snprintf(URI, sizeof(URI), "/%s_config.json",QUOTE(DEVICE_NAME));
+    snprintf(URI, sizeof(URI), "/cnf/%s_config.json",QUOTE(DEVICE_NAME));
 #else
-    strncpy(URI, "/", sizeof(URI));
+    strncpy(URI, "/cnf/", sizeof(URI));
     strncat(URI, QUOTE(DEVICE_NAME), sizeof(URI));
     strncat(URI, "_config.json", sizeof(URI));
 #endif
@@ -1209,8 +1220,8 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         return READ_RE_CONFIG;//-11;
     }
 #endif
-#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_ESP32)
-    #if defined(ARDUINO_ARCH_ESP32)
+#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) //|| defined(ARDUINO_ARCH_ESP32) //|| defined(ARDUINO_ARCH_ESP8266)
+    #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
     WiFiClient configEthClient;
     #else
     EthernetClient configEthClient;
@@ -1233,7 +1244,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
     htclient.stop();
     wdt_res();
     debugSerial<<F("HTTP Status code: ");
-    debugSerial<<responseStatusCode;
+    debugSerial<<responseStatusCode<<" ";
     //debugSerial<<"GET Response: ");
 
     if (responseStatusCode == 200) {
@@ -1257,7 +1268,8 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         return READ_RE_CONFIG;//-11; //Load from NVRAM
     }
 #endif
-#if defined(ARDUINO_ARCH_ESP8266)
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
     HTTPClient httpClient;
     String fullURI = "http://";
     fullURI+=configServer;
@@ -1315,6 +1327,10 @@ void postTransmission() {
 void setup_main() {
   //Serial.println("Hello");
   //delay(1000);
+  #if defined(__SAM3X8E__)
+  memset(&UniqueID,0,sizeof(UniqueID));
+  #endif
+
     setupCmdArduino();
     printFirmwareVersionAndBuildOptions();
 
@@ -1452,11 +1468,11 @@ debugSerial<<endl;
 #if defined(__SAM3X8E__)
 
     Serial.println(F("Reading 128 bits unique identifier") ) ;
-    ReadUniqueID( UniqueID ) ;
+    ReadUniqueID( UniqueID.UID_Long ) ;
 
     Serial.print ("ID: ") ;
     for (byte b = 0 ; b < 4 ; b++)
-      Serial.print ((unsigned int) UniqueID [b], HEX) ;
+      Serial.print ((unsigned int) UniqueID.UID_Long [b], HEX) ;
     Serial.println () ;
 #endif
 
@@ -1509,9 +1525,9 @@ if (!isMacValid) {
     #elif defined(__SAM3X8E__)
     //Lets make MAC from MPU serial#
     mac[0]=0xDE;
-    //firmwareMacAddress[1]=0xAD;
+
     for (byte b = 0 ; b < 5 ; b++)
-              mac[b+1]=UniqueID [b] ;
+              mac[b+1]=UniqueID.UID_Byte [b*3] + UniqueID.UID_Byte [b*3+1] + UniqueID.UID_Byte [b*3+2];
 
     #elif defined DEFAULT_FIRMWARE_MAC
     uint8_t defaultMac[6] = DEFAULT_FIRMWARE_MAC;//comma(,) separated hex-array, hard-coded

lighthub/main.h

@@ -18,6 +18,8 @@
 #include <FS.h>                   //this needs to be first, or it all crashes and burns...
 #include <ESP_EEPROM.h>
 #include <ESP8266HTTPClient.h>
+//#include <ArduinoHttpClient.h>
+//#include "HttpClient.h"
 #include <WiFiManager.h>
 #include <DNSServer.h>
 #include <ESP8266WebServer.h>
@@ -27,10 +29,12 @@
 #endif
 
 #if defined ARDUINO_ARCH_ESP32
-//#include <FS.h>                   //this needs to be first, or it all crashes and burns...
+#include <FS.h>                   //this needs to be first, or it all crashes and burns...
 //#include <EEPROM.h>
 #include <NRFFlashStorage.h>
-#include <HttpClient.h>
+//#include "HttpClient.h"
+//#include <ArduinoHttpClient.h>
+#include <HTTPClient.h>
 #include <WiFi.h>
 #include <WiFiClient.h>
 #include <WiFiClientSecure.h>
@@ -169,6 +173,10 @@ enum lan_status {
     DO_NOTHING = -14
 };
 
+typedef union {
+    uint32_t  UID_Long[5];
+    uint8_t   UID_Byte[20];
+} UID;
 
 //void watchdogSetup(void);
 

lighthub/modules/in_ccs811_hdc1080.cpp

@@ -7,6 +7,9 @@ CCS811 ccs811(CCS811_ADDR);
 ClosedCube_HDC1080 hdc1080;
 long ccs811Baseline;
 
+bool CCS811ready = false;
+bool HDC1080ready = false;
+
 int  in_ccs811::Setup(int addr)
 {
 #ifdef WAK_PIN
@@ -15,7 +18,7 @@ int  in_ccs811::Setup(int addr)
 #endif
 
 Serial.println("CCS811 Init");
-
+if (CCS811ready) return 0;
 Wire.begin(); //Inialize I2C Harware
 
   //It is recommended to check return status on .begin(), but it is not
@@ -28,11 +31,13 @@ Wire.begin(); //Inialize I2C Harware
     return 0;
   }
 ccs811.setBaseline(62000);
+CCS811ready = true;
 return 1;
 }
 
 int in_hdc1080::Setup(int addr)
 {
+if (HDC1080ready) return 0;
 Serial.println("HDC1080 Init ");
 Wire.begin(); //Inialize I2C Harware
 // Default settings:
@@ -44,6 +49,7 @@ Serial.println(hdc1080.readManufacturerId(), HEX); // 0x5449 ID of Texas Instrum
 Serial.print("Device ID=0x");
 Serial.println(hdc1080.readDeviceId(), HEX); // 0x1050 ID of the device
 printSerialNumber();
+HDC1080ready = true;
 return 1;
 }
 
@@ -60,37 +66,31 @@ int in_hdc1080::Poll()
 {
   float h,t;
   int reg;
-
-//  #ifdef WAK_PIN
-//    digitalWrite(WAK_PIN,LOW);
-//  #endif
-
-
-Serial.print("T=");
-Serial.print(t=hdc1080.readTemperature());
-Serial.print("C, RH=");
-Serial.print(h=hdc1080.readHumidity());
-Serial.print("% Status=");
-publish(t,"/T");
-publish(h,"/H");
+if (!HDC1080ready) return 0;
+Serial.print("HDC Status=");
 Serial.println(reg=hdc1080.readRegister().rawData,HEX);
-ccs811.setEnvironmentalData(h,t);
-
-if (reg==0xff) //ESP I2C glitch
+if (reg!=0xff)
+{
+  Serial.print("T=");
+  Serial.print(t=hdc1080.readTemperature());
+  Serial.print("C, RH=");
+  Serial.print(h=hdc1080.readHumidity());
+  Serial.print("%");
+  publish(t,"/T");
+  publish(h,"/H");
+  ccs811.setEnvironmentalData(h,t);
+}
+else //ESP I2C glitch
   {
     Serial.println("I2C Reset");
     i2cReset();
   }
-
-delay(100);
-//#ifdef WAK_PIN
-//  digitalWrite(WAK_PIN,HIGH);
-//#endif
 return 1;
 }
 
 int in_ccs811::Poll()
 {
+  if (!CCS811ready) return 0;
   #ifdef WAK_PIN
     digitalWrite(WAK_PIN,LOW);
   #endif

lighthub/mqtt.cpp

@@ -0,0 +1,18 @@
+/*
+int mqtt::publish(int value)
+{};
+
+int mqtt::publish(float value)
+{
+
+};
+
+int mqtt::publish(char * value)
+{
+  char addrstr[MQTT_TOPIC_LENGTH];
+  aJsonObject *emit = aJson.getObjectItem(in, "emit");
+  strncpy(addrstr,emit->valuestring,sizeof(addrstr));
+  if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestring);
+  if mqttClient.connected() mqttClient.publish(addrstr, value, true);
+};
+*/

lighthub/owTerm.cpp

@@ -76,7 +76,7 @@ int owUpdate() {
         }//if
     } //while
 
-    debugSerial<<F("1-wire count: ")<<t_count;
+    debugSerial<<F("1-wire count: ")<<t_count<<endl;
 #endif
 }
 

lighthub/utils.cpp

@@ -247,7 +247,7 @@ Awesome work Mark T!*/
 
 __attribute__ ((section (".ramfunc")))
 
-void ReadUniqueID( unsigned int * pdwUniqueID )
+void ReadUniqueID( uint32_t * pdwUniqueID )
 {
     unsigned int status ;
 

lighthub/utils.h

@@ -51,7 +51,7 @@ unsigned long freeRam ();
 void parseBytes(const char* str, char separator, byte* bytes, int maxBytes, int base);
 int log(const char *str, ...);
 void printFloatValueToStr(float value, char *valstr);
-void ReadUniqueID( unsigned int * pdwUniqueID );
+void ReadUniqueID( uint32_t * pdwUniqueID );
 int inet_aton(const char* aIPAddrString, IPAddress& aResult);
 char *inet_ntoa_r(IPAddress addr, char *buf, int buflen);
 void printIPAddress(IPAddress ipAddress);

platformio.ini

@@ -18,7 +18,7 @@ env_default =
 ;    esp8266
 ;     esp32
 ;    megaatmega2560-5500
-    due-5500
+;    due-5500
 ;    controllino
 ;    stm32
 ;    nrf52840
@@ -93,18 +93,17 @@ lib_ignore =
     Ethernet
     Ethernet2
     Ethernet3
-    HTTPClient
-    httpClient
     EEPROM
     Artnet
-    HTTPClient
     UIPEthernet
     ESP_EEPROM
-    EEPROM
+    httpClient
+    HttpClient_ID66
+    HttpClient
+    ArduinoHttpClient
 lib_deps =
     https://github.com/ebenolson/WIFIMANAGER-ESP32.git
     https://github.com/zhouhan0126/WebServer-esp32.git
-    ArduinoHttpClient
     https://github.com/anklimov/aJson
     https://github.com/anklimov/CmdArduino
     https://github.com/knolleary/pubsubclient.git
@@ -214,6 +213,8 @@ lib_ignore =
     SdFat
     httpClient
     HTTPClient
+    HttpClient_ID66
+    HttpClient
     ArduinoHttpClient
     Ethernet3
     Ethernet2