Motor driver with feedback input (Airflow regulator Dospel)

items pulling reworked

lighthub/abstractch.h

@@ -8,7 +8,7 @@ class abstractCh {
 public:
     abstractCh(){};
     virtual ~abstractCh(){};
-    virtual int Poll() = 0;
+    virtual int Poll(short cause) = 0;
     virtual int Setup() =0;        //Should initialize hardware and reserve resources
     virtual int Anounce () {return 0;};
     virtual int Stop() {return 0;};         //Should free resources

lighthub/inputs.cpp

@@ -167,10 +167,10 @@ switch (cause)  {
     {
     #ifndef CSSHDC_DISABLE
          case IN_CCS811:
-         _ccs811.Poll();
+         _ccs811.Poll(POLLING_SLOW);
          break;
          case IN_HDC1080:
-         _hdc1080.Poll();
+         _hdc1080.Poll(POLLING_SLOW);
          break;
     #endif
     #ifndef DHT_DISABLE

lighthub/item.cpp

@@ -40,6 +40,7 @@ e-mail    anklimov@gmail.com
 #include <PubSubClient.h>
 #include "modules/out_spiled.h"
 #include "modules/out_ac.h"
+#include "modules/out_motor.h"
 
 short modbusBusy = 0;
 extern aJsonObject *pollingItem;
@@ -122,7 +123,7 @@ void Item::Parse() {
         itemType = aJson.getArrayItem(itemArr, I_TYPE)->valueint;
         itemArg = aJson.getArrayItem(itemArr, I_ARG);
         itemVal = aJson.getArrayItem(itemArr, I_VAL);
-
+        itemExt = aJson.getArrayItem(itemArr, I_EXT);
         switch (itemType)
         {
 #ifndef   SPILED_DISABLE
@@ -138,6 +139,13 @@ void Item::Parse() {
 //          debugSerial<<F("AC driver created")<<endl;
           break;
 #endif
+
+#ifndef   MOTOR_DISABLE
+          case CH_MOTOR:
+          driver = new out_Motor (this);
+//          debugSerial<<F("AC driver created")<<endl;
+          break;
+#endif
           default: ;
         }
 //        debugSerial << F(" Item:") << itemArr->name << F(" T:") << itemType << F(" =") << getArg() << endl;
@@ -297,6 +305,32 @@ void Item::setVal(long int par)  // Only store if VAL is int (autogenerated or c
 }
 
 
+long int Item::getExt() //Return Val if val is int or first elem of Value array
+{
+    if (!itemExt) return 0;//-1;
+    if (itemExt->type == aJson_Int) return itemExt->valueint;
+    else if (itemExt->type == aJson_Array) {
+        aJsonObject *t = aJson.getArrayItem(itemExt, 0);
+        if (t) return t->valueint;
+        else return 0;//-3;
+    } else return 0;//-2;
+}
+
+void Item::setExt(long int par)  // Only store if VAL is int (autogenerated or config-defined)
+{
+    if (!itemExt)
+    {
+    for (int i = aJson.getArraySize(itemArr); i <= 4; i++)
+        aJson.addItemToArray(itemArr, aJson.createItem(0));
+    itemExt = aJson.getArrayItem(itemArr, I_EXT);
+      };
+
+    if(itemExt->type != aJson_Int) return;
+    itemExt->valueint = par;
+    debugSerial<<F("Stored EXT:")<<par<<endl;
+}
+
+
 boolean Item::isValid() {
     return (itemArr && (itemArr->type == aJson_Array));
 }
@@ -561,7 +595,7 @@ int Item::Ctrl(short cmd, short n, int *Parameters, boolean send, int suffixCode
 */
                 default:
                 res = driver->Ctrl(cmd, n, Parameters, send, suffixCode, subItem);
-                setCmd(cmd);
+                if (cmd) setCmd(cmd);
               }
               return res;
             }
@@ -1475,13 +1509,11 @@ int Item::checkModbusDimmer(int data) {
     } //if data changed
 }
 
-int Item::Poll() {
+int Item::Poll(short cause) {
 
-    if (driver && driver->Status())
-                        {
-                        driver->Poll();
-                        return INTERVAL_POLLING; //TODO refactoring
-                        }
+switch (cause)
+{
+  case POLLING_SLOW:
     // Legacy polling
     switch (itemType) {
         case CH_MODBUS:
@@ -1504,12 +1536,20 @@ int Item::Poll() {
              default:
             sendDelayedStatus();
     }
+  }
+
+  if (driver && driver->Status())
+                      {
+                      return driver->Poll(cause);
+                      }
+
     return INTERVAL_POLLING;
 }
 
 void Item::sendDelayedStatus()
-{
-      if (getFlag(SEND_COMMAND | SEND_PARAMETERS))
+{ long int flags = getFlag(SEND_COMMAND | SEND_PARAMETERS);
+  debugSerial<<flags<<F(" Delayed Status ")<<itemArr->name<<endl;
+      if (flags)
       {
       SendStatus(SEND_COMMAND | SEND_PARAMETERS);
       clearFlag(SEND_COMMAND | SEND_PARAMETERS);

lighthub/item.h

@@ -21,6 +21,10 @@ e-mail    anklimov@gmail.com
 #include "options.h"
 #include "abstractout.h"
 
+#define POLLING_SLOW 1
+#define POLLING_FAST 2
+#define POLLING_INT  3
+
 #define S_NOTFOUND  0
 #define S_SETnCMD 0
 #define S_CMD 1
@@ -51,6 +55,12 @@ e-mail    anklimov@gmail.com
 #define CH_VC      9  //Vacom modbus motor regulator
 #define CH_AC 10  //AC Haier
 #define CH_SPILED 11
+#define CH_MOTOR  12
+//#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 CMD_NUM 0
@@ -79,14 +89,14 @@ e-mail    anklimov@gmail.com
 #define CMD_LOW 0x12
 //#define CMD_CURTEMP 0xf
 #define CMD_MASK 0xff
-#define FLAG_MASK 0x0f00
+#define FLAG_MASK 0xff00
 
 
 #define SEND_COMMAND 0x100
 #define SEND_PARAMETERS 0x200
 #define SEND_RETRY 0x400
 #define SEND_DEFFERED 0x800
-
+#define ACTION_NEEDED 0x1000
 
 //#define CMD_REPORT 32
 
@@ -148,7 +158,7 @@ typedef union
 class Item
 {
   public:
-  aJsonObject *itemArr, *itemArg,*itemVal;
+  aJsonObject *itemArr, *itemArg,*itemVal,*itemExt;
   uint8_t itemType;
   abstractOut * driver;
 
@@ -165,6 +175,8 @@ class Item
   //int getVal(short n); //From VAL array. Negative if no array
   long int getVal(); //From int val OR array
   uint8_t getCmd();
+  long int getExt(); //From int val OR array
+  void setExt(long int par);
   void setCmd(uint8_t cmdValue);
   short getFlag   (short flag=FLAG_MASK);
   void setFlag   (short flag);
@@ -175,7 +187,7 @@ class Item
   inline int On (){return Ctrl(CMD_ON);};
   inline int Off(){return Ctrl(CMD_OFF);};
   inline int Toggle(){return Ctrl(CMD_TOGGLE);};
-  int Poll();
+  int Poll(short cause);
   int SendStatus(int sendFlags);
   int isActive();
   protected:

lighthub/lighthub.ino.cpp

@@ -1,17 +0,0 @@
-# 1 "/var/folders/kt/8psth65x03v6tw_phdhbj12r0000gn/T/tmpwztWO8"
-#include <Arduino.h>
-# 1 "/Users/andrey/Documents/Arduino/lighthub/lighthub/lighthub.ino"
-#include "main.h"
-void setup();
-void loop();
-#line 2 "/Users/andrey/Documents/Arduino/lighthub/lighthub/lighthub.ino"
-void setup(){
-
-            setup_main();
-
-
-}
-void loop(){
-
-      loop_main();
-}

lighthub/main.cpp

@@ -1746,16 +1746,34 @@ void inputSetup(void) {
         }
 }
 
-//#ifndef MODBUS_DISABLE
+
 void pollingLoop(void) {
+// FAST POLLINT - as often AS possible every item
+if (items) {
+    aJsonObject * item = items->child;
+    while (items && item)
+        if (item->type == aJson_Array && aJson.getArraySize(item)>1) {
+            Item it(item);
+            if (it.isValid()) {
+              it.Poll(POLLING_FAST);
+            } //isValid
+            item = item->next;
+        }  //if
+}
+
+// SLOW POLLING
     boolean done = false;
     if (lanStatus == RETAINING_COLLECTING) return;
     if (millis() > nextPollingCheck) {
         while (pollingItem && !done) {
             if (pollingItem->type == aJson_Array) {
                 Item it(pollingItem);
-                nextPollingCheck = millis() + it.Poll();    //INTERVAL_CHECK_MODBUS;
-                done = true;
+                uint32_t ret = it.Poll(POLLING_SLOW);
+                if (ret)
+                {
+                  nextPollingCheck = millis() +  ret;  //INTERVAL_CHECK_MODBUS;
+                  done = true;
+                }
             }//if
             pollingItem = pollingItem->next;
             if (!pollingItem) {
@@ -1765,7 +1783,6 @@ void pollingLoop(void) {
         } //while
     }//if
 }
-//#endif
 
 bool isThermostatWithMinArraySize(aJsonObject *item, int minimalArraySize) {
     return (item->type == aJson_Array) && (aJson.getArrayItem(item, I_TYPE)->valueint == CH_THERMO) &&

lighthub/modules/in_ccs811_hdc1080.cpp

@@ -2,6 +2,7 @@
 #include "Arduino.h"
 #include "options.h"
 #include "Streaming.h"
+#include "item.h"
 
 #if defined(M5STACK)
 #include <M5Stack.h>
@@ -79,10 +80,11 @@ SCL_HIGH();
 #endif
 }
 
-int in_hdc1080::Poll()
+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;}
 Serial.print("HDC Status=");
 Serial.println(reg=hdc1080.readRegister().rawData,HEX);
@@ -115,10 +117,10 @@ else //ESP I2C glitch
     Serial.println("I2C Reset");
     i2cReset();
   }
-return 1;
+return INTERVAL_POLLING;
 }
 
-int in_ccs811::Poll()
+int in_ccs811::Poll(short cause)
 {
   if (!CCS811ready) {debugSerial<<F("ccs811 not initialized")<<endl; return 0;}
   #ifdef WAK_PIN

lighthub/modules/in_ccs811_hdc1080.h

@@ -41,7 +41,7 @@ public:
     //uint16_t ccs811Baseline;
     in_ccs811(Input * _in):abstractIn(_in){};
     int Setup() override;
-    int Poll() override;
+    int Poll(short cause) override;
 
 protected:
    void printDriverError( CCS811Core::status errorCode );
@@ -53,7 +53,7 @@ public:
     //ClosedCube_HDC1080 hdc1080;
     in_hdc1080(Input * _in):abstractIn(_in){};
     int Setup() override;
-    int Poll() override;
+    int Poll(short cause) override;
 
 protected:
     void printSerialNumber();

lighthub/modules/out_ac.cpp

@@ -233,8 +233,10 @@ int out_AC::isActive()
 return (power & 1);
 }
 
-int out_AC::Poll()
+int out_AC::Poll(short cause)
 {
+if (cause!=POLLING_SLOW) return 0;
+
 long now = millis();
   if (now - prevPolling > INTERVAL_AC_POLLING) {
     prevPolling = now;
@@ -253,7 +255,7 @@ delay(100);
       InsertData(data, 37);
     }
   }
-return 1;
+return INTERVAL_POLLING;
 };
 
 int out_AC::Ctrl(short cmd, short n, int * Parameters, boolean send, int suffixCode, char* subItem)

lighthub/modules/out_ac.h

@@ -25,7 +25,7 @@ public:
 
     out_AC(Item * _item):abstractOut(_item){};
     int Setup() override;
-    int Poll() override;
+    int Poll(short cause) override;
     int Stop() override;
     int Status() override;
     int isActive() override;

lighthub/modules/out_motor.cpp

@@ -0,0 +1,246 @@
+#ifndef MOTOR_DISABLE
+
+#include "modules/out_motor.h"
+#include "Arduino.h"
+#include "options.h"
+#include "Streaming.h"
+
+#include "item.h"
+
+static int driverStatus = CST_UNKNOWN;
+
+void out_Motor::getConfig()
+{
+  pinUp=item->getArg(0);
+  if(pinUp<=0 || pinFeedback>=PINS_COUNT) pinUp=32;
+
+  pinDown=item->getArg(1);
+  if (pinDown<=0 || pinFeedback>=PINS_COUNT) pinDown=33;
+
+  pinFeedback=item->getArg(2);
+  if (pinFeedback<0 || pinFeedback>=PINS_COUNT) pinFeedback=0;
+
+  feedbackOpen=item->getArg(3);
+  if (feedbackOpen<=0 || feedbackOpen>1024) feedbackOpen=0;
+
+  feedbackClosed=item->getArg(4);
+  if (feedbackClosed<0 || feedbackClosed>1024) feedbackClosed=1024;
+
+  maxOnTime=item->getArg(5);
+  if (maxOnTime<=0) maxOnTime=10000;
+  }
+
+
+int  out_Motor::Setup()
+{
+getConfig();
+Serial.println("Motor Init");
+digitalWrite(pinUp,LOW);
+digitalWrite(pinDown,LOW);
+pinMode(pinFeedback, INPUT);
+item->setExt(0);
+item->clearFlag(ACTION_NEEDED);
+driverStatus = CST_INITIALIZED;
+return 1;
+}
+
+int  out_Motor::Stop()
+{
+Serial.println("Motor De-Init");
+digitalWrite(pinUp,LOW);
+digitalWrite(pinDown,LOW);
+item->setExt(0);
+driverStatus = CST_UNKNOWN;
+return 1;
+}
+
+int  out_Motor::Status()
+{
+return driverStatus;
+}
+
+int out_Motor::isActive()
+{
+return item->getVal();
+}
+
+int out_Motor::Poll(short cause)
+{
+int curPos = -1;
+int targetPos = -1;
+int dif;
+if (!item->getFlag(ACTION_NEEDED)) return 0;
+
+uint32_t motorOfftime = item->getExt();
+
+switch (item->getCmd())
+{
+  case CMD_ON:
+  case CMD_XON:
+  targetPos = item->getVal();
+  break;
+
+  case CMD_OFF:
+  case CMD_HALT:
+  targetPos = 0;
+  break;
+}
+
+if (pinFeedback && (g_APinDescription[pinFeedback].ulPinAttribute & PIN_ATTR_ANALOG) == PIN_ATTR_ANALOG)
+{
+curPos=map(analogRead(pinFeedback),feedbackClosed,feedbackOpen,0,100);
+if (curPos<0) curPos=0;
+if (curPos>100) curPos=100;
+}
+
+if (motorOfftime && motorOfftime<millis()) //Time over
+  {dif = 0; debugSerial<<F("Motor timeout")<<endl;}
+else if (curPos>=0)
+  dif=targetPos-curPos;
+else
+  dif=targetPos-50; // Have No feedback
+
+
+
+if (dif<-POS_ERR)
+{
+
+  digitalWrite(pinDown,LOW);
+  if (!item->getExt())item->setExt(millis()+maxOnTime);
+
+  //
+  //PINS_COUNT
+  //PIN_ATTR_ANALOG
+  //  uint32_t attr = g_APinDescription[pinUp].ulPinAttribute;
+  //  if ((attr & PIN_ATTR_PWM) == PIN_ATTR_PWM) ;
+
+if (digitalPinHasPWM(pinUp))
+    {
+      int velocity = map(-dif, 0, 10, 0, 255);
+      if (velocity>255) velocity=255;
+      analogWrite(pinUp,velocity);
+    }
+else
+   {
+     digitalWrite(pinUp,HIGH);
+   }
+}
+else
+
+if (dif>POS_ERR)
+{
+digitalWrite(pinUp,LOW);
+
+if (!item->getExt()) item->setExt(millis()+maxOnTime);
+if (digitalPinHasPWM(pinDown))
+{
+  int velocity = map(dif, 0, 10, 0, 255);
+  if (velocity>255) velocity=255;
+  analogWrite(pinDown,velocity);
+}
+else
+{
+ digitalWrite(pinDown,HIGH);
+}
+
+}
+else //Target zone
+{
+  digitalWrite(pinUp,LOW);
+  digitalWrite(pinDown,LOW);
+  item->setExt(0);
+  item->clearFlag(ACTION_NEEDED);
+
+}
+
+
+return 0;
+};
+
+int out_Motor::getChanType()
+{
+   return CH_PWM;
+}
+
+
+
+int out_Motor::Ctrl(short cmd, short n, int * Parameters, boolean send, int suffixCode, char* subItem)
+{
+int chActive = item->isActive();
+bool toExecute = (chActive>0);
+long st;
+if (cmd>0 && !suffixCode) suffixCode=S_CMD; //if some known command find, but w/o correct suffix - got it
+
+item->setFlag(ACTION_NEEDED);
+
+switch(suffixCode)
+{
+case S_NOTFOUND:
+  // turn on  and set
+toExecute = true;
+debugSerial<<F("Forced execution");
+case S_SET:
+          if (!Parameters || n==0) return 0;
+          item->setVal(st=Parameters[0]); //Store
+          if (toExecute)
+          {
+            if (chActive>0 && !st) item->setCmd(CMD_OFF);
+            if (chActive==0 && st) item->setCmd(CMD_ON);
+            item->SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED);
+            item->setExt(millis()+maxOnTime); //Extend motor time
+          }
+          else    item->SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+
+          return 1;
+          //break;
+
+case S_CMD:
+      item->setCmd(cmd);
+      switch (cmd)
+          {
+          case CMD_ON:
+
+            /*
+            if (chActive>0 && send)
+                               {
+                                 SendStatus(SEND_COMMAND);
+                                 return 1;
+                               }
+            */
+           //retrive stored values
+           st = item->getVal();
+
+
+            if (st && (st<MIN_VOLUME)) st=INIT_VOLUME;
+            item->setVal(st);
+
+            if (st)  //Stored smthng
+            {
+              if (send) item->SendStatus(SEND_COMMAND | SEND_PARAMETERS);
+              debugSerial<<F("Restored: ")<<st<<endl;
+            }
+            else
+            {
+              debugSerial<<st<<F(": No stored values - default\n");
+              // Store
+              st=100;
+              item->setVal(st);
+              if (send) item->SendStatus(SEND_COMMAND | SEND_PARAMETERS );
+            }
+            item->setExt(millis()+maxOnTime); //Extend motor time
+            return 1;
+
+            case CMD_OFF:
+              if (send) item->SendStatus(SEND_COMMAND);
+              item->setExt(millis()+maxOnTime); //Extend motor time
+            return 1;
+
+} //switch cmd
+
+break;
+} //switch suffix
+debugSerial<<F("Unknown cmd")<<endl;
+return 0;
+}
+
+#endif

lighthub/modules/out_motor.h

@@ -0,0 +1,32 @@
+#pragma once
+#include "options.h"
+#ifndef MOTOR_DISABLE
+#include <abstractout.h>
+#include <item.h>
+
+#ifndef POS_ERR
+#define POS_ERR 2
+#endif
+
+class out_Motor : public abstractOut {
+public:
+
+    out_Motor(Item * _item):abstractOut(_item){getConfig();};
+    int Setup() override;
+    int Poll(short cause) override;
+    int Stop() override;
+    int Status() override;
+    int isActive() override;
+    int getChanType() override;
+    int Ctrl(short cmd, short n=0, int * Parameters=NULL, boolean send=true, int suffixCode=0, char* subItem=NULL) override;
+
+    int8_t pinUp;
+    int8_t pinDown;
+    int8_t pinFeedback;
+    int16_t maxOnTime;
+    uint16_t feedbackOpen;
+    uint16_t feedbackClosed;
+protected:
+    void getConfig();
+};
+#endif

lighthub/modules/out_spiled.cpp

@@ -94,9 +94,9 @@ debugSerial<< F(" val:")<<st.v<<endl;
 return st.v;
 }
 
-int out_SPILed::Poll()
+int out_SPILed::Poll(short cause)
 {
-return 1;
+return 0;
 };
 
 int out_SPILed::getChanType()

lighthub/modules/out_spiled.h

@@ -16,7 +16,7 @@ public:
 
     out_SPILed(Item * _item):abstractOut(_item){getConfig();};
     int Setup() override;
-    int Poll() override;
+    int Poll(short cause) override;
     int Stop() override;
     int Status() override;
     int isActive() override;