dji_mqtt_connect 0.1.15 → 0.1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc11cccab3b3a496ba3fabbbc78499f8a614996da46761ddaf2eb9686de35c1
-  data.tar.gz: 512c5d6ce41c476f961e9b797f5cb023b2f69f44dab30637b601bdf9a9595f07
+  metadata.gz: 47088befabe8de8f2476d0cae32c0a7d6514bb4bb535a4fa9f9ca77d8487b012
+  data.tar.gz: 794eaa0083251281365af9ac3eabdaa1d519c97ca306387384af51b8461211d9
 SHA512:
-  metadata.gz: 9ba2eed8daee1e0d08d4fd44f33b84429c455425ca7e34a48f3bc9ef70dfd0a7ae87766fc596f977b34a2d8b50fb734c4617f5722d7164a75cf73c7ed6ebc6e6
-  data.tar.gz: 26dcb1c2aed6ef0aaad6cf93aa601860c8bcb40c4344948e20ff3b81f64c5cf7a6f80cc7e8442e42467e6aa7e25d2abe1649b9d7c56c07464f1ac6fb429211bb
+  metadata.gz: 54ecb1cfb6c7e1155a52c8cd1543c7b251e9ed573c34a9dcb6b563b15bc0374d685812735e867811ccbc7ab5f81004973ab2917d6f63e6954d10295720a9f9ce
+  data.tar.gz: 8ebd5fd2616808530e7c7ea23cfbf52ef705314462baf408c886fd91c93afb17f051ae413492db65279ddd934988f90384bdb171aa3a1d4ac17217a257557bdc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.15)
+    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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.15.1
 platform: ruby
 authors:
 - Sphere Drones