dji_mqtt_connect 0.1.35.1 → 0.1.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb1d63889b820dd0c1df792d2253030ae911e0d08a5d24f727ab00b0ff8f2c2
-  data.tar.gz: 31ababecf779a61bc6a7712dc7ecdbb268e49fc4f904df104af1dc7ea442bd89
+  metadata.gz: 6b1c329539ef66f69b2aa9fd3ca9c8a115766ac03070a44fb223736218996447
+  data.tar.gz: 3e42765a57d9a9e8cbd312583b9fed7f710ec3a32d552a58a72f59c04466faed
 SHA512:
-  metadata.gz: e25128b88bf8447c88cb4bf21917779802c4f97dc0c4acd6b3a4a6584e45a44571b77d0ec7026736040321e14bde6f494918c0ffa299d0100b6c49a0334e3a85
-  data.tar.gz: f788894f1b081e966b90b552f2e5180d214e58e269f5cad6e9df29a54fd7e5d624c34a3195c4f5f40ffecd1d7151763bdbab635be934a6c59eaf86595128c5a0
+  metadata.gz: 5d705f19afffbe1bf734eb90e5a266d42192608c2700550abdbed685284b7ec1f48c3481c0100ebae02ade40a825ad858307e4f717de6be4dcc19e824fd6facd
+  data.tar.gz: 02ec49b14ffde6911c026e94b40061630a769b06155532c35cadcfeb5a8806ac158e05e58e52ece6cc17037eb8d808d090b1f84dd52cd455af9a8008b4706bb5

data/config/locales/thing_product_events.en.yml

@@ -9,6 +9,7 @@ en:
       cover_force_close: "Force Cover Close: %{status} (%{current_step}/%{total_steps} %{percent}%)"
       cover_open: "Cover opening: %{status} (%{current_step}/%{total_steps} %{percent}%)"
       device_exit_homing_notify: "Device is exiting return to home: %{action} (%{reason})"
+      device_format: "Dock Data Formatting: %{status} (%{percent}%)"
       device_reboot: "Rebooting device: %{status} (%{current_step}/%{total_steps} %{percent}%)"
       drone_close: "Aircraft shutdown: %{status} (%{percent}%)"
       drone_open: "Aircraft Power-on: %{status}"

data/config/locales/thing_product_services.en.yml

@@ -13,6 +13,7 @@ en:
       flighttask_recovery: "Requesting resume for all Flights"
       flighttask_stop: "Requesting flight stop"
       flighttask_undo: "Requesting cancellation of flights"
+      live_camera_change: "Requesting live camera change: Video %{video_id} (Camera Position %{camera_position})"
       live_lens_change: "Requesting live lens change: %{video_type} (Video %{video_id})"
       live_set_quality: "Requesting live quality change: %{video_quality} (Video %{video_id})"
       live_start_push: "Requesting broadcast start: Video %{video_id}"

data/lib/dji_mqtt_connect/factories/events/device_format.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories::EventsMessages
+    ### Device Format ###
+
+    def build_thing_product_device_format_events_message
+      message_data = {
+        result: 0,
+        output: {
+          status: "in_progress",
+          progress: {
+            percent: 80,
+            step_key: "xxx"
+          }
+        }
+      }
+
+      Thing::Product::DeviceFormatEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "device_format",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories/services_messages.rb

@@ -189,6 +189,15 @@ module DjiMqttConnect
 
     ### Live Stream (Services Messages) ###
 
+    def build_thing_product_live_camera_change_services_message
+      Thing::Product::LiveCameraChangeServicesMessage.build(
+        data: {
+          video_id: "1ZNDH1D0010098/165-0-7/normal-0",
+          camera_position: 0
+        }
+      )
+    end
+
     def build_thing_product_live_lens_change_services_message
       Thing::Product::LiveLensChangeServicesMessage.build(
         data: {

data/lib/dji_mqtt_connect/factories/services_reply/live_camera_change.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Factories
+    def build_thing_product_live_camera_change_services_reply_message
+      message_data = {result: 0}
+
+      Thing::Product::LiveCameraChangeServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "live_camera_change",
+        _data: message_data,
+        data: message_data
+      )
+    end
+  end
+end

data/lib/dji_mqtt_connect/factories.rb

@@ -620,3 +620,5 @@ module DjiMqttConnect
     end
   end
 end
+
+Dir[File.join(__dir__, "factories", "services_reply", "*.rb")].sort.each { |file| require file }

data/lib/dji_mqtt_connect/messages/thing/product/events/device_format.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Dock Data Formatting Progress
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock3/cmd.html#dock-data-formatting-progress
+    class DeviceFormatEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("device_format")
+
+      attribute :data do
+        attribute :result, Types::ResultCode
+        include Mixins::ResultCode
+
+        attribute :output do
+          # {"sent":"sent","in_progress":"in progress","ok":"success","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or stopped","timeout":"timeout"}
+          attribute :status, Types::ServicesOutputStatus
+          include Mixins::ServicesOutputStatus
+
+          attribute :progress do
+            # {"min":"0","max":"100","step":"1"}
+            attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
+
+            # NOTE: step_key isn't in the documented field table for this message, only shown in the
+            # example payload with a placeholder value ("xxx"), so it's not constrained to Types::EventsProgressStepKey
+            attribute? :step_key, Types::String
+          end
+        end
+      end
+
+      def humanized_summary_interpolation
+        super.merge(
+          status: data.output.humanized_status,
+          percent: data.output.progress.percent
+        )
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services/live_camera_change.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Switch live streaming camera
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock3/live.html#switch-live-streaming-camera
+    class LiveCameraChangeServicesMessage < ServicesMessage
+      def self.build(data:, bid: generate_bid, tid: generate_tid, timestamp: current_timestamp)
+        new(
+          bid: bid,
+          tid: tid,
+          data: data,
+          timestamp: timestamp,
+          _method: "live_camera_change"
+        )
+      end
+
+      CAMERA_POSITION_INSIDE_DOCK = 0
+      CAMERA_POSITION_OUTSIDE_DOCK = 1
+
+      attribute :_method, Types::String.enum("live_camera_change")
+
+      attribute :data do
+        # Formatted as {sn}/{camera_index}/{video_index}
+        attribute :video_id, Types::String
+
+        # {"0":"Inside the dock","1":"Outside the dock"}
+        attribute :camera_position, Types::Integer.enum(
+          CAMERA_POSITION_INSIDE_DOCK,
+          CAMERA_POSITION_OUTSIDE_DOCK
+        )
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/drc_mode_enter.rb

@@ -5,6 +5,9 @@ module DjiMqttConnect
     class DrcModeEnterServicesReplyMessage < ServicesReplyMessage
       attribute :_method, Types::String.enum("drc_mode_enter")
 
+      # NOTE: DJI sometimes omits the timestamp for a drc_mode_enter services reply message
+      attribute? :timestamp, Types::TimestampMS
+
       attribute :data do
         attribute :result, Types::ResultCode
         include Mixins::ResultCode

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/drc_mode_exit.rb

@@ -5,6 +5,9 @@ module DjiMqttConnect
     class DrcModeExitServicesReplyMessage < ServicesReplyMessage
       attribute :_method, Types::String.enum("drc_mode_exit")
 
+      # NOTE: DJI sometimes omits the timestamp for a drc_mode_exit services reply message
+      attribute? :timestamp, Types::TimestampMS
+
       attribute :data do
         attribute :result, Types::ResultCode
         include Mixins::ResultCode

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/live_camera_change.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class LiveCameraChangeServicesReplyMessage < ServicesReplyMessage
+      attribute :_method, Types::String.enum("live_camera_change")
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/state_message.rb

@@ -177,7 +177,8 @@ module DjiMqttConnect
           attribute :available_video_number, Types::Integer
           attribute :coexist_video_number_max, Types::Integer
           attribute :device_list, Types::Array do
-            attribute :sn, Types::SerialNumber
+            # NOTE: DJI sometimes sends a blank serial number for a device
+            attribute :sn, Types::SerialNumber | Types::Nil
             attribute :available_video_number, Types::Integer
             attribute :coexist_video_number_max, Types::Integer
             attribute :camera_list, Types::Array do

data/lib/dji_mqtt_connect/types.rb

@@ -197,6 +197,7 @@ module DjiMqttConnect
       "turn_on_drone",
       "drone_paddle_forward",
       "close_cover",
+      "close_drone",
       "drone_paddle_reverse",
       "drone_paddle_stop",
       "free_putter",

data/lib/dji_mqtt_connect/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.35.1
+  version: 0.1.35.2
 platform: ruby
 authors:
 - Sphere Drones
@@ -145,6 +145,7 @@ files:
 - lib/dji_mqtt_connect/factories/events/cover_close.rb
 - lib/dji_mqtt_connect/factories/events/cover_force_close.rb
 - lib/dji_mqtt_connect/factories/events/cover_open.rb
+- lib/dji_mqtt_connect/factories/events/device_format.rb
 - lib/dji_mqtt_connect/factories/events/obstacle_avoidance_notify.rb
 - lib/dji_mqtt_connect/factories/events/ota_progress.rb
 - lib/dji_mqtt_connect/factories/events_messages.rb
@@ -182,6 +183,7 @@ files:
 - lib/dji_mqtt_connect/factories/services/photo_storage_set.rb
 - lib/dji_mqtt_connect/factories/services/video_storage_set.rb
 - lib/dji_mqtt_connect/factories/services_messages.rb
+- lib/dji_mqtt_connect/factories/services_reply/live_camera_change.rb
 - lib/dji_mqtt_connect/factories/state_messages.rb
 - lib/dji_mqtt_connect/marshals/sys/product/status_marshal.rb
 - lib/dji_mqtt_connect/marshals/sys/product/status_reply_marshal.rb
@@ -208,6 +210,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/events/cover_force_close.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/cover_open.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/device_exit_homing_notify.rb
+- lib/dji_mqtt_connect/messages/thing/product/events/device_format.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/device_log.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/device_reboot.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/drone_close.rb
@@ -303,6 +306,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/services/ir_metering_area_set.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/ir_metering_mode_set.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/ir_metering_point_set.rb
+- lib/dji_mqtt_connect/messages/thing/product/services/live_camera_change.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/live_lens_change.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/live_set_quality.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/live_start_push.rb
@@ -359,6 +363,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/ir_metering_area_set.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/ir_metering_mode_set.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/ir_metering_point_set.rb
+- lib/dji_mqtt_connect/messages/thing/product/services_reply/live_camera_change.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/live_lens_change.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/live_set_quality.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/live_start_push.rb