dji_mqtt_connect 0.1.14.1 → 0.1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47395f1b58ac06502a0920de3175c3410f11872f25c6248245b206bd4f4a5522
-  data.tar.gz: 72ff4759ad36e7f157b374a1d230d5f493e384a767b26a3d59d20e8a8f32c5c2
+  metadata.gz: 47088befabe8de8f2476d0cae32c0a7d6514bb4bb535a4fa9f9ca77d8487b012
+  data.tar.gz: 794eaa0083251281365af9ac3eabdaa1d519c97ca306387384af51b8461211d9
 SHA512:
-  metadata.gz: acf0c009ffd5fbe14ad9b0ef6708dcb437e3d4ffdd1082e4aa567dbd7734b98f93b756155be1fbb820d291c86d4b11eb6ff14f4cca657e9abf67cb4cfbeb6ce2
-  data.tar.gz: fc2b1c92cc39e9d8581df7056c6531e3cc6979d66b2a8fba89e7818097e5723b7deda2bdb5c3f708cf5619eaab6d42fde52de05f7b93a06033cc1cdee60cc22c
+  metadata.gz: 54ecb1cfb6c7e1155a52c8cd1543c7b251e9ed573c34a9dcb6b563b15bc0374d685812735e867811ccbc7ab5f81004973ab2917d6f63e6954d10295720a9f9ce
+  data.tar.gz: 8ebd5fd2616808530e7c7ea23cfbf52ef705314462baf408c886fd91c93afb17f051ae413492db65279ddd934988f90384bdb171aa3a1d4ac17217a257557bdc

data/Gemfile.lock

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

data/lib/dji_mqtt_connect/marshals/thing/product/osd_marshal.rb

@@ -39,9 +39,11 @@ module DjiMqttConnect
         parsed_message = JSON.parse(raw_message)
 
         message_data = parsed_message.fetch("data", {})
+
         message_class = if drone_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) }
           DroneOsdMessage
-        elsif remote_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) }
+        elsif required_remote_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) } &&
+            optional_remote_osd_data_attributes.any? { |attribute| message_data.key?(attribute.to_s) }
           RemoteOsdMessage
         elsif dock_osd_data_attributes.any? { |attribute| message_data.key?(attribute.to_s) }
           DockOsdMessage
@@ -72,12 +74,19 @@ module DjiMqttConnect
         @drone_osd_data_attributes ||= DroneOsdMessage::STABLE_DATA_ATTRIBUTES.map(&:to_s)
       end
 
-      def remote_osd_data_attributes
-        @remote_osd_data_attributes ||= begin
+      def required_remote_osd_data_attributes
+        @required_remote_osd_data_attributes ||= begin
           data_keys = DjiMqttConnect::Thing::Product::RemoteOsdMessage::Data.schema.keys
           data_keys.select(&:required?).map(&:name)
         end
       end
+
+      def optional_remote_osd_data_attributes
+        @optional_remote_osd_data_attributes ||= begin
+          data_keys = DjiMqttConnect::Thing::Product::RemoteOsdMessage::Data.schema.keys
+          data_keys.reject(&:required?).map(&:name)
+        end
+      end
     end
   end
 end

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/messages/thing/product/osd/drone.rb

@@ -87,37 +87,37 @@ module DjiMqttConnect
         # M30 Fields
 
         attribute? :cameras, Types::Array do
+          attribute :payload_index, Types::String
+
           # {"0":"Photo taking","1":"Recording"}
-          attribute :camera_mode, Types::Integer.enum(0, 1)
+          attribute? :camera_mode, Types::Integer.enum(0, 1)
 
           # {"min":2,"max":20}
-          attribute :ir_zoom_factor, Types::JSON::Decimal
+          attribute? :ir_zoom_factor, Types::JSON::Decimal
 
-          attribute :liveview_world_region do
+          attribute? :liveview_world_region do
             attribute :bottom, Types::JSON::Decimal.constrained(gteq: 0, lteq: 1)
             attribute :left, Types::JSON::Decimal.constrained(gteq: 0, lteq: 1)
             attribute :right, Types::JSON::Decimal.constrained(gteq: 0, lteq: 1)
             attribute :top, Types::JSON::Decimal.constrained(gteq: 0, lteq: 1)
           end
 
-          attribute :payload_index, Types::String
-
           # {"0":"Idle","1":"Taking photo"}
-          attribute :photo_state, Types::Integer.enum(0, 1)
+          attribute? :photo_state, Types::Integer.enum(0, 1)
 
           # {"0":"Idle","1":"Recording"}
-          attribute :recording_state, Types::Integer.enum(0, 1)
+          attribute? :recording_state, Types::Integer.enum(0, 1)
 
           # {"unit":"s"}
-          attribute :record_time, Types::Integer
+          attribute? :record_time, Types::Integer
 
-          attribute :remain_photo_num, Types::Integer
+          attribute? :remain_photo_num, Types::Integer
 
           # {"unit":"s"}
-          attribute :remain_record_duration, Types::Integer
+          attribute? :remain_record_duration, Types::Integer
 
           # {"min":2,"max":200}
-          attribute :zoom_factor, Types::JSON::Decimal
+          attribute? :zoom_factor, Types::JSON::Decimal
         end
 
         # {"0":"Continue to execute the wayline task","1":"Exit the wayline task, and execute the remote controller out of control action."}

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

@@ -8,15 +8,17 @@ module DjiMqttConnect
         include Mixins::LongitudeConditional
 
         attribute :capacity_percent, Types::Integer
+
         attribute :latitude, Types::Latitude
-        attribute :live_status do
+        attribute :longitude, Types::Longitude
+
+        attribute? :live_status do
           attribute :live_time, Types::Integer
           attribute :live_trendline, Types::Integer
           attribute :video_id, Types::String
           attribute :video_quality, Types::Integer
         end
-        attribute :longitude, Types::Longitude
-        attribute :transmission_signal_quality, Types::Integer
+        attribute? :transmission_signal_quality, Types::Integer
         attribute? :wireless_link do
           attribute :_4g_freq_band, Types::JSON::Decimal
           attribute :_4g_gnd_quality, Types::Integer
@@ -29,7 +31,7 @@ module DjiMqttConnect
           attribute :sdr_link_state, Types::Integer
           attribute :sdr_quality, Types::Integer
         end
-        attribute :wireless_link_state do
+        attribute? :wireless_link_state do
           attribute :download_quality, Types::Integer
           attribute :frequency_band, Types::Integer
           attribute :upward_quality, Types::Integer

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.1"
+  VERSION = "0.1.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.14.1
+  version: 0.1.15.1
 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