loupedeck-commander 1.3.0 → 1.3.2

package/README.md

@@ -42,8 +42,8 @@ npm install -s loupedeck-commander
 Create a new configuration file with at least one profile or copy from here,
 and replace the image references with your own icons (90x90px size):
 
-- [config.json](https://gitlab.com/keckxde/loupedeck-commander/-/blob/main/config.json)
-- [profile-1.json](https://gitlab.com/keckxde/loupedeck-commander/-/blob/main/profile-1.json)
+- [config.yaml](https://gitlab.com/keckxde/loupedeck-commander/-/blob/main/config.yaml)
+- [profile-1.yaml](https://gitlab.com/keckxde/loupedeck-commander/-/blob/main/profile-1.yaml)
 
 Create a `index.mjs` file to open up your loupedeck connection:
 
@@ -51,7 +51,7 @@ Create a `index.mjs` file to open up your loupedeck connection:
 # save as index.mjs
 import { BaseLoupeDeckHandler } from 'loupedeck-commander'
 
-const handler = new BaseLoupeDeckHandler('config.json')
+const handler = new BaseLoupeDeckHandler('config.yaml')
 
 /**
  * Stop the handlers when a signal like SIGINT or SIGTERM arrive

package/common/ApplicationConfig.mjs

@@ -1,4 +1,4 @@
-import { readJSONFile, writeJSONFile,syncParams } from './utils.mjs'
+import { readConfigFile as readConfigFile, writeJSONFile,syncParams, writeYAMLFile } from './utils.mjs'
 
 export class ApplicationConfig {
   application = 'undefined'
@@ -7,7 +7,8 @@ export class ApplicationConfig {
 
   loadFromFile (fileName) {
     console.info(`ApplicationConfig: Loading Config File ${fileName}`)
-    const config = readJSONFile(fileName)
+    const config = readConfigFile(fileName)
+
 
     if (!config){
       console.info(`ApplicationConfig: Could not read/parse Config File ${fileName} - breaking here`)
@@ -66,7 +67,7 @@ class Profile {
 
   loadFromFile (fileName) {
     console.info(`ProfileConfig: Loading Profile  File ${fileName}, Index ${this.#index}`)
-    const config = readJSONFile(fileName)
+    const config = readConfigFile(fileName)
     if (config === undefined) {
       console.warn(`ProfileConfig: Cannot parse/load Profile File ${fileName}`)
       return false
@@ -105,7 +106,13 @@ class Profile {
     fileName = fileName.toLowerCase()
 
     console.info(`ProfileConfig: Save To Config File ${fileName}`)
-    writeJSONFile(fileName, this)
+    if(fileName.endsWith('.json')) {
+      writeJSONFile(fileName, this)
+      writeYAMLFile(fileName.replace('.json','.yaml'), this)
+    }else if(fileName.endsWith('.yaml')) {
+      writeYAMLFile(fileName, this)
+      writeJSONFile(fileName.replace('.yaml','.json'), this)
+    }
   }
 }
 

package/common/BaseLoupeDeckHandler.mjs

@@ -219,7 +219,7 @@ export class BaseLoupeDeckHandler {
     const self = this
 
     // Register callback on monitored item change:
-    opcuainterface.on("monitored item changed",(buttonID,nodeid,val) => { self.buttonStateChanged(buttonID,nodeid,val) })
+    opcuainterface.on("monitored item changed",(buttonID,attribute,nodeid,val) => { self.buttonStateChanged(buttonID,attribute,nodeid,val) })
     profileEmitter.on("profileChanged",(profileID) => { self.activateProfile(profileID) })
     profileEmitter.on("brightnessChanged",(brightness) => { self.changeBrightness(brightness) })
     profileEmitter.on("vibrate",(pattern) => { self.vibrate(pattern) })
@@ -364,14 +364,14 @@ export class BaseLoupeDeckHandler {
   /**
    * Handler for StateChanged through OPC/UA Interface - only connected with touch-buttons on center field (yet)
    */
-  async buttonStateChanged(buttonID,nodeid,val) {
+  async buttonStateChanged(buttonID,attribute,nodeid,val) {
     let ok = false
     this.screenUpdate["center"] = true
     this.screenUpdate["left"] = true
     this.screenUpdate["right"] = true
 
-    ok = await this.screens.center.changed(buttonID,nodeid,val)
-    ok = await this.knobs.changed(buttonID,nodeid,val)
+    ok = await this.screens.center.buttonStateChanged(buttonID,attribute,nodeid,val)
+    ok = await this.knobs.buttonStateChanged(buttonID,attribute,nodeid,val)
     
     //await this.updateScreens()
     return ok

package/common/ButtonField.mjs

@@ -97,8 +97,13 @@ export class ButtonField {
       for (let i = 0; i < this.#keys.length; i++) {
         let key = this.#keys[i]
         if (!isNaN(key)) { key = parseInt(key, 10) }
+        // Ignore for myself (active element of the group)
         if (id === key) { continue }
-        if (this.#buttons[key].group === this.#buttons[id].group) {
+        let toggleGroup = this.#buttons[id].getGroup()
+        // Ignore empty groups
+        if (toggleGroup === undefined || toggleGroup == "" ) { continue }
+        // Switch all other elements of the same group off:
+        if (this.#buttons[key].getGroup() === toggleGroup) {
           this.#buttons[key].setState(0)
         }
       }
@@ -115,10 +120,12 @@ export class ButtonField {
    * @param {*} nodeid 
    * @param {*} val 
    */
-  async changed(buttonID,nodeid,val){
+  async buttonStateChanged(changedButtonID,attribute,nodeid,val){
+    // todo: filter for buttonID
     for (let i = 0; i < this.#keys.length; i++) {
-      let bID = this.#keys[i]
-      await this.#buttons[bID].changed(i,nodeid,val)
+      let buttonID = this.#keys[i]
+      if (changedButtonID == buttonID)
+        await this.#buttons[buttonID].buttonStateChanged(i,attribute,nodeid,val)
     } 
   }