From 403175c911c7a03e7faace8d80e160a44773a16a Mon Sep 17 00:00:00 2001 From: Alexander Cato <52341592+alexander-cato@users.noreply.github.com> Date: Sat, 5 Aug 2023 22:22:25 -0400 Subject: [PATCH] Added current state sensor --- main.js | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/main.js b/main.js index 9adf1ba..08207f4 100644 --- a/main.js +++ b/main.js @@ -1,11 +1,9 @@ var server = "mqtt.home"; var hatopic = "homeassistant"; var flictopic = "flic"; - -var buttonManager = require("buttons"); - var mqtt = require("./mqtt").create(server); +var buttonManager = require("buttons"); var myButtons = {}; //Dictionary of Button objects //This runs when a button is added via Flic's interface @@ -86,7 +84,7 @@ buttonManager.on("buttonSingleOrDoubleClickOrHold", function(obj) { var clickType = obj.isSingleClick ? "click" : obj.isDoubleClick ? "double_click" : "hold"; var sn = button.serialNumber; - + if (!myButtons[button.bdaddr]) { console.log("**** Found an unregistered button. It must be new! ***") register_button(button); @@ -106,6 +104,25 @@ buttonManager.on("buttonSingleOrDoubleClickOrHold", function(obj) { console.log(btntopic+"/battery: \t"+button.batteryStatus); }); +buttonManager.on("buttonUp", function(obj) { + var button = buttonManager.getButton(obj.bdaddr); + console.log("\nButton Released! " + button.serialNumber + " " + button.name); + publishButtonState(button, "released"); +}); + +buttonManager.on("buttonDown", function(obj) { + var button = buttonManager.getButton(obj.bdaddr); + console.log("\nButton Pressed! " + button.serialNumber + " " + button.name); + publishButtonState(button, "pressed"); +}); + +function publishButtonState(button, state) { + var sn = button.serialNumber; + var statetopic = flictopic + "/" + sn + "/state"; + mqtt.publish(statetopic, state); + console.log(statetopic + ": \t" + state); +} + function register_button(button) { //Register one button //This sets up the MQTT Discovery topics to publish the Flic button @@ -137,7 +154,7 @@ function register_button(button) { }; //Setup config and destination for button press - obj.name = button.name + " Flic Button"; + obj.name = button.name + " Button Action"; obj.state_topic = buttontopic + "/action"; obj.unique_id = "Flic_" + button.serialNumber + "_action"; @@ -147,8 +164,19 @@ function register_button(button) { retain: true }); + // Setup config and destination for button state + obj.name = button.name + " Button State"; + obj.state_topic = buttontopic + "/state"; + obj.unique_id = "Flic_" + button.serialNumber + "_state"; + + payload = JSON.stringify(obj, null, 4); + console.log(configtopic + "/state/config:\t" + payload); + mqtt.publish(configtopic + "/state/config", payload, { + retain: true + }); + //Setup config and destination for battery level report - obj.name = button.name + " Flic Button Battery Level"; + obj.name = button.name + " Battery Level"; obj.state_topic = buttontopic + "/battery"; obj.unique_id = "Flic_" + button.serialNumber + "_battery"; obj.device_class = "battery";