dji_mqtt_connect 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf7e03c9debc9957d9d8fadc1fa6126377a14574f5f0cdc24009afac5b77bc5
-  data.tar.gz: e86ae21b238e3c0063cd42c584544350ba30b8e60eb8241c43b4d8cedb69aedf
+  metadata.gz: 9dc11cccab3b3a496ba3fabbbc78499f8a614996da46761ddaf2eb9686de35c1
+  data.tar.gz: 512c5d6ce41c476f961e9b797f5cb023b2f69f44dab30637b601bdf9a9595f07
 SHA512:
-  metadata.gz: 5930cd00dbb6d2779af90659fdde1b70e2cf31247a1f31dcc3f6a4301f7663117bf06d061dfc1c1d101100c43ce040003fff5152435ad5b4bf1536cea74035a9
-  data.tar.gz: 4df8067dff28fb839f2e849b426760fa44ce2f7b9bb5f676c85daae15e54f9395030a3f6f047016f6aaa6ee9d328d75176ccc97d072615be1fb0ea6fd3d42b10
+  metadata.gz: 9ba2eed8daee1e0d08d4fd44f33b84429c455425ca7e34a48f3bc9ef70dfd0a7ae87766fc596f977b34a2d8b50fb734c4617f5722d7164a75cf73c7ed6ebc6e6
+  data.tar.gz: 26dcb1c2aed6ef0aaad6cf93aa601860c8bcb40c4344948e20ff3b81f64c5cf7a6f80cc7e8442e42467e6aa7e25d2abe1649b9d7c56c07464f1ac6fb429211bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.14)
+    dji_mqtt_connect (0.1.15)
       activesupport (>= 6.0, <= 8)
       dry-struct (~> 1.6)
       dry-transformer (~> 1.0)

data/lib/dji_mqtt_connect/factories.rb

@@ -190,6 +190,164 @@ module DjiMqttConnect
       )
     end
 
+    # OSD
+
+    def build_thing_product_dock_osd_message_with_sub_device
+      message_data = {
+        network_state: {
+          type: 2,
+          quality: 0,
+          rate: 0.1459999978542328
+        },
+        drone_charge_state: {
+          state: 0,
+          capacity_percent: 0
+        },
+        drone_in_dock: 0,
+        rainfall: 1,
+        wind_speed: 0,
+        environment_temperature: 18.8,
+        temperature: 19.6,
+        humidity: 58,
+        latitude: 0,
+        longitude: 0,
+        height: 0,
+        alternate_land_point: {
+          latitude: "-33.865143",
+          longitude: "151.209900",
+          height: 0,
+          safe_land_height: 30,
+          is_configured: 0
+        },
+        first_power_on: 1631945855969,
+        position_state: {
+          is_calibration: 1,
+          is_fixed: 1,
+          quality: 1,
+          gps_number: 0,
+          rtk_number: 0
+        },
+        storage: {
+          total: 82045336,
+          used: 56385704
+        },
+        mode_code: 1,
+        cover_state: 1,
+        supplement_light_state: 0,
+        emergency_stop_state: 0,
+        air_conditioner: {
+          air_conditioner_state: 32767,
+          switch_time: 32767
+        },
+        battery_store_mode: 2,
+        alarm_state: 0,
+        putter_state: 1,
+        sub_device: {
+          device_sn: "M30DRONE01",
+          device_model_key: "0-67-0",
+          device_online_status: 0,
+          device_paired: 0
+        }
+      }
+
+      Thing::Product::DockOsdMessage.new(
+        tid: Message.generate_tid,
+        bid: Message.generate_bid,
+        timestamp: Message.current_timestamp,
+        gateway: "gatewaysn",
+        data: message_data,
+        _data: message_data
+      )
+    end
+
+    def build_thing_product_dock_osd_message_with_maintenance_status
+      message_data = {
+        job_number: 52,
+        acc_time: 146930,
+        activation_time: 1682969151,
+        maintain_status: {
+          maintain_status_array: [
+            {
+              state: 0,
+              last_maintain_type: 17,
+              last_maintain_time: 0,
+              last_maintain_work_sorties: 0
+            }
+          ]
+        },
+        electric_supply_voltage: 0,
+        working_voltage: 0,
+        working_current: 0,
+        backup_battery: {
+          voltage: 24365,
+          temperature: 32767,
+          switch: 1
+        },
+        drone_battery_maintenance_info: {
+          batteries: [
+            {
+              index: 0,
+              capacity_percent: 32767,
+              voltage: 32767,
+              temperature: 32767
+            },
+            {
+              index: 1,
+              capacity_percent: 32767,
+              voltage: 32767,
+              temperature: 32767
+            }
+          ]
+        }
+      }
+
+      Thing::Product::DockOsdMessage.new(
+        tid: Message.generate_tid,
+        bid: Message.generate_bid,
+        timestamp: Message.current_timestamp,
+        gateway: "gatewaysn",
+        data: message_data,
+        _data: message_data
+      )
+    end
+
+    def build_thing_product_dock_osd_message_with_link_status
+      message_data = {
+        drc_state: 0,
+        flighttask_prepare_capacity: 1,
+        flighttask_step_code: 255,
+        media_file_detail: {
+          remain_upload: 140
+        },
+        sdr: {
+          down_quality: 0,
+          frequency_band: 5.8,
+          up_quality: 0
+        },
+        wireless_link: {
+          _4g_freq_band: 2.4,
+          _4g_gnd_quality: 0,
+          _4g_link_state: 0,
+          _4g_quality: 0,
+          _4g_uav_quality: 0,
+          dongle_number: 0,
+          link_workmode: 0,
+          sdr_freq_band: 2.4,
+          sdr_link_state: 0,
+          sdr_quality: 0
+        }
+      }
+
+      Thing::Product::DockOsdMessage.new(
+        tid: Message.generate_tid,
+        bid: Message.generate_bid,
+        timestamp: Message.current_timestamp,
+        gateway: "gatewaysn",
+        data: message_data,
+        _data: message_data
+      )
+    end
+
     # Status
 
     def build_device_online_update_topo_message

data/lib/dji_mqtt_connect/messages/thing/product/osd/dock.rb

@@ -161,11 +161,36 @@ module DjiMqttConnect
 
         attribute? :height, Types::JSON::Decimal
         attribute? :humidity, Types::Integer
-        attribute? :rainfall, Types::JSON::Decimal
+
         attribute? :temperature, Types::Temperature
         attribute? :wind_speed, Types::JSON::Decimal
         attribute? :environment_temperature, Types::Temperature
 
+        # {"0":"No rain","1":"Light rain","2":"Moderate rain","3":"Heavy rain"}
+        attribute? :rainfall, Types::Integer.enum(
+          RAINFALL_NONE = 0,
+          RAINFALL_LIGHT = 1,
+          RAINFALL_MODERATE = 2,
+          RAINFALL_HEAVY = 3
+        )
+
+        def humanized_rainfall
+          return unless rainfall
+
+          rainfall_key = case rainfall
+          when RAINFALL_NONE
+            "None"
+          when RAINFALL_LIGHT
+            "Light"
+          when RAINFALL_MODERATE
+            "Moderate"
+          when RAINFALL_HEAVY
+            "Heavy"
+          end
+
+          I18n.t(rainfall_key.downcase, scope: "dji_mqtt_connect.rainfall", default: rainfall_key)
+        end
+
         attribute? :alternate_land_point do
           attribute :latitude, Types::Latitude
           attribute :longitude, Types::Longitude

data/lib/dji_mqtt_connect/mixins/services_output_status_checks.rb

@@ -8,6 +8,11 @@ module DjiMqttConnect
   module Mixins
     # Provides checks for the output object that contains a Types::ServicesOutputStatus status value
     module ServicesOutputStatusChecks
+      # Provide accessors for each status value
+      DjiMqttConnect::Types::ServicesOutputStatus.values.each do |status_value|
+        define_method(:"status_#{status_value}?") { status == status_value }
+      end
+
       def status_finalized?
         [
           Types::SERVICE_OUTPUT_STATUS_OK,

data/lib/dji_mqtt_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DjiMqttConnect
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport