purpleair 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9e42984ee91df25030728bbe8afd7b4181f212a51408625cf20422b10d8bf3
-  data.tar.gz: 1b1ff17dd8ca0ead8b40b910bebbfe9d7954f5966c24217b2c5eacf2416c6d13
+  metadata.gz: 060b300e03f93347681d274759857922d8455b0656163c7d41cea67451558323
+  data.tar.gz: 79f6d753281474e92b9089b0998a0244e07032d31073bfc6ecc58731715a2bf1
 SHA512:
-  metadata.gz: d8730b6073ee00126cf5f93c87d62a6e90f009e5762201a0d22ffc5f71189b52ea001d54d488ee1320cedd76763808d040e7ef5d8d2bc4d598f367eb466f0d67
-  data.tar.gz: 9614f9b96468cf4698b415c4de8a1bf3946fc998f3001aaabce1c1469dca58d7608e5fa0371bd175b996d6e5cc0c0f82ef5b9ce7fd0d8cb6a4935a6f3e4f2d55
+  metadata.gz: 91296a0d880f6493ec018ae1d13d067be69a599a70079b11074a21a14e4530233f501d053ce30e7315e8c78a97651cb3664bf32d4b50deb227caff5987e77e08
+  data.tar.gz: 19ba9b97408f248fe315d5f7ae96b2820f4ec4d286f92c0c3f9bfe20babce4ccff258c99ffbd194fcf0639b450d015a46b398de7c973971b0c3808d8a594b6e2

data/exe/purpleair_mqtt_bridge

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require "faraday_middleware"
-require "homie-mqtt"
+require "mqtt-homeassistant"
 require "optparse"
 
 refresh = 30.0
@@ -36,13 +36,53 @@ end
 data = purple.get.body
 
 homie = MQTT::Homie::Device.new(MQTT::Homie.escape_id(data["Geo"]), "PurpleAir Sensor", mqtt: ARGV[1])
+homie.home_assistant_device = {
+  manufacturer: "PurpleAir, Inc.",
+  sw_version: data["version"],
+  model: data["hardwarediscovered"]
+}
+
 device = homie.node("device", "Device", "Device")
-device.property("temperature", "Current Temperature", :integer, data["current_temp_f"], unit: "°F")
-device.property("relative-humidity", "Current Relative Humidity", :integer, data["current_humidity"],
-                format: 0..100, unit: "%")
-device.property("dewpoint", "Current Dew Point", :integer, data["current_dewpoint_f"], unit: "°F")
-device.property("pressure", "Barometric Pressure", :integer, data["pressure"], unit: "hPA")
-device.property("rssi", "WiFi RSSI", :integer, data["rssi"], unit: "dB")
+device.property("temperature",
+                "Current Temperature",
+                :integer,
+                data["current_temp_f"],
+                unit: "°F",
+                hass: { sensor: { device_class: :temperature,
+                                  state_class: :measurement } })
+device.property("relative-humidity",
+                "Current Relative Humidity",
+                :integer,
+                data["current_humidity"],
+                format: 0..100,
+                unit: "%",
+                hass: { sensor: { device_class: :humidity,
+                                  state_class: :measurement } })
+device.property("dewpoint",
+                "Current Dew Point",
+                :integer,
+                data["current_dewpoint_f"],
+                unit: "°F",
+                hass: { sensor: { device_class: :temperature,
+                                  icon: "mdi:water-opacity",
+                                  state_class: :measurement } })
+device.property("pressure",
+                "Barometric Pressure",
+                :integer,
+                data["pressure"],
+                unit: "hPA",
+                hass: { sensor: { device_class: :pressure,
+                                  state_class: :measurement } })
+device.property("rssi",
+                "WiFi RSSI",
+                :integer,
+                data["rssi"],
+                unit: "dB",
+                hass: { sensor: { device_class: :signal_strength,
+                                  state_class: :measurement,
+                                  entity_category: :diagnostic } })
+
+CHANNELS = %w[a b].freeze
 
 FIELDS = %w[
   pm2.5_aqi
@@ -66,19 +106,72 @@ def get_fields(data, channel_id)
   result
 end
 
-%w[a b].each do |channel_id|
+CHANNELS.each do |channel_id|
   fields = get_fields(data, channel_id)
   channel = homie.node(channel_id, "Sensor Channel #{channel_id.upcase}", "Air Sensor")
-  channel.property("pm2-5-aqi", "PM2.5 AQI", :integer, fields["pm2.5_aqi"])
-  channel.property("pm1-0-atm", "PM1.0", :float, fields["pm1_0_atm"], unit: "µg/m3")
-  channel.property("pm2-5-atm", "PM2.5", :float, fields["pm2_5_atm"], unit: "µg/m3")
-  channel.property("pm10-0-atm", "PM10", :float, fields["pm10_0_atm"], unit: "µg/m3")
-  channel.property("p-0-3-um", "# particles >= 0.3µm per decileter", :float, fields["p_0_3_um"])
-  channel.property("p-0-5-um", "# particles >= 0.5µm per decileter", :float, fields["p_0_5_um"])
-  channel.property("p-1-0-um", "# particles >= 1.0µm per decileter", :float, fields["p_1_0_um"])
-  channel.property("p-2-5-um", "# particles >= 2.5µm per decileter", :float, fields["p_2_5_um"])
-  channel.property("p-5-0-um", "# particles >= 5.0µm per decileter", :float, fields["p_5_0_um"])
-  channel.property("p-10-0-um", "# particles >= 10µm per decileter", :float, fields["p_10_0_um"])
+  channel.property("pm2-5-aqi",
+                   "PM2.5 AQI",
+                   :integer,
+                   fields["pm2.5_aqi"],
+                   hass: { sensor: { device_class: :aqi,
+                                     state_class: :measurement } })
+  channel.property("pm1-0-atm",
+                   "PM1.0",
+                   :float,
+                   fields["pm1_0_atm"],
+                   unit: "µg/m3",
+                   hass: { sensor: { device_class: :pm1,
+                                     state_class: :measurement } })
+  channel.property("pm2-5-atm",
+                   "PM2.5",
+                   :float,
+                   fields["pm2_5_atm"],
+                   unit: "µg/m3",
+                   hass: { sensor: { device_class: :pm25,
+                                     state_class: :measurement } })
+  channel.property("pm10-0-atm",
+                   "PM10",
+                   :float,
+                   fields["pm10_0_atm"],
+                   unit: "µg/m3",
+                   hass: { sensor: { device_class: :pm10,
+                                     state_class: :measurement } })
+  channel.property("p-0-3-um",
+                   "# particles >= 0.3µm per decileter",
+                   :float,
+                   fields["p_0_3_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
+  channel.property("p-0-5-um",
+                   "# particles >= 0.5µm per decileter",
+                   :float,
+                   fields["p_0_5_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
+  channel.property("p-1-0-um",
+                   "# particles >= 1.0µm per decileter",
+                   :float,
+                   fields["p_1_0_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
+  channel.property("p-2-5-um",
+                   "# particles >= 2.5µm per decileter",
+                   :float,
+                   fields["p_2_5_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
+  channel.property("p-5-0-um",
+                   "# particles >= 5.0µm per decileter",
+                   :float,
+                   fields["p_5_0_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
+  channel.property("p-10-0-um",
+                   "# particles >= 10µm per decileter",
+                   :float,
+                   fields["p_10_0_um"],
+                   hass: { sensor: { state_class: :measurement,
+                                     entity_category: :diagnostic } })
 end
 
 homie.publish
@@ -91,7 +184,7 @@ loop do
   device["pressure"].value = data["pressure"]
   device["rssi"].value = data["rssi"]
 
-  %w[a b].each do |channel_id|
+  CHANNELS.each do |channel_id|
     fields = get_fields(data, channel_id)
     channel = homie[channel_id]
     FIELDS.each do |field|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purpleair
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: homie-mqtt
+  name: mqtt-homeassistant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +133,8 @@ files:
 homepage: https://github.com/ccutrer/ruby-purpleair
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: