loupedeck-commander 1.2.10 → 1.2.12

package/common/ApplicationConfig.mjs

@@ -256,7 +256,7 @@ class ParametersConfig {
 
 class DefaultConfig {
   default = {
-    "filter": "released",
+//    "filter": "released",
     "color":  "#111111"
   }
 

package/common/BaseLoupeDeckHandler.mjs

@@ -12,6 +12,7 @@ export class BaseLoupeDeckHandler {
   knobs = {}
   screenUpdate = {}
   stopping = false
+  IntervalID = undefined
 
   constructor (config) {
     console.log(`INIT with config ${config}`)
@@ -83,10 +84,14 @@ export class BaseLoupeDeckHandler {
     try {
       console.info(`Closing Device`)
       this.stopping = true
-      if (this.device){
+
+      clearInterval(this.IntervalID)
+
+/*      if (this.device){
         this.device.vibrate(HAPTIC.DESCEND_MED)
         await new Promise(resolve => setTimeout(resolve, 250))
       }
+*/
       if (this.device){
         this.device.setBrightness(0)
         await new Promise(resolve => setTimeout(resolve, 250))
@@ -97,11 +102,14 @@ export class BaseLoupeDeckHandler {
         await new Promise(resolve => setTimeout(resolve, 2000))
         console.info(`Device Closed`)      
       }
-
       console.info(`Stopping interfaces`)
       await StopInterfaces()
-      await new Promise(resolve => setTimeout(resolve, 500))
-    } catch (e) {}
+      await new Promise(resolve => setTimeout(resolve, 1000))
+
+    } catch (e) {
+      console.info(`e`,e)      
+
+    }
 
     process.exit()
 
@@ -163,7 +171,7 @@ export class BaseLoupeDeckHandler {
     this.screenUpdate["center"] = true
     this.screenUpdate["left"] = true
     this.screenUpdate["right"] = true
-    await this.updateScreens()
+    //await this.updateScreens()
         
     await this.buttons.draw(this.device)
     // Initialize the Interfaces
@@ -207,7 +215,14 @@ export class BaseLoupeDeckHandler {
     this.screenUpdate["center"] = true
     this.screenUpdate["left"] = true
     this.screenUpdate["right"] = true
-    await this.updateScreens()
+    //await this.updateScreens()
+
+    this.IntervalID = setInterval(() => {
+      // runs every 500ms seconds
+      this.screenUpdate["center"] = true
+      self.updateScreens()
+    }, 500);
+    
 
     console.info('✅ Done initializing')
   }
@@ -219,6 +234,7 @@ export class BaseLoupeDeckHandler {
     const keys = Object.keys(this.screenUpdate)
     for (let i = 0; i < keys.length; i++) {
       const screen = keys[i]
+      //ok = await this.screens.center.updateAllButtons()
       await this.screens[screen].draw(this.device)
     }
     this.screenUpdate = {}
@@ -281,7 +297,7 @@ export class BaseLoupeDeckHandler {
       if (this.screens[screen])
         ok = await this.screens[screen].pressed(id)
     }
-    await this.updateScreens()
+    //await this.updateScreens()
     return ok
   }
 
@@ -322,7 +338,7 @@ export class BaseLoupeDeckHandler {
       if (this.screens[elem.screen])
         ok = await this.screens[elem.screen].released(id)
     }
-    await this.updateScreens()
+    //await this.updateScreens()
     return ok
   }
 
@@ -338,7 +354,7 @@ export class BaseLoupeDeckHandler {
     ok = await this.screens.center.changed(buttonID,nodeid,val)
     ok = await this.knobs.changed(buttonID,nodeid,val)
     
-    await this.updateScreens()
+    //await this.updateScreens()
     return ok
   }
 

package/common/touchbuttons.mjs

@@ -150,6 +150,7 @@ export class ButtonField {
         let key = this.#keys[i]
         if (!isNaN(key)) { key = parseInt(key, 10) }
         if (id === key) { continue }
+//        console.log("group",this.#buttons[key].group,this.#buttons[id].group)
         if (this.#buttons[key].group === this.#buttons[id].group) {
           this.#buttons[key].setState(0)
         }
@@ -199,13 +200,12 @@ export class Button {
 
   #type = ButtonType.TOGGLE
 
-  #min = 0
-  #max = 100
   #value = 50
   #name = undefined
   #nodeid = ""
 
   #index = 0
+  #enforcedIndex = -1
   #event
   #keys
   #states
@@ -228,8 +228,6 @@ export class Button {
   timeStampReleased
   // Time actually hold the button in ms
   timeHold
-  // Minimum ammount of time in ms to press a button:
-  minPressed = 25
   key = -1
 
   constructor (id, width, height, data,key,profile) {
@@ -239,47 +237,58 @@ export class Button {
     this.height = height
     this.#index = 0
 
+    if (profile === undefined){
+      this.#profile = {}
+      this.#params = {
+        "min" : 0,
+        "max" : 100,
+        "minPressed": 25
+
+      }
+    }else{
+      this.#profile = profile
+      this.#params = profile.parameters
+      if (profile.parameters.min !== undefined)
+        this.#params.min = profile.parameters.min
+      if (profile.parameters.max !== undefined)
+        this.#params.max = profile.parameters.max
+      if (profile.parameters.minPressed !== undefined)
+        this.#params.minPressed = profile.parameters.minPressed
+    }
+
     if (data && data.states) {
       this.#data = data
-
-      this.group = data.group
-      
       this.#states = data.states
       this.#keys = Object.keys(this.#states)
       if (data.type) {
         this.#type = data.type.toUpperCase()
+        console.log("TYPE",this.#type )
       }
 
       if (data.minPressed) {
-        this.minPressed = data.minPressed
+        this.#params.minPressed = data.minPressed
       }
 
       if (data.text) {
         this.text = data.text
       }
     }
-    if (profile === undefined){
-      this.#profile = {}
-      this.#params = {}
-    }else{
-      this.#profile = profile
-      this.#params = profile.parameters
-      if (profile.parameters.min !== undefined)
-        this.#min = profile.parameters.min
-      if (profile.parameters.max !== undefined)
-        this.#max = profile.parameters.max
-    }
     if (this.#states === undefined) {
       this.#states = {}
       this.#keys = []
     }
     if (data.nodeid){
-      this.#nodeid = format(data.nodeid, this.#params)
+      this.#nodeid = format(data.nodeid, this.getParams({}))
     }
     if (data.default) {
       this.#index = this.#keys.indexOf(data.default)
     }
 
+    if (data.group)
+      this.group = format(data.group, this.getParams({}))
+    else  
+      this.group = key
+
   }
 
   setState (index = 0) {
@@ -314,6 +323,8 @@ export class Button {
 
     const elem = this.getCurrentElement()
 
+    //console.log()
+
     if (elem) {
       if (elem.color) {
         ctx.fillStyle = elem.color
@@ -331,7 +342,8 @@ export class Button {
       ctx.font = '20px Verdana'
       ctx.textBaseline = 'top';
       ctx.textAlign = 'left';
-      ctx.fillText(this.text,x+6,y+6)  
+      let dynamicText = format(this.text, this.getParams(elem))
+      ctx.fillText(dynamicText,x+6,y+6)  
     }
   }
 
@@ -376,22 +388,26 @@ export class Button {
   pressed () {
     this.timeStampPressed = Date.now()
 
-    this.#index++
+    if (this.#type != ButtonType.PUSH)
+      this.#index++
     this.updateState(this.#index,"pressed")
+    //if (this.#type == ButtonType.PUSH)
+//      this.#index++
     return true
   }
 
   released () {
-    if (!this.getCurrentElement()) { return false }
+    let elem = this.getCurrentElement()
+    if (!elem) { return false }
     this.timeStampReleased = Date.now()
     this.timeHold = this.timeStampReleased - this.timeStampPressed
 
-    if (this.timeHold < this.minPressed) {
+    let bExecute = true
+    if (this.timeHold < this.#params.minPressed) {
       // Update the State according to the not correct pressed state
-      console.log('Did not hold minimum time of ', this.minPressed, 'only', this.timeHold)
-      this.#index--
+      console.log('Did not hold minimum time of ', this.#params.minPressed, 'only', this.timeHold)
       if (this.#index < 0) { this.#index = this.#keys.length - 1 }
-      return false
+      bExecute = false
     }
 
     // Update the State according to the correctly pressed state
@@ -399,14 +415,20 @@ export class Button {
       case ButtonType.TOGGLE:
         // do nothing
         break
+      case ButtonType.PUSH:
+        // do nothing
+        //break
       default:
         this.#index--
         if (this.#index < 0) { this.#index = this.#keys.length - 1 }
-
         break
     }
 
-    this.updateState(this.#index,"released")
+    if (this.#enforcedIndex>=0)
+      this.#index = this.#enforcedIndex
+    
+    if (bExecute)
+      this.updateState(this.#index,"released")
     
     return true // this.runCommand()
   }
@@ -426,7 +448,7 @@ export class Button {
     if (!this.getCurrentElement()) { return false }
 
     this.#event = "rotated"
-    this.#value = calcDelta(this.#value, delta, this.#min, this.#max)
+    this.#value = calcDelta(this.#value, delta, this.#params.min, this.#params.max)
     return this.runCommand()
   }
 
@@ -437,11 +459,13 @@ export class Button {
     }
 
     this.#index = 0;
+    this.#enforcedIndex = -1;
     for (let i = 0; i < this.#keys.length; i++) {
       let key = this.#keys[i]
       // check if the state-name is same as the value we get from outside:
       if (val == key){
         this.#index = i;
+        this.#enforcedIndex = this.#index;
         break;
       }
 
@@ -493,6 +517,31 @@ export class Button {
     return false
   }
 
+  getParams(elem){
+    // Call an action - include dynamic parameters
+    // and also all attributes of elem + global config
+    const params = {
+      text: this.getCurrentText(),
+      ...this.#profile.parameters,
+      ...this.#params,
+      ...elem,
+      id: this.id,
+      key: this.key,
+      event: this.#event,
+      pressed : this.#event == "pressed",
+      released : this.#event == "released",
+      rotated : this.#event == "rotated",
+      state: this.#keys[this.#index],
+      x: (this.#x %100),
+      y: (this.#y %100)
+    }
+
+    if (params.value === undefined)
+      params.value = this.#value
+
+    return params
+  }
+
   async runCommand () {
     const elem = this.getCurrentElement()
     // Only continue, if we have an element:    
@@ -513,26 +562,7 @@ export class Button {
       return
     }
 
-    // Call an action - include dynamic parameters
-    // and also all attributes of elem + global config
-    const params = {
-      text: this.getCurrentText(),
-      ...this.#profile.parameters,
-      ...elem,
-      id: this.id,
-      key: this.key,
-      event: this.#event,
-      state: this.#keys[this.#index],
-      min: this.#min,
-      max: this.#max,
-      x: (this.#x %100),
-      y: (this.#y %100)
-    }
-
-    if (params.value === undefined)
-      params.value = this.#value
-
-
+    let params = this.getParams(elem)
     let res = ''
     if ('cmd' in elem) {
       if (shellinterface){

package/config.json

@@ -4,6 +4,10 @@
         {
             "name": "profile-1",
             "file": "profile-1.json"
+        },
+        {
+            "name": "profile-2",
+            "file": "profile-2.json"
         }
     ]
 }

package/interfaces/httpif.mjs

@@ -25,7 +25,7 @@ export class HTTPif extends BaseIf {
   }
 
   async stop(){
-    this.LogInfo("HTTPif: Stopping\n")
+    this.LogInfo("HTTPif: Stopped\n")
     
   }
 

package/interfaces/opcuaif.mjs

@@ -39,19 +39,12 @@ export class OPCUAIf extends BaseIf {
     buttons
     constructor() {
         super()
-
-        this.LogInfo(`OPCUAIf Constructed`);
     }
 
     async stop() {
         if (!this.#client)
             return
-
-        this.LogInfo(`OPCUAIf Stopping\n`)
-        await this.#client.closeSession(this.#session, true)
-        await this.#client.disconnect()
-        this.#connected = false
-        this.#client = null
+        await this.Disconnect()
         this.LogInfo(`OPCUAIf Stopped\n`)
     }
 
@@ -223,7 +216,6 @@ export class OPCUAIf extends BaseIf {
 
     async Disconnect() {
         if (this.#client) {
-            this.LogInfo(`OPCUAIf: Disconnect\n`);
             if (this.#session)
                 await this.#client.closeSession(this.#session,true)
             this.#session = undefined
@@ -234,7 +226,6 @@ export class OPCUAIf extends BaseIf {
     async Connect(url) {
         let self = this
         if (this.#client){
-            console.log("Closing session first")
             await this.Disconnect()
         }
         

package/interfaces/shellif.mjs

@@ -16,7 +16,7 @@ export class SHELLif extends BaseIf {
   }
 
   async stop() {
-    this.LogInfo("SHELLif: Stopping")
+    this.LogInfo("SHELLif: Stopped")
   }
 
   Check(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loupedeck-commander",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "A system to ease working with LoupeDeck devices using CMD-line, OPC/UA or HTTP-client interfaces",
   "main": "index.mjs",
   "scripts": {

package/profile-1.json

@@ -24,14 +24,16 @@
                     "off": {
                         "color": "#000099",
                         "image": "icons/home.png",
-                        "cmd": "echo \"{id} {state}\""
+                        "cmd": "echo \"{id} {state} {pressed}\""
                     },
                     "on": {
                         "color": "#00ff00",
                         "image": "icons/home.png",
-                        "cmd": "echo \"{id} {state}\""
+                        "cmd": "echo \"{id} {state} {pressed}\""
                     }
                 },
+                "minPressed" : 10000,
+                "text" : "{released}",
                 "group": ""
             },
             "2": {
@@ -265,6 +267,6 @@
         "endpointurl": "opc.tcp://{hostname}:4840",
         "publishingInterval" : 200,
         "nodeid" : "ns=0;s=nodeID",
-        "verbose": true    
+        "verbose": false 
     }
 }