Merge 50b331e into 9474aeb

src/relations.js

@@ -491,6 +491,19 @@ MqttSource.prototype.log = async function (scanClassId) {
       return false
     }
   })
+  // TO-DO check how long it has been since last change, if it's been a while, log the previous value before out of deadband was detected.
+  const preDeadbandExitPoints = tags
+    .filter((tag) => {
+      const secondsSinceChange = tag.lastChangeOn - tag.prevChangeOn
+      return secondsSinceChange >= (tag.scanClass.rate / 1000.0) * 3
+    })
+    .map((tag) => {
+      return {
+        id: tag.id,
+        value: tag.prevValue,
+        timestamp: tag.prevChangeOn,
+      }
+    })
   // The following is to collect realtime history of events to be published without isHistorical
   if (tags.length > 0) {
     this.rtHistory = [
@@ -502,6 +515,7 @@ MqttSource.prototype.log = async function (scanClassId) {
           timestamp: getUnixTime(new Date()),
         }
       }),
+      ...preDeadbandExitPoints,
     ]
   }
   // The following is to collect history in the event of a primaryHost going offline

src/tag.js

@@ -68,7 +68,9 @@ class Tag extends Model {
     this._units = result.units
     this._deadband = result.deadband
     this.prevValue = null
+    this.lastChangeOn = getUnixTime(new Date())
     this.prevChangeWithinDeadband = false
+    this.prevChangeOn = getUnixTime(new Date())
   }
   get name() {
     this.checkInit()
@@ -98,20 +100,26 @@ class Tag extends Model {
   }
   async setValue(value, write = true) {
     this.checkInit()
+    const lastValue = this.value
+    const lastChangeOn = this.lastChangeOn
+    if (!this.prevChangeWithinDeadband) {
+      this.prevValue = lastValue
+      this.prevChangeOn = lastChangeOn
+    }
     if (this.source && write) {
       this.source.write(value)
     }
     const result = this.update(this.id, 'value', value, Tag).then((result) => {
       this._value = result
       this.pubsub.publish('tagUpdate', { tagUpdate: this })
     })
+    this.lastChangeOn = getUnixTime(new Date())
     this.prevChangeWithinDeadband =
       this.datatype === 'BOOLEAN'
         ? this.value === this.prevValue
         : Math.abs(this.value - this.prevValue) < this.deadband
     if (!this.prevChangeWithinDeadband) {
       this.prevChangeWithinDeadband = false
-      this.prevValue = this.value
     }
     return result
   }