Revert "Added MQTT button auto discovery for HA" to republish in new …

…branch for tracking This reverts commit 4d181d1.
BigThunderSR · Mar 27, 2024 · b506e4b · b506e4b
1 parent 4d181d1
commit b506e4b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 259 deletions.
diff --git a/src/commands.js b/src/commands.js
@@ -135,7 +135,8 @@ class Commands {
     }
 
     async diagnostics({ diagnosticItem = [
-        Commands.CONSTANTS.DIAGNOSTICS.AMBIENT_AIR_TEMPERATURE,        
+        Commands.CONSTANTS.DIAGNOSTICS.AMBIENT_AIR_TEMPERATURE,
+        Commands.CONSTANTS.DIAGNOSTICS.ENGINE_RPM,
         Commands.CONSTANTS.DIAGNOSTICS.LAST_TRIP_DISTANCE,
         Commands.CONSTANTS.DIAGNOSTICS.ODOMETER,
         Commands.CONSTANTS.DIAGNOSTICS.TIRE_PRESSURE,

diff --git a/src/index.js b/src/index.js
@@ -9,7 +9,6 @@ const MQTT = require('./mqtt');
 const Commands = require('./commands');
 const logger = require('./logger');
 const fs = require('fs');
-//const Buttons = require('./buttons');
 //const CircularJSON = require('circular-json');
 
 
@@ -517,21 +516,6 @@ logger.info('Starting OnStar2MQTT Polling');
             const v = vehicle;
             logger.info('Requesting diagnostics');
             logger.debug(`GetSupported: ${v.getSupported()}`);
-
-            // Get supported commands            
-            logger.info(`GetSupportedCommands: ${v.getSupportedCommands()}`);
-            // Get button configs and payloads
-            const { buttonConfigs, configPayloads } = mqttHA.createButtonConfigPayload(v);
-            // Publish button config and payload for each button
-            buttonConfigs.forEach((buttonConfig, index) => {
-                const configPayload = configPayloads[index];
-                logger.warn(`Button Config Topic: ${JSON.stringify(buttonConfig)}`);
-                logger.debug(`Button Config Payload: ${JSON.stringify(configPayload)}`);
-                // Publish configPayload as the payload to the respective MQTT topic
-                logger.debug(`Publishing Button Config: ${buttonConfig} Payload: ${JSON.stringify(configPayload)}`);
-                client.publish(buttonConfig, JSON.stringify(configPayload), { retain: true });
-            });
-
             const statsRes = await commands.diagnostics({ diagnosticItem: v.getSupported() });
             logger.info('Diagnostic request status', { status: _.get(statsRes, 'status') });
             const stats = _.map(
@@ -575,12 +559,10 @@ logger.info('Starting OnStar2MQTT Polling');
                     client.publish(topic, JSON.stringify(state), { retain: true })
                 );
             }
-
             await Promise.all(publishes);
-
+            //client.publish(pollingStatusTopicState, JSON.stringify({"ok":{"message":"Data Polled Successfully"}}), {retain: false})
             const completionTimestamp = new Date().toISOString();
             logger.debug(`Completion Timestamp: ${completionTimestamp}`);
-            client.publish(pollingStatusTopicState, JSON.stringify({"ok":{"message":"Data Polled Successfully"}}), {retain: false});
             client.publish(pollingStatusTopicState,
                 JSON.stringify({
                     "error": {

diff --git a/src/mqtt.js b/src/mqtt.js
@@ -1,5 +1,4 @@
 const _ = require('lodash');
-//const Buttons = require('./buttons');
 
 /**
  * Supports Home Assistant MQTT Discovery (https://www.home-assistant.io/docs/mqtt/discovery/)
@@ -45,28 +44,6 @@ const _ = require('lodash');
  *      }
  */
 class MQTT {
-    static CONSTANTS = {
-        BUTTONS: {
-            Alert: 'alert',
-            AlertFlash: 'alertFlash',
-            AlertHonk: 'alertHonk',
-            CancelAlert: 'cancelAlert',
-            LockDoor: 'lockDoor',
-            UnlockDoor: 'unlockDoor',
-            LockTrunk: 'lockTrunk',
-            UnlockTrunk: 'unlockTrunk',          
-            Start: 'start',
-            CancelStart: 'cancelStart',       
-            GetLocation: 'getLocation',
-            Diagnostics: 'diagnostics',
-            EngineRPM: 'enginerpm',
-            ChargeOverride: 'chargeOverride',
-            CancelChargeOverride: 'cancelChargeOverride',
-            GetChargingProfile: 'getChargingProfile',
-            SetChargingProfile: 'setChargingProfile',
-        }
-    };
-
     constructor(vehicle, prefix = 'homeassistant', namePrefix) {
         this.prefix = prefix;
         this.vehicle = vehicle;
@@ -137,54 +114,6 @@ class MQTT {
         return `${this.prefix}/device_tracker/${this.instance}/config`;
     }
 
-    //getButtonConfigTopic() {
-    //    return `${this.prefix}/button/${this.instance}/${this.buttonName}/config`;
-    //}
-
-    createButtonConfigPayload(vehicle) {
-        const buttonInstances = [];
-        const buttonConfigs = [];
-        const configPayloads = [];
-
-        for (const buttonName in MQTT.CONSTANTS.BUTTONS) {
-            const buttonConfig = `${this.prefix}/button/${this.instance}/${MQTT.convertName(buttonName)}/config`;
-            const button = {
-                name: buttonName,
-                config: buttonConfig
-            };
-
-            button.vehicle = vehicle;
-            buttonInstances.push(button);
-
-            let unique_id = `${vehicle.vin}_Command_${button.name}`;
-            unique_id = unique_id.replace(/\s+/g, '-').toLowerCase();
-
-            configPayloads.push({
-                "device": {
-                    "identifiers": [vehicle.vin],
-                    "manufacturer": vehicle.make,
-                    "model": vehicle.year + ' ' + vehicle.model,
-                    "name": vehicle.toString()
-                },
-                "availability": {
-                    "topic": this.getAvailabilityTopic(),
-                    "payload_available": 'true',
-                    "payload_not_available": 'false',
-                },
-                "unique_id": unique_id,
-                "name": `Command ${button.name}`,                
-                "command_topic": this.getCommandTopic(),
-                "payload_press": JSON.stringify({ "command": MQTT.CONSTANTS.BUTTONS[button.name] }),
-                "qos": 2,
-                "enabled_by_default": false,
-            });
-
-            buttonConfigs.push(buttonConfig);
-        }
-
-        return { buttonInstances, buttonConfigs, configPayloads };
-    }
-
     /**
      *
      * @param {DiagnosticElement} diag
@@ -260,7 +189,7 @@ class MQTT {
             device: {
                 identifiers: [this.vehicle.vin],
                 manufacturer: this.vehicle.make,
-                model: this.vehicle.year + ' ' + this.vehicle.model,
+                model: this.vehicle.year,
                 name: this.vehicle.toString()
             },
             availability_topic: this.getAvailabilityTopic(),

diff --git a/src/vehicle.js b/src/vehicle.js
@@ -13,8 +13,6 @@ class Vehicle {
         );
         this.supportedDiagnostics = _.get(diagCmd,
             'commandData.supportedDiagnostics.supportedDiagnostic');
-
-        this.supportedCommands = _.get(vehicle, 'commands.command');
     }
 
     isSupported(diag) {
@@ -31,13 +29,6 @@ class Vehicle {
     toString() {
         return `${this.year} ${this.make} ${this.model}`;
     }
-
-    getSupportedCommands(commandList = []) {
-        this.supportedCommands.forEach(command => {
-            commandList.push(command.name);
-        });
-        return commandList;
-    }
 }
 
 module.exports = Vehicle;