binaries

build-flags/build_flags_lighthub21

@@ -39,4 +39,5 @@
 -D CORS=\"*\"
 -D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
 -D MERCURY_ENABLE
-#-D IPMODBUS
+#-D IPMODBUS
+-D CONFIG_CLEAN_PIN=2

compiled/lighthub21/upload.sh

@@ -1,3 +1,3 @@
-export PORT=cu.usbmodem14101
+export PORT=cu.usbmodem141101
 echo . |  stty -f /dev/$PORT speed 1200
-../tools/mac/tool-bossac/bossac -U false -p $PORT -i -e -w -v -b firmware.bin -R 
+../tools/mac/tool-bossac/bossac -U false -p $PORT -i  -w -v -b firmware.bin -R 

lighthub/abstractch.h

@@ -4,6 +4,7 @@
 #define CST_UNKNOWN  0
 #define CST_FAILED 1
 #define CST_INITIALIZED  2
+#define CST_USER 3
 
 class abstractCh {
 public:
@@ -11,7 +12,7 @@ public:
     virtual ~abstractCh(){};
     virtual int Poll(short cause) {return 0;}
     virtual int Setup() =0;        //Should initialize hardware and reserve resources
-    virtual int Anounce () {return 0;};
+   // virtual int Anounce () {return 0;};
     virtual int Stop() {return 0;};         //Should free resources
     virtual int Status() {return CST_UNKNOWN;}
     virtual void setStatus(uint8_t status) {}

lighthub/abstractout.h

@@ -13,7 +13,7 @@ public:
     virtual bool isAllowed(itemCmd cmd){return true;};
     virtual itemCmd getDefaultOnVal(){return itemCmd().Percents255(255);};
     virtual int getChanType(){return 0;}
-    virtual int getDefaultStorageType(){return 0;}  /// Remove?? Now getChanType used instead
+   // virtual int getDefaultStorageType(){return 0;}  /// Remove?? Now getChanType used instead
     virtual int Status() override;
     virtual void setStatus(uint8_t status) override;
     int Setup()  override;        

lighthub/colorchannel.cpp

@@ -16,7 +16,7 @@ short colorChannel::getChannelAddr(short n)
   return item->getArg(n);
 }
 
-
+/*
 int colorChannel::getDefaultStorageType()
     {
 
@@ -33,7 +33,7 @@ int colorChannel::getDefaultStorageType()
           return ST_VOID;
         }
 
-/*
+
 int colorChannel::isActive()
 {
 itemCmd st;
@@ -58,7 +58,6 @@ case S_NOTFOUND:
   // turn on  and set
 toExecute = true;
 case S_SET:
-//case S_ESET:
 case S_HSV:
           PixelCtrl(cmd, subItem, toExecute, authorized);
           return 1;

lighthub/colorchannel.h

@@ -15,7 +15,7 @@ public:
                           numArgs = item->getArgCount(); // and how many addresses is configured
                         };
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized=false) override;
-    int getDefaultStorageType()override;
+    //int getDefaultStorageType()override;
     virtual int PixelCtrl(itemCmd cmd, char* subItem=NULL, bool show=true, bool authorized = false ) =0;
     short getChannelAddr(short n =0);
 //    int isActive() override;

lighthub/dmx.cpp

@@ -47,6 +47,7 @@ volatile uint32_t checkTimestamp=0L;
 #if defined(_dmxin)
 volatile uint32_t D_State=0;
 volatile unsigned long D_checkT=0;
+uint8_t DMXINChannels=0;
 #endif
 
 #ifdef _artnet
@@ -61,6 +62,61 @@ extern aJsonObject *items;
 extern aJsonObject *dmxArr;
 
 
+
+itemCmd rgb2hsv(itemCmd in)
+{
+    itemCmd         out;
+    out.setArgType(ST_HSV255);
+
+    double      min, max, delta;
+    
+    double inr=in.param.r/255;
+    double ing=in.param.g/255;
+    double inb=in.param.b/255;
+    double inw=in.param.w/255; 
+
+    min = inr < ing ? inr : ing;
+    min = min  < inb ? min  : inb;
+
+    max = inr > ing ? inr : ing;
+    max = max  > inb ? max  : inb;
+    max = max  > inw ? max  : inw;
+
+    out.param.v = max*255;                                // v
+    delta = max - min;
+    if (delta < 0.00001)
+    {
+        out.param.s = 0;
+        out.param.h = 0; // undefined, maybe nan?
+        return out;
+    }
+    if( max > 0.0 ) { // NOTE: if Max is == 0, this divide would cause a crash
+        out.param.s = (delta / max)*100;                  // s
+    } else {
+        // if max is 0, then r = g = b = 0              
+        // s = 0, h is undefined
+        out.param.s = 0;
+        out.param.h = 0;                            // its now undefined
+        return out;
+    }
+    double outh;
+    if( inr >= max )                           // > is bogus, just keeps compilor happy
+        outh = ( ing - inb ) / delta;        // between yellow & magenta
+    else
+    if( ing >= max )
+        outh = 2.0 + ( inb - inr ) / delta;  // between cyan & yellow
+    else
+        outh = 4.0 + ( inr - ing ) / delta;  // between magenta & cyan
+
+    outh *= 60.0;                              // degrees
+
+    if( outh < 0.0 )
+        outh += 360.0;
+    out.param.h=outh;
+    return out;
+}
+
+
 int itemCtrl2(char* name,int r,int g, int b, int w)
 {
   if (!items) return 0;
@@ -68,7 +124,6 @@ int itemCtrl2(char* name,int r,int g, int b, int w)
 
        if (itemArr && (itemArr->type==aJson_Array))
        {
-
         short itemtype = aJson.getArrayItem(itemArr,0)->valueint;
         short itemaddr = aJson.getArrayItem(itemArr,1)->valueint;
        switch (itemtype){
@@ -84,7 +139,6 @@ int itemCtrl2(char* name,int r,int g, int b, int w)
 
        case CH_RGB: // RGB
       {
-
         DmxWrite(itemaddr,   r);
         DmxWrite(itemaddr+1, g);
         DmxWrite(itemaddr+2, b);
@@ -96,7 +150,7 @@ int itemCtrl2(char* name,int r,int g, int b, int w)
         if (groupArr && (groupArr->type==aJson_Array))
         { aJsonObject *i =groupArr->child;
           while (i)
-            { //Serial.println(i->valuestring);
+            {
             if (i->type == aJson_String) itemCtrl2(i->valuestring,r,g,b,w);
               i=i->next;}
         }
@@ -119,9 +173,34 @@ void DMXImmediateUpdate(short tch,short r, short g, short b, short w) {
         }
 }
 
-void DMXSemiImmediateUpdate(short tch,short trh, int val)
+void DMXSemiImmediateUpdate(short tch,short r, short g, short b, short w)
 {
 //Here any code for  passthrow between DMX IN and DMX OUT in idle state
+       if (dmxArr && (dmxArr->type==aJson_Array))
+
+        {
+        aJsonObject *DMXch =   aJson.getArrayItem(dmxArr,tch);
+        char* itemname = NULL;
+        if (DMXch->type == aJson_String) itemname=DMXch->valuestring;
+         if (itemname)
+          {
+            Item it(itemname);
+            if (!r && !g && !b && !w) it.Ctrl(itemCmd().Cmd(CMD_OFF).setSuffix(S_CMD));
+               else 
+                  {
+                    /*
+                  CRGB rgb;
+                  rgb.r = r;
+                  rgb.g = g;
+                  rgb.b = b;    
+                  CHSV hsv = rgb2hsv_approximate(rgb);  
+                  it.Ctrl(itemCmd().HSV255(hsv.h,hsv.s,hsv.v).setSuffix(S_SET)); */
+                  it.Ctrl(itemCmd().RGBW(r,g,b,w).setSuffix(S_SET));
+                  //it.Ctrl(rgb2hsv(itemCmd().RGBW(r,g,b,w)).setSuffix(S_SET));
+                  it.Ctrl(itemCmd().Cmd(CMD_ON).setSuffix(S_CMD));
+                  }
+          }
+        }
 }
 
 void DMXput(void)
@@ -132,6 +211,7 @@ for (short tch=0; tch<=3 ; tch++)
     short base = tch*4;
     DMXImmediateUpdate(tch,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]);
     }
+    
 };
 
 extern volatile uint8_t timerHandlerBusy;
@@ -140,81 +220,62 @@ extern volatile uint8_t timerHandlerBusy;
 volatile int DMXinDoublecheck=0;
 #endif
 
+// INVOKED BY INTERRUPTS - MUST BE SAFE CODE
 void DMXUpdate(void)
 {
 #if defined(_dmxin)
-int t;
 if(!DMXin) return;
-
 #if defined(__SAM3X8E__)
-if (dmxin.getRxLength()<16) return;
+if (dmxin.getRxLength()<DMXINChannels) return;
 #endif
-for (short tch=0; tch<=3 ; tch++)
+
+uint8_t RGBWChannels=DMXINChannels >> 2;
+for (short tch=0; tch<RGBWChannels ; tch++)
     {
     short base = tch*4;
-    bool updated   = 0;
+    bool updated = false;
-    bool confirmed = 0;
+    int t;
 
     for (short trh=0; trh<4 ; trh++)
-    if (((t=dmxin.read(base+trh+1)) != DMXin[base+trh]))
+    if ((t=dmxin.read(base+trh+1)) != DMXin[base+trh])
       {
+        D_State |= (1<<tch);
         updated=1;
-         if (DMXinDoublecheck>2)
+        DMXin[base+trh]=t;
-           {
+      }
-            D_State |= (1<<tch);
+     if (updated)
-            DMXin[base+trh]=t;
-            confirmed = 1;
-           }
-      } 
-
-    if (updated) DMXinDoublecheck++; else DMXinDoublecheck=0;
-
-
-     if (confirmed)
         {
-
         DMXImmediateUpdate(tch,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]);
-        //for (int i=1; i<17; i++) {debugSerial.print(dmxin.read(i));debugSerial.print("-");};debugSerial.print("|");
         D_checkT=millisNZ();
         }
     }
-    //Serial.print(D_State,BIN);Serial.println();
 #endif
 }
 
-
+// INVOKED in safe loop
- void DMXCheck(void)
+void DMXCheck(void)
 {
-//  CHSV hsv;
-//  CRGB rgb;
 DMXOUT_propagate();
 #if defined(_dmxin)
-
+if ( (!D_checkT) || (!isTimeOver(D_checkT,millis(),D_CHECKT))) return;
-short t,tch;
-//Here code for semi-immediate update
-  for (t=1,tch=0; t<=8 ; t<<=1,tch++)
-       if (D_State & t)
-       {
-          // Serial.print(D_State,BIN);Serial.print(":");
-       D_State &= ~t;
-       for (short trh=0; trh<4 ; trh++)
-          DMXSemiImmediateUpdate(tch,trh,DMXin[tch*4+trh]);
-
-       }
-
-//if ((millis()<D_checkT) || (D_checkT==0)) return;
-  if ( (!D_checkT) || (!isTimeOver(D_checkT,millis(),D_CHECKT))) return;
 D_checkT=0;
+uint8_t RGBWChannels=DMXINChannels >> 2;
+for (short rgbwChan=0; rgbwChan < RGBWChannels; rgbwChan++)
+    {
+    short base = rgbwChan*4;
+    short bitMask = 1 << rgbwChan;
+       if (D_State & bitMask)
+       {
+       D_State &= ~bitMask;
+       DMXSemiImmediateUpdate(rgbwChan,DMXin[base],DMXin[base+1],DMXin[base+2],DMXin[base+3]);
+       break;
+       }
+    }   
 
-// Here code for network update
+//#ifdef _dmxout
-//int ch = 0;
+//for (int i=1; i<17; i++) {debugSerial.print(dmxin.read(i));debugSerial.print(";");}
-
+//debugSerial.println();
-DMXput();
+//#endif
-
-#ifdef _dmxout
-for (int i=1; i<17; i++) {debugSerial.print(dmxin.read(i));debugSerial.print(";");}
-debugSerial.println();
-#endif
 
 #endif
 }
@@ -238,7 +299,9 @@ void DMXinSetup(int channels)
   //DmxSimple.maxChannel(channels);
 
 #if defined(_dmxin)
+   if (channels>(32*4)) channels = 32*4;
    DMXin = new uint8_t [channels];
+   DMXINChannels=channels;
 #if defined(ARDUINO_ARCH_AVR)
    DMXSerial.init(DMXReceiver,0,channels);
     if (DMXSerial.getBuffer()) {debugSerial.print(F("Init in ch:"));debugSerial.println(channels);} else debugSerial.println(F("DMXin Buffer alloc err"));

lighthub/item.cpp

@@ -104,8 +104,15 @@ int subitem2cmd(char *payload) {
 }
 
 int txt2subItem(char *payload) {
-    int cmd = S_NOTFOUND;
     if (!payload || !strlen(payload)) return S_NOTFOUND;
+    for(uint8_t i=1; i<suffixNum ;i++)
+        if (strcmp_P(payload, suffix_P[i]) == 0)
+             {
+             return i;
+             }
+    return S_NOTFOUND;
+/*
+  int cmd = S_NOTFOUND;
     // Check for command
     if (strcmp_P(payload, SET_P) == 0) cmd = S_SET;
     else if (strcmp_P(payload, CTRL_P) == 0) cmd = S_CTRL;
@@ -120,7 +127,8 @@ int txt2subItem(char *payload) {
     else if (strcmp_P(payload, VAL_P) == 0) cmd = S_VAL;
     else if (strcmp_P(payload, DEL_P) == 0) cmd = S_DELAYED;
     else if (strcmp_P(payload, _RAW_P) == 0) cmd = S_RAW;
-    return cmd;
+    return cmd; */
+
 }
 
 //const short defval[4] = {0, 0, 0, 0}; //Type,Arg,Val,Cmd
@@ -487,7 +495,7 @@ void Item::setExt(long int par)  // Only store if VAL is int (autogenerated or c
     if(itemExt->type == aJson_NULL) itemExt->type=aJson_Int;
        else if(itemExt->type != aJson_Int ) return;
     itemExt->valueint = par;
-    debugSerial<<F("Stored EXT:")<<par<<endl;
+    //debugSerial<<F("Stored EXT:")<<par<<endl;
 }
 
 
@@ -908,6 +916,7 @@ int Item::Ctrl(itemCmd cmd,  char* subItem, bool allowRecursion, bool authorized
     int     res       = -1;
     uint16_t status2Send = 0;
     uint8_t  command2Set = 0;
+    itemCmd  originalCmd = cmd;
 
     /// Common (GRP & NO GRP) commands
     switch (cmd.getCmd()) 
@@ -1063,7 +1072,7 @@ int Item::Ctrl(itemCmd cmd,  char* subItem, bool allowRecursion, bool authorized
 
                 if ((suffixCode==S_CMD) &&  cmd.isValue())  
                                             {
-                                            scheduleOppositeCommand(cmd,chActive,authorized);         
+                                            scheduleOppositeCommand(originalCmd,chActive,authorized);         
                                             scheduledOppositeCommand = true;
                                             }   
                 }
@@ -1372,7 +1381,7 @@ int Item::Ctrl(itemCmd cmd,  char* subItem, bool allowRecursion, bool authorized
 
           if (oppositeCommandToBeSchedulled) //invoked not as group part, delayed
                                                                                     { 
-                                                                                     scheduleOppositeCommand(cmd,chActive,authorized);
+                                                                                     scheduleOppositeCommand(originalCmd,chActive,authorized);
                                                                                      status2Send &=~FLAG_PARAMETERS;
                                                                                     }
 } // NO GROUP
@@ -1464,7 +1473,7 @@ if ((!driver || driver->isAllowed(cmd)) && (!getFlag(FLAG_FREEZED)))
                         if (!tStore.timestamp16) mqttClient.publish("/alarmoff/snsr", itemArr->name);
                         tStore.tempX100=cmd.getFloat()*100.;         //Save measurement
                         tStore.timestamp16=millisNZ(8) & 0xFFFF;    //And timestamp
-                        debugSerial<<F(" T:")<<tStore.tempX100<<F(" TS:")<<tStore.timestamp16<<endl;
+                        //debugSerial<<F(" T:")<<tStore.tempX100<<F(" TS:")<<tStore.timestamp16<<endl;
                         setExt(tStore.asint);
                         res=1;
                         }
@@ -1801,9 +1810,14 @@ int Item::SendStatus(int sendFlags) {
 
               strncat(addrstr, "/", sizeof(addrstr)-1);
               
+   //           if (sendFlags & FLAG_SEND_DELAYED)
+   //                  strncat_P(addrstr, DEL_P, sizeof(addrstr)-1);
+   //           else   strncat_P(addrstr, SET_P, sizeof(addrstr)-1); 
+
               if (sendFlags & FLAG_SEND_DELAYED)
-                     strncat_P(addrstr, DEL_P, sizeof(addrstr)-1);
+                     strncat_P(addrstr, suffix_P[S_DELAYED], sizeof(addrstr)-1);
-              else   strncat_P(addrstr, SET_P, sizeof(addrstr)-1); 
+              else   strncat_P(addrstr, suffix_P[S_SET], sizeof(addrstr)-1); 
+
 
         // Preparing parameters payload //////////
            switch (st.getArgType()) {
@@ -1872,7 +1886,8 @@ int Item::SendStatus(int sendFlags) {
                             strncat(addrstr, subItem, sizeof(addrstr)-1);
                             }
               strncat(addrstr, "/", sizeof(addrstr)-1);
-              strncat_P(addrstr, CMD_P, sizeof(addrstr)-1);
+//              strncat_P(addrstr, CMD_P, sizeof(addrstr)-1);
+              strncat_P(addrstr, suffix_P[S_CMD], sizeof(addrstr)-1);              
 
               debugSerial<<F("Pub: ")<<addrstr<<F("->")<<cmdstr<<endl;
               if (mqttClient.connected()  && !ethernetIdleCount)
@@ -1909,7 +1924,8 @@ int Item::SendStatus(int sendFlags) {
                             strncat(addrstr, subItem, sizeof(addrstr)-1);
                             }
               strncat(addrstr, "/", sizeof(addrstr)-1);
-              strncat_P(addrstr, CTRL_P, sizeof(addrstr)-1);
+              //strncat_P(addrstr, CTRL_P, sizeof(addrstr)-1);
+              strncat_P(addrstr, suffix_P[S_CTRL], sizeof(addrstr)-1);        
 
               debugSerial<<F("Pub: ")<<addrstr<<F("->")<<cmdstr<<endl;
               if (mqttClient.connected()  && !ethernetIdleCount)
@@ -2006,38 +2022,6 @@ int Item::checkRetry() {
 return M_CLEAN;
 }
 
-/*
-bool Item::resumeModbus()
-{
-
-if (modbusBusy) return false;
-bool success = true;
-
-//debugSerial<<F("Pushing MB: ");
-configLocked++;
-if (items) {
-    aJsonObject * item = items->child;
-    while (items && item)
-        if (item->type == aJson_Array && aJson.getArraySize(item)>1)  {
-            Item it(item);
-            if (it.isValid()) {
-
-                        short res = it.checkModbusRetry(); 
-                        if (res<=0) success = false;
-               
-            } //isValid
-            yield();
-            item = item->next;
-        }  //if
-debugSerial<<endl;
-}
-configLocked--;
- if (success) isPendedModbusWrites=false;
-return true;
-}
-
-*/
-
 //////////////////// Begin of legacy MODBUS code - to be moved in separate module /////////////////////
 
 
@@ -2409,14 +2393,6 @@ int Item::checkModbusDimmer() {
     uint16_t reg = getArg(MODBUS_CMD_ARG_REG);
     int _regType = MODBUS_HOLDING_REG_TYPE;
     if (numpar >= (MODBUS_CMD_ARG_REG_TYPE+1)) _regType = aJson.getArrayItem(itemArg, MODBUS_CMD_ARG_REG_TYPE)->valueint;
-  //  short mask = getArg(2);
-    // debugSerial<<F("Modbus polling "));
-    // debugSerial<<addr);
-    // debugSerial<<F("=>"));
-    // debugSerial<<reg, HEX);
-    // debugSerial<<F("(T:"));
-    // debugSerial<<_regType);
-    // debugSerial<<F(")"));
 
     int data;
 

lighthub/item.h

@@ -37,6 +37,11 @@ e-mail    anklimov@gmail.com
 #define S_TEMP 12
 #define S_RAW 13
 
+typedef  char suffixstr[5];
+const suffixstr suffix_P[] PROGMEM =
+{"","cmd","set","val","del","HSV","RGB","fan","mode","ctrl","hue","sat","temp","raw"};
+#define suffixNum sizeof(suffix_P)/sizeof(suffixstr)
+
 #define S_ADDITIONAL 13
 
 #define CH_DIMMER 0   //DMX 1-4 ch
@@ -63,16 +68,6 @@ e-mail    anklimov@gmail.com
 #define CH_HUMIDIFIER 21
 #define CH_MERCURY 22
 
-//#define CHANNEL_TYPES 13
-
-//static uint32_t pollInterval[CHANNEL_TYPES] = {0,0,0,0,MODB};
-//static uint32_t nextPollTime[CHANNEL_TYPES] = {0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-#define CH_WHITE   127//
-
-
-
-
 #define POLLING_SLOW 1
 #define POLLING_FAST 2
 #define POLLING_INT  3
@@ -157,24 +152,16 @@ class Item
   int VacomSetFan (itemCmd st);
   int VacomSetHeat(itemCmd st);
   int modbusDimmerSet(itemCmd st);
-
   int modbusDimmerSet(int addr, uint16_t _reg, int _regType, int _mask, uint16_t value);
   void mb_fail(int result=0);
   void Parse();
   int checkModbusDimmer();
   int checkModbusDimmer(int data);
-
   int checkRetry();
-  //boolean checkVCRetry();
-  //boolean checkHeatRetry();
   void sendDelayedStatus();
-  //bool resumeModbus();
-
-
   int checkFM();
   char defaultSubItem[16];
   int  defaultSuffixCode;
-
 };
 
 typedef union

lighthub/main.cpp

@@ -230,7 +230,7 @@ debugSerial<<F("Deleting conf. RAM was:")<<freeRam();
     topics = NULL;
     mqttArr = NULL;
     deviceName = NULL;
-    topics = NULL;
+
   #ifdef _dmxout
   dmxArr = NULL;
   #endif
@@ -2003,6 +2003,10 @@ int16_t attachTimer(double microseconds, timerCallback callback, const char* Tim
     dueTimerInterrupt.attachInterruptInterval(microseconds, callback);
     timerNumber = dueTimerInterrupt.getTimerNumber();
     debugSerial<<TimerName<<F(" attached to Timer(")<<timerNumber<<F(")")<<endl;
+    //DueTimer.Timers[timerNumber].irq
+    NVIC_SetPriority(TC0_IRQn,2);
+    debugSerial << "USART0 prio:" << NVIC_GetPriority (USART0_IRQn)<< " TC0 prio:" << NVIC_GetPriority (TC0_IRQn)<<endl;
+
   return timerNumber;
 }
 #endif
@@ -2493,6 +2497,11 @@ infoSerial<<F("\nNOSERIAL");
 infoSerial<<F("\n(+)ELEVATOR");
 #endif
 
+#ifdef MERCURY_ENABLE
+infoSerial<<F("\n(+)MERCURY");
+#else
+infoSerial<<F("\n(-)MERCURY");
+#endif
 //#ifdef IPMODBUS
 //infoSerial<<F("\n(+)IPMODBUS");
 //#endif
@@ -2832,6 +2841,7 @@ configLocked--;
 
 
 void inputSetup(void) {
+infoSerial<<F("Initializing Inputs")<<endl;       
     if (!inputs) return;
 configLocked++;
         aJsonObject *input = inputs->child;

lighthub/modules/in_ccs811_hdc1080.cpp

@@ -22,14 +22,14 @@ static bool CCS811ready = false;
 
 int  in_ccs811::Setup()
 {
-  if (CCS811ready) {errorSerial<<F("ccs811 is already initialized")<<endl; return 0;}
+  if (CCS811ready) {errorSerial<<F("CCS811: Already initialized")<<endl; return 0;}
 
 #ifdef WAK_PIN
   pinMode(WAK_PIN,OUTPUT);
   digitalWrite(WAK_PIN,LOW);
 #endif
 
-infoSerial.println("CCS811 Init");
+infoSerial.println(F("CCS811: Init"));
 
 #if defined (TWI_SCL) && defined (TWI_SDA)
 Wire.begin(TWI_SDA,TWI_SCL); //Inialize I2C Harware
@@ -37,7 +37,9 @@ Wire.begin(TWI_SDA,TWI_SCL); //Inialize I2C Harware
 Wire.begin(); //Inialize I2C Harware
 #endif
 
-Wire.setClock(4000);
+#ifdef I2C_CLOCK
+Wire.setClock(I2C_CLOCK);
+#endif
 
   //It is recommended to check return status on .begin(), but it is not
   //required.
@@ -46,8 +48,7 @@ Wire.setClock(4000);
   if (returnCode != CCS811Core::SENSOR_SUCCESS)
   //if (returnCode != CCS811Core::CCS811_Stat_SUCCESS)
   {
-    errorSerial.print("CCS811 Init error ");
+    errorSerial.print(F("CCS811: Init error "));
-    //debugSerial.println(ccs811.statusString(returnCode));
     printDriverError(returnCode);
     return 0;
   }
@@ -68,16 +69,16 @@ return 1;
 int in_hdc1080::Setup()
 {
 //i2cReset();  
-if (HDC1080ready)  {debugSerial<<F("hdc1080 is already initialized")<<endl; return 0;}
+if (HDC1080ready)  {debugSerial<<F("HDC1080: Already initialized")<<endl; return 0;}
-debugSerial.println("HDC1080 Init ");
+debugSerial.print(F("HDC1080: Init. "));
 Wire.begin(); //Inialize I2C Harware
 // Default settings:
 // - Heater off
 // - 14 bit Temperature and Humidity Measurement Resolutions
 hdc1080.begin(0x40);
-debugSerial.print("Manufacturer ID=0x");
+debugSerial.print(F("Manufacturer ID=0x"));
-debugSerial.println(hdc1080.readManufacturerId(), HEX); // 0x5449 ID of Texas Instruments
+debugSerial.print(hdc1080.readManufacturerId(), HEX); // 0x5449 ID of Texas Instruments
-debugSerial.print("Device ID=0x");
+debugSerial.print(F(" Device ID=0x"));
 debugSerial.println(hdc1080.readDeviceId(), HEX); // 0x1050 ID of the device
 printSerialNumber();
 HDC1080ready = true;
@@ -91,14 +92,14 @@ int in_hdc1080::Poll(short cause)
   float h,t;
   int reg;
 if (cause!=POLLING_SLOW) return 0;
-if (!HDC1080ready) {debugSerial<<F("HDC1080 not initialized")<<endl; return 0;}
+if (!HDC1080ready) {errorSerial<<F("HDC1080: Not initialized")<<endl; return 0;}
-debugSerial.print("HDC Status=");
+debugSerial.print(F("HDC1080: Status="));
-debugSerial.println(reg=hdc1080.readRegister().rawData,HEX);
+debugSerial.print(reg=hdc1080.readRegister().rawData,HEX);
 if (reg!=0xff)
 {
   debugSerial.print(" T=");
   debugSerial.print(t=hdc1080.readTemperature());
-  debugSerial.print("C, RH=");
+  debugSerial.print(F("C, RH="));
   debugSerial.print(h=hdc1080.readHumidity());
   debugSerial.println("%");
 
@@ -126,6 +127,7 @@ if (reg!=0xff)
 }
 else //ESP I2C glitch
   {
+    debugSerial.println();
     i2cReset();
   }
 return INTERVAL_SLOW_POLLING;
@@ -147,14 +149,14 @@ int in_ccs811::Poll(short cause)
     CCS811Core::status returnCode = ccs811.readAlgorithmResults();
     printDriverError(returnCode);
     float co2,tvoc;
-    debugSerial.print(" CO2[");
+    debugSerial.print(F(" CO2["));
     //Returns calculated CO2 reading
     debugSerial.print(co2 = ccs811.getCO2());
-    debugSerial.print("] tVOC[");
+    debugSerial.print(F("] tVOC["));
     //Returns calculated TVOC reading
 
     debugSerial.print(tvoc = ccs811.getTVOC());
-    debugSerial.print("] baseline[");
+    debugSerial.print(F("] baseline["));
     debugSerial.print(ccs811Baseline = ccs811.getBaseline());
 
     #ifdef M5STACK
@@ -192,11 +194,11 @@ int in_ccs811::Poll(short cause)
 }
 
 void in_hdc1080::printSerialNumber() {
-debugSerial.print("Device Serial Number=");
+infoSerial.print(F("Device Serial Number="));
 HDC1080_SerialNumber sernum = hdc1080.readSerialNumber();
 char format[16];
 sprintf(format, "%02X-%04X-%04X", sernum.serialFirst, sernum.serialMid, sernum.serialLast);
-debugSerial.println(format);
+infoSerial.println(format);
 }
 
 //printDriverError decodes the CCS811Core::status type and prints the
@@ -206,25 +208,26 @@ debugSerial.println(format);
 //to this function to see what the output was.
 void in_ccs811::printDriverError( CCS811Core::status errorCode )
 {
+  debugSerial.print(F("CCS811: "));
   switch ( errorCode )
   {
     case CCS811Core::SENSOR_SUCCESS:
-      debugSerial.print("SUCCESS");
+      debugSerial.print(F("SUCCESS"));
       break;
     case CCS811Core::SENSOR_ID_ERROR:
-      debugSerial.print("ID_ERROR");
+      debugSerial.print(F("ID_ERROR"));
       break;
     case CCS811Core::SENSOR_I2C_ERROR:
-      debugSerial.print("I2C_ERROR");
+      debugSerial.print(F("I2C_ERROR"));
       break;
     case CCS811Core::SENSOR_INTERNAL_ERROR:
-      debugSerial.print("INTERNAL_ERROR");
+      debugSerial.print(F("INTERNAL_ERROR"));
       break;
     case CCS811Core::SENSOR_GENERIC_ERROR:
-      debugSerial.print("GENERIC_ERROR");
+      debugSerial.print(F("GENERIC_ERROR"));
       break;
     default:
-      debugSerial.print("Unspecified error.");
+      debugSerial.print(F("Unspecified error."));
   }
 }
 
@@ -236,18 +239,18 @@ void in_ccs811::printSensorError()
 
   if ( error == 0xFF ) //comm error
   {
-    debugSerial.println("Failed to get ERROR_ID register.");
+    errorSerial.println(F("CCS811: Failed to get ERROR_ID register."));
   }
   else
   {
-    //debugSerial.print("");
+    if (error) errorSerial.print(F("CCS811: Error "));
-    if (error & 1 << 5) debugSerial.print("Error: HeaterSupply");
+    if (error & 1 << 5) errorSerial.print(F("HeaterSupply"));
-    if (error & 1 << 4) debugSerial.print("Error: HeaterFault");
+    if (error & 1 << 4) errorSerial.print(F("HeaterFault"));
-    if (error & 1 << 3) debugSerial.print("Error: MaxResistance");
+    if (error & 1 << 3) errorSerial.print(F("MaxResistance"));
-    if (error & 1 << 2) debugSerial.print("Error: MeasModeInvalid");
+    if (error & 1 << 2) errorSerial.print(F("MeasModeInvalid"));
-    if (error & 1 << 1) debugSerial.print("Error: ReadRegInvalid");
+    if (error & 1 << 1) errorSerial.print(F("ReadRegInvalid"));
-    if (error & 1 << 0) debugSerial.print("Error: MsgInvalid");
+    if (error & 1 << 0) errorSerial.print(F("MsgInvalid"));
-    debugSerial.println();
+    if (error) errorSerial.println();
   }
 }
 #endif

lighthub/modules/in_ccs811_hdc1080.h

@@ -7,6 +7,10 @@
 #include "ClosedCube_HDC1080.h"
 #include "SparkFunCCS811.h" //Click here to get the library: http://librarymanager/All#SparkFun_CCS811
 
+//#ifndef I2C_CLOCK
+//#define I2C_CLOCK 4000
+//#endif
+
 //#define CCS811_ADDR 0x5B //Default I2C Address
 #define CCS811_ADDR 0x5A //Alternate I2C Address
 
@@ -28,13 +32,7 @@
 
 #endif
 
-/*
+
-#if defined (__SAM3X8E__)
-#define SCL_LOW()   digitalWrite(21,LOW)
-#define SCL_HIGH()  digitalWrite(21,HIGH)
-#define SCL_RESET
-#endif
-*/
 
 #if defined (ARDUINO_ARCH_ESP32)
 #undef WAK_PIN

lighthub/modules/out_ac.cpp

@@ -21,8 +21,8 @@ extern bool disableCMD;
 
 #define AC_FAILED  CST_FAILED
 #define AC_UNKNOWN CST_UNKNOWN
-#define AC_IDLE CST_INITIALIZED
+#define AC_IDLE    CST_INITIALIZED
-#define AC_SENDING 3
+#define AC_SENDING CST_USER
 
 //byte inCheck = 0;
 byte qstn[] = {255,255,10,0,0,0,0,0,1,1,77,1,90}; // Команда опроса

lighthub/modules/out_ac.h

@@ -42,7 +42,7 @@ public:
     int Stop() override;
     int isActive() override;
     int getChanType() override;
-    int getDefaultStorageType(){return ST_FLOAT_CELSIUS;};
+   // int getDefaultStorageType(){return ST_FLOAT_CELSIUS;};
     int Ctrl(itemCmd cmd,  char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
     void SubmitParameters(const char * name, itemCmd value);
     

lighthub/modules/out_mercury.cpp

@@ -97,6 +97,7 @@ debugSerial.println("Mercury: De-Init");
 disconnectMercury();
 delete store;
 item->setPersistent(NULL);
+setStatus(CST_UNKNOWN);
 store = NULL;
 return 1;
 }

lighthub/modules/out_mercury.h

@@ -20,16 +20,16 @@ public:
 #define MB_SEND_ERROR 4
 #define MB_SEND_ATTEMPTS 3
 
-#define M_CONNECTING  10
+#define M_CONNECTING  CST_USER+0 
-#define M_CONNECTED 11 
+#define M_CONNECTED CST_USER+1 
-#define M_POLLING1 12
+#define M_POLLING1 CST_USER+2
-#define M_POLLING2 13
+#define M_POLLING2 CST_USER+3
-#define M_POLLING3 14
+#define M_POLLING3 CST_USER+4
-#define M_POLLING4 15
+#define M_POLLING4 CST_USER+5
-#define M_POLLING5 16
+#define M_POLLING5 CST_USER+6
-#define M_POLLING6 17
+#define M_POLLING6 CST_USER+7
-#define M_POLLING7 18
+#define M_POLLING7 CST_USER+8
-#define M_POLLING8 19
+#define M_POLLING8 CST_USER+9
 
 #define RET_SUCCESS 0
 #define RET_INVALID_PARAM 1
@@ -48,7 +48,7 @@ public:
     int Stop() override;
     int getChanType() override;
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
-    int getDefaultStorageType(){return ST_INT32;};
+    //int getDefaultStorageType(){return ST_INT32;};
 
 
 protected:

lighthub/modules/out_modbus.cpp

@@ -327,7 +327,7 @@ itemCmd out_Modbus::findRegister(uint16_t registerNum, uint16_t posInBuffer, uin
                       mappedParam.Int((uint32_t)param);
                     }
                        
-                    debugSerial << F("MBUSD:  got ")<<mappedParam.toString(buf,sizeof(buf))<< F(" from type ")<<parType<<F(":")<<paramObj->name<<endl;             
+                    traceSerial << F("MBUSD:  got ")<<mappedParam.toString(buf,sizeof(buf))<< F(" from type ")<<parType<<F(":")<<paramObj->name<<endl;             
 
                   if (mapObj && (mapObj->type==aJson_Array || mapObj->type==aJson_Object))
                     {
@@ -401,7 +401,7 @@ itemCmd out_Modbus::findRegister(uint16_t registerNum, uint16_t posInBuffer, uin
 
                                                   aJsonObject * nestedMapObj = aJson.getObjectItem(templateParObj, "map");  
                                                   if (nestedMapObj && (nestedMapObj->type==aJson_Array || nestedMapObj->type==aJson_Object)) mappedParam=mappedParam.doReverseMapping(nestedMapObj);
-                                                  debugSerial << F("MBUSD: NestedMapped:")<<mappedParam.toString(buf,sizeof(buf))<<endl; 
+                                                  traceSerial << F("MBUSD: NestedMapped:")<<mappedParam.toString(buf,sizeof(buf))<<endl; 
 
                                                   if (!(lastMeasured->subtype & MB_VALUE_OUTDATED))
                                                       {
@@ -449,7 +449,7 @@ itemCmd out_Modbus::findRegister(uint16_t registerNum, uint16_t posInBuffer, uin
        */                   
                           }  
                         else   
-                           debugSerial << F("MBUSD: Mapped:")<<mappedParam.toString(buf,sizeof(buf))<<endl; 
+                           traceSerial << F("MBUSD: Mapped:")<<mappedParam.toString(buf,sizeof(buf))<<endl; 
                     } //mapping       
 
                     if (doExecution && idObj && idObj->type==aJson_Int) 
@@ -505,7 +505,7 @@ itemCmd out_Modbus::findRegister(uint16_t registerNum, uint16_t posInBuffer, uin
                                        aJsonObject *settedValue = aJson.getObjectItem(markObj,"@V");                      
                                        if (settedValue && settedValue->type==aJson_Int && (settedValue->valueint == param))
                                           {    
-                                           debugSerial<<F("MBUSD: Ignored - equal with setted val")<<endl;
+                                           traceSerial<<F("MBUSD: Ignored - equal with setted val")<<endl;
                                            *submitParam=false;
                                           }  
                                         else 
@@ -719,7 +719,7 @@ if (itemParametersObj && itemParametersObj->type ==aJson_Object)
 // if some polling configured
 if (store->pollingRegisters || store->pollingIrs || store->pollingCoils || store->poolingDiscreteIns)
   {
-    debugSerial<<F("MBUSD: Poll ")<< item->itemArr->name << endl;
+    traceSerial<<F("MBUSD: Poll ")<< item->itemArr->name << endl;
     modbusBusy=1;
 
     if (!lineInitialized)
@@ -732,7 +732,7 @@ if (store->pollingRegisters || store->pollingIrs || store->pollingCoils || store
     pollModbus(store->pollingIrs,MODBUS_INPUT_REG_TYPE);
     pollModbus(store->pollingCoils,MODBUS_COIL_REG_TYPE);  
     pollModbus(store->poolingDiscreteIns ,MODBUS_DISCRETE_REG_TYPE);  
-    debugSerial<<F("MBUSD: endPoll ")<< item->itemArr->name << endl;
+    traceSerial<<F("MBUSD: endPoll ")<< item->itemArr->name << endl;
 
   //Non blocking waiting to release line
   uint32_t time = millis();
@@ -794,7 +794,7 @@ aJsonObject * mapObj = aJson.getObjectItem(templateParamObj, "map");
                         Value=cmdValue.getTens_raw()*(100/TENS_BASE);
                     }
 
-debugSerial<<F("MBUSD: suffix:")<<suffixStr<< F(" Val: ")<<Value<<endl;
+traceSerial<<F("MBUSD: suffix:")<<suffixStr<< F(" Val: ")<<Value<<endl;
 aJsonObject * itemParametersObj = aJson.getArrayItem(item->itemArg, 2);
 if (itemParametersObj && itemParametersObj->type ==aJson_Object)
            {

lighthub/modules/out_modbus.h

@@ -38,7 +38,7 @@ public:
     int Stop() override;
     int getChanType() override;
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
-    int getDefaultStorageType(){return ST_INT32;};
+    //int getDefaultStorageType(){return ST_INT32;};
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL, int suffixCode=0, char* subItem=NULL) override;
 
 protected:

lighthub/modules/out_motor.h

@@ -26,7 +26,7 @@ public:
     int Stop() override;
     //int isActive() override;
     int getChanType() override;
-    int getDefaultStorageType(){return ST_PERCENTS255;};
+    //int getDefaultStorageType(){return ST_PERCENTS255;};
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL,  int suffixCode=0, char* subItem=NULL) override;
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
 

lighthub/modules/out_multivent.h

@@ -17,7 +17,7 @@ public:
     int Stop() override;
     //int isActive() override;
     int getChanType() override;
-    int getDefaultStorageType(){return ST_PERCENTS255;};
+    //int getDefaultStorageType(){return ST_PERCENTS255;};
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
 protected:
     void getConfig();

lighthub/modules/out_pid.h

@@ -31,7 +31,7 @@ public:
     int Stop() override;
     int isActive() override;
     int getChanType() override;
-    int getDefaultStorageType(){return ST_FLOAT;};
+    //int getDefaultStorageType(){return ST_FLOAT;};
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
     void alarm(bool);
 

lighthub/modules/out_uartbridge.h

@@ -64,7 +64,7 @@ public:
     int Stop() override;
     int getChanType() override;
     int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true, bool authorized = false) override;
-    int getDefaultStorageType(){return ST_INT32;};
+    //int getDefaultStorageType(){return ST_INT32;};
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL, int suffixCode=0, char* subItem=NULL) override;
 
 protected:

lighthub/owTerm.cpp

@@ -26,10 +26,9 @@ e-mail    anklimov@gmail.com
 #include "options.h"
 #include "main.h"
 #include "aJSON.h"
-//#include "twi.h"
 
 extern aJsonObject *owArr;
-extern  uint32_t timerCtr;
+//extern  uint32_t timerCtr;
 aJsonObject *dev2Check = NULL;
 
 OneWire *oneWire = NULL;
@@ -62,7 +61,7 @@ char * getReadableNote(aJsonObject * owObj)
 void processTemp(aJsonObject * owObj, float currentTemp) {
     if (!owObj || !owArr) return;
     char* note = getReadableNote(owObj);   
-    debugSerial<<endl<<F("1WT:")<<currentTemp<<F(" <")<<owObj->name<<F("> ");    
+    debugSerial <<F("1WT:")<<currentTemp<<F(" <")<<owObj->name<<F("> ");    
     if ((currentTemp != -127.0) && (currentTemp != 85.0) && (currentTemp != 0.0))
         {
         if (note) debugSerial<<note;    
@@ -127,8 +126,8 @@ int owSetup() {
     if (oneWire) return true;    // Already initialized
 #ifdef DS2482_100_I2C_TO_1W_BRIDGE
 
-    debugSerial<<F("DS2482_100_I2C_TO_1W_BRIDGE init")<<endl;
+    debugSerial<<F("1WT: DS2482_100_I2C_TO_1W_BRIDGE init")<<endl;
-    debugSerial<<F("Free:")<<freeRam()<<endl;
+    //debugSerial<<F("Free:")<<freeRam()<<endl;
     oneWire = new OneWire;
 #else
     debugSerial.print(F("One wire setup on PIN:"));
@@ -146,7 +145,7 @@ if (!oneWire)
 #ifdef DS2482_100_I2C_TO_1W_BRIDGE
     Wire.begin();
     if (oneWire->checkPresence()) {
-        infoSerial.println(F("1WT: DS2482-100 present"));
+        infoSerial.println(F("1WT: DS2482-100 present, reset"));
         oneWire->deviceReset();
 #ifdef APU_OFF
         debugSerial.println(F("APU off"));
@@ -154,11 +153,11 @@ if (!oneWire)
         oneWire->setActivePullup();
 #endif
 
-        debugSerial.println(F("\tChecking for 1-Wire devices..."));
+       // debugSerial.println(F("\tChecking for 1-Wire devices..."));
         if (oneWire->wireReset())
-            debugSerial.println(F("\tReset done"));
+            debugSerial.println(F("1WT: Bus Reset done"));
         else 
-            debugSerial.println(F("\tDS2482 reset error"));    
+            debugSerial.println(F("1WT: Bus reset error"));    
         //return true;
     }   
         else 
@@ -226,25 +225,25 @@ int sensors_loop(void) {
         
         case  DS2482_ERROR_CONFIG:
         errorSerial<<F("1WT: DS2482_ERROR_CONFIG")<<endl;
-        oneWire->wireReset();
+        i2cReset();
-        return INTERVAL_1W;
+        break;
 
-        case  DS2482_ERROR_TIMEOUT:
+        case  DS2482_ERROR_TIMEOUT: //Busy over time
-        errorSerial<<F("1WT: 1-wire shorted")<<endl;
+        errorSerial<<F("1WT: BUSY timeout")<<endl;
-        oneWire->wireReset();
+        i2cReset();
-        return INTERVAL_1W;
+        break;
 
         default:
-        errorSerial<<F("1WT: error")<<endl;
+        break;
-        oneWire->wireReset();
-        return INTERVAL_1W;
     }
+    /*
     if (!oneWire->checkPresence()) 
     {
         infoSerial.println(F("1WT: lost DS2482-100"));
         i2cReset();
     }   
-            
+
+  */          
        
 #endif
 

lighthub/streamlog.h

@@ -24,10 +24,12 @@ extern uint8_t udpDebugLevel;
 #define SerialPortType HardwareSerial
 #endif
 
+#define LOG_TRACE 9
 #define LOG_DEBUG 7
 #define LOG_INFO  6
 #define LOG_ERROR 3
 
+#define traceSerial if (serialDebugLevel>=LOG_TRACE || udpDebugLevel>=LOG_TRACE) debugSerial
 class Streamlog : public Print
 {
   public:

lighthub/templateStr.h

@@ -0,0 +1,110 @@
+#ifndef _TEMPLATE_STREAM_H_
+#define _TEMPLATE_STREAM_H_
+
+#include <Stream.h>
+#include <aJSON.h>
+#include <streamlog.h>
+//#define KEYLEN 8
+extern aJsonObject * topics;
+
+class templateStream : public Stream
+{
+public:
+    templateStream(char *s, short sfx=0) : str(s), pos(0), val(NULL), valpos(0), bucket(0),suffix(sfx) { }
+
+    // Stream methods
+    virtual int available() { return str[pos]; }
+    virtual int read() {
+        if (bucket) 
+            
+            {   int ch = bucket;
+                bucket=0; 
+                return ch;
+            };
+
+         if (str[pos]=='$')
+         {
+            if (str[pos+1]=='{')
+            {  
+                unsigned int i = 0;
+                while (str[pos+2+i] && str[pos+2+i]!='}') i++;
+                if (i && (str[pos+2+i]=='}'))
+                        { 
+                         str[pos+2+i]='\0';
+                         val=resolveKey(str+pos+2);
+                         valpos=0;
+                         str[pos+2+i]='}';
+                         pos+=3+i;
+                        }
+            }    
+         }
+
+         if (val)
+         {  
+            char ch = val[valpos];
+            if (ch)
+                {
+                  valpos++;
+                  return ch;
+                }
+            else val = NULL;    
+
+         }
+
+         if (str)
+         {
+            char ch = str[pos];
+            if (ch)
+                {
+                    pos++;
+                    return ch;
+                }
+            else    
+                    {
+                    str=NULL;    
+                    return 0;
+                    }
+              
+         }
+         else return -1;  
+  
+         }
+    virtual int peek() 
+    { 
+        int bucket = read();
+        return bucket;       
+        }
+
+    virtual void flush() { };
+    // Print methods
+    virtual size_t write(uint8_t c) { return 0; };
+    virtual char * resolveKey(char *key)
+        {
+            if (topics && topics->type == aJson_Object)
+                {
+                 aJsonObject *valObj = aJson.getObjectItem(topics, key);
+                 if (valObj->type == aJson_String) return valObj->valuestring;
+
+                }
+             if (suffix && (suffix<suffixNum) && !strcmp(key,"sfx"))  
+                            {
+                            //debugSerial<<F("Template: Suffix=")<<suffix<<endl;    
+                            buffer[0]='/';       
+                            strncpy_P(buffer+1,suffix_P[suffix],sizeof(buffer)-2);    
+                            return buffer;
+                            }
+              
+            return NULL;
+        }
+
+private:
+    char *str;
+    unsigned int pos;
+    char *val;
+    unsigned int valpos;
+    int bucket;
+    short suffix;
+    char buffer[8];
+};
+
+#endif // _TEMPLATE_STREAM_H_

lighthub/textconst.h

@@ -82,17 +82,29 @@ const char on_P[] PROGMEM = "on";
 
 */
 
+#define ON_P commands_P[CMD_ON]
+#define OFF_P commands_P[CMD_OFF]
+#define REST_P commands_P[CMD_RESTORE]
+#define TOGGLE_P commands_P[CMD_TOGGLE]
+#define HALT_P commands_P[CMD_HALT]
+#define XON_P commands_P[CMD_XON]
+#define XOFF_P commands_P[CMD_XOFF]
+#define HEAT_P commands_P[CMD_HEAT]
+#define COOL_P commands_P[CMD_COOL]
+#define AUTO_P commands_P[CMD_AUTO]
+#define FAN_ONLY_P commands_P[CMD_FAN]
+#define DRY_P commands_P[CMD_DRY]
+#define HIGH_P commands_P[CMD_HIGH]
+#define MED_P commands_P[CMD_MED]
+#define LOW_P commands_P[CMD_LOW]
+#define ENABLE_P commands_P[CMD_ENABLE]
+#define DISABLE_P commands_P[CMD_DISABLE]
+#define FREEZE_P commands_P[CMD_FREEZE]
+#define UNFREEZE_P commands_P[CMD_UNFREEZE]
 
+const char ERROR_P[]  PROGMEM = "ERR";
 
 //Commands
-
-const char ON_P[]   PROGMEM = "ON";
-const char OFF_P[]  PROGMEM = "OFF";
-const char REST_P[] PROGMEM = "REST";
-const char TOGGLE_P[] PROGMEM = "TOGGLE";
-const char HALT_P[] PROGMEM = "HALT";
-const char XON_P[]  PROGMEM = "XON";
-const char XOFF_P[] PROGMEM = "XOFF";
 /*
 const char INCREASE_P[] PROGMEM = "INCREASE";
 const char DECREASE_P[] PROGMEM = "DECREASE";
@@ -102,6 +114,15 @@ const char FALSE_P[] PROGMEM = "FALSE";
 const char ENABLED_P[]  PROGMEM = "ENABLED";
 const char DISABLED_P[] PROGMEM = "DISABLED";
 */
+
+/*
+const char ON_P[]   PROGMEM = "ON";
+const char OFF_P[]  PROGMEM = "OFF";
+const char REST_P[] PROGMEM = "REST";
+const char TOGGLE_P[] PROGMEM = "TOGGLE";
+const char HALT_P[] PROGMEM = "HALT";
+const char XON_P[]  PROGMEM = "XON";
+const char XOFF_P[] PROGMEM = "XOFF";
 const char HEAT_P[] PROGMEM = "HEAT";
 const char COOL_P[] PROGMEM = "COOL";
 const static char AUTO_P[] PROGMEM = "AUTO";
@@ -112,13 +133,15 @@ const char DRY_P[]  PROGMEM = "DRY";
 const char HIGH_P[] PROGMEM = "HIGH";
 const char MED_P[]  PROGMEM = "MEDIUM";
 const char LOW_P[]  PROGMEM = "LOW";
-const char ERROR_P[]  PROGMEM = "ERR";
+
 const char ENABLE_P[]  PROGMEM = "ENABLE";
 const char DISABLE_P[] PROGMEM = "DISABLE";
 const char FREEZE_P[]  PROGMEM = "FREEZE";
 const char UNFREEZE_P[] PROGMEM = "UNFREEZE";
+*/
 
 // SubTopics
+/*
 const char SET_P[]  PROGMEM = "set";
 const char CMD_P[]  PROGMEM = "cmd";
 const char MODE_P[] PROGMEM = "mode";
@@ -132,7 +155,7 @@ const char VAL_P[]   PROGMEM = "val";
 const char DEL_P[]   PROGMEM = "del";
 const char _RAW_P[]   PROGMEM = "raw";
 const char CTRL_P[]  PROGMEM = "ctrl";
-
+*/
 /*
 const char RPM_P[]   PROGMEM = "rpm";
 const char STATE_P[] PROGMEM = "state";

lighthub/utils.cpp

@@ -27,6 +27,7 @@ e-mail    anklimov@gmail.com
 #include "item.h"
 #include <PubSubClient.h>
 #include <HardwareSerial.h>
+#include "templateStr.h"
 
 #ifdef CRYPT
 #include "SHA256.h"
@@ -690,8 +691,22 @@ switch (cmdType)
     //else    itemCommand = _itemCmd.toString(Buffer,sizeof(Buffer));
 
     char * emitCommand;
+    short suffix=0;
+   // aJsonObject * dict=NULL; 
+
     if(ecmd && ecmd->type == aJson_String) emitCommand = ecmd->valuestring;
-    else    emitCommand = _itemCmd.toString(Buffer,sizeof(Buffer));
+    else    
+            {
+            emitCommand = _itemCmd.toString(Buffer,sizeof(Buffer));
+    //        dict = aJson.createObject();
+    //        aJson.addStringToObject(dict, "sfx", )
+            suffix=_itemCmd.getSuffix();
+            if (!suffix)
+            {
+             if (_itemCmd.isCommand()) suffix=S_CMD;
+                else if (_itemCmd.isValue()) suffix = S_SET; 
+            }
+            }
 
     //debugSerial << F("IN:") << (pin) << F(" : ") <<endl;
     if (item) {
@@ -705,7 +720,12 @@ switch (cmdType)
 
 
     if (emit && emitCommand && emit->type == aJson_String) {
-    debugSerial << F("Emit: ")<<emit->valuestring<< F(" -> ")<<emitCommand<<endl;    
+
+    templateStream ts(emit->valuestring,suffix);
+    char addrstr[MQTT_TOPIC_LENGTH];
+    //ts.setTimeout(0);
+    addrstr[ts.readBytesUntil('\0',addrstr,sizeof(addrstr))]='\0';
+    debugSerial << F("Emit: <")<<emit->valuestring<<"> "<<addrstr<< F(" -> ")<<emitCommand<<endl;    
     /*
     TODO implement
     #ifdef WITH_DOMOTICZ
@@ -720,8 +740,8 @@ switch (cmdType)
     */
 
 
-    char addrstr[MQTT_TOPIC_LENGTH];
+   
-    strncpy(addrstr,emit->valuestring,sizeof(addrstr));
+    //strncpy(addrstr,emit->valuestring,sizeof(addrstr));
     if (mqttClient.connected() && !ethernetIdleCount)
     {
     if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestring);
@@ -880,7 +900,7 @@ bool checkToken(char * token, char * data)
 
 
 bool i2cReset(){
-debugSerial.println("I2C Reset");
+debugSerial.println(F("I2C Reset"));
 
 Wire.endTransmission(true);
 #if  !defined(ARDUINO_ARCH_ESP8266)
@@ -896,19 +916,22 @@ pinMode(SDA,INPUT);
         pulse=!pulse;
         delay(10);//10us мкс
   }
+
+delay(20);
 Wire.begin();
 
 #ifdef DS2482_100_I2C_TO_1W_BRIDGE
 if (oneWire && oneWire->checkPresence())
 {        
         oneWire->deviceReset();
+        debugSerial.println(F("1WT: DS2482 present, reset"));  
 #ifndef APU_OFF
         oneWire->setActivePullup();
 #endif
         if (oneWire->wireReset())
-            debugSerial.println(F("\tReset done"));
+            debugSerial.println(F("1WT: Bus Reset done"));
         else 
-            debugSerial.println(F("\tDS2482 reset error"));   
+            debugSerial.println(F("1WT: Bus reset error"));   
 }
 #endif
 
@@ -916,5 +939,8 @@ if (oneWire && oneWire->checkPresence())
 return true;
 }
 
+
+
+
 #pragma message(VAR_NAME_VALUE(debugSerial))
 #pragma message(VAR_NAME_VALUE(SERIAL_BAUD))