dji_mqtt_connect 0.1.27.2 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba45575bb9fa59280787e9969ed3866da63ce6b31105603a220d3cd8c1ff781
-  data.tar.gz: a592a28e4883230a29128b27faa458ccc8dbb86f2e3b95e805fd5e811c2969c2
+  metadata.gz: 4a3cb4405a25a3c1b68d7e59f9ca08d8b89ba847807614c8b37127cbf59e31f1
+  data.tar.gz: bb6b789291fd1563dc244e80b9a9a3f0eb58f508d1072a841e7796fb46bd9aa6
 SHA512:
-  metadata.gz: bf621823b129fdd965e1be4a1b5d97089d1eb3bb3fd4500891d272ebd1607844dee0a1a377f29448fff3ab0a954cc4bfc1d8f621e9a48177f20e2fe534e2f9cc
-  data.tar.gz: 65d179251ac8c4e445547eb751d632c5d2122d519b2f20509b88c86dde9b600df1c7b57c704afe3fba89e298ca5f5d6f007226da8e57408ad87d34eede89768a
+  metadata.gz: 90cf0d255e1f891ceb3a2a2034fa9e665bf88d9e53ff39a48635b0f5a49197a1b90144bb9bb7fd30e4b3c51f2f0fd2fe10b700f21336b93704678399eb28c841
+  data.tar.gz: b42b2addd144c918e861c1e704e57c385279e0efae12d7dbbb73eb0203c40d9592723928b115051961a51f3a03f63ae8489aa915c204cdb2d9ab2c544a1cf9db

data/config/locales/thing_product_events.en.yml

@@ -6,6 +6,8 @@ en:
       cover_open: "Cover opening: %{status} (%{current_step}/%{total_steps} %{percent}%)"
       device_exit_homing_notify: "Device is exiting return to home: %{action} (%{reason})"
       device_reboot: "Rebooting device: %{status} (%{current_step}/%{total_steps} %{percent}%)"
+      drone_close: "Aircraft shutdown: %{status} (%{percent}%)"
+      drone_open: "Aircraft Power-on: %{status}"
       file_upload_callback: "Uploading file: %{file_name}"
       fileupload_progress: "Uploading files: %{progress}"
       flight_areas_sync_progress: "Syncing flight areas: %{status} (%{reason})"

data/config/locales/thing_product_osd.en.yml

@@ -2,6 +2,7 @@ en:
   dji_mqtt_connect:
     thing_product_osd_summary:
       default: "Received OSD message"
+      flight_hub_dock: "Received OSD message from FlightHub Dock"
       dock: "Received OSD message from Dock"
       drone: "Received OSD message from Drone"
       remote: "Received OSD message from Remote"

data/lib/dji_mqtt_connect/factories/events_messages.rb

@@ -72,6 +72,47 @@ module DjiMqttConnect
       )
     end
 
+    def build_thing_product_drone_close_events_message
+      message_data = {
+        output: {
+          status: "in_progress",
+          progress: {
+            percent: 0,
+            step_key: "get_bid"
+          }
+        },
+        result: 0
+      }
+      Thing::Product::DroneCloseEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "drone_close",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+
+    def build_thing_product_drone_open_events_message
+      message_data = {
+        output: {
+          status: "in_progress"
+        },
+        result: 0
+      }
+
+      Thing::Product::DroneOpenEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "drone_open",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+
     def build_thing_product_file_upload_callback_events_message
       message_data = {
         file: {

data/lib/dji_mqtt_connect/factories/services_messages.rb

@@ -22,6 +22,14 @@ module DjiMqttConnect
       Thing::Product::DebugModeOpenServicesMessage.build
     end
 
+    def build_thing_product_drone_close_services_message
+      Thing::Product::DroneCloseServicesMessage.build
+    end
+
+    def build_thing_product_drone_open_services_message
+      Thing::Product::DroneOpenServicesMessage.build
+    end
+
     def build_thing_product_fileupload_list_services_message
       Thing::Product::FileuploadListServicesMessage.build(
         module_list: [0, 3]

data/lib/dji_mqtt_connect/factories.rb

@@ -170,6 +170,79 @@ module DjiMqttConnect
       )
     end
 
+    def build_thing_product_flight_hub_dock_osd_message
+      message_data = {
+        host: {
+          air_conditioner: {
+            air_conditioner_state: 0,
+            switch_time: 0
+          },
+          alarm_state: 0,
+          alternate_land_point: {
+            height: 0,
+            is_configured: 1,
+            latitude: -33.76867482124178,
+            longitude: 150.94983762222526,
+            safe_land_height: 30
+          },
+          battery_store_mode: 2,
+          cover_state: 0,
+          drone_charge_state: {
+            capacity_percent: 95,
+            state: 0
+          },
+          drone_in_dock: 1,
+          emergency_stop_state: 0,
+          environment_temperature: 24.8,
+          first_power_on: 1631945855969,
+          heading: 164.2085418701172,
+          height: 62.20537567138672,
+          home_position_is_valid: 2,
+          humidity: 47,
+          latitude: -33.768706649492614,
+          longitude: 150.9497880000493,
+          mode_code: 0,
+          network_state: {
+            quality: 0,
+            rate: 3,
+            type: 2
+          },
+          position_state: {
+            gps_number: 6,
+            is_calibration: 1,
+            is_fixed: 3,
+            quality: 5,
+            rtk_number: 30
+          },
+          putter_state: 0,
+          rainfall: 0,
+          silent_mode: 0,
+          storage: {
+            total: 53082240,
+            used: 14370264
+          },
+          sub_device: {
+            device_online_status: 0,
+            device_paired: 1,
+            device_sn: "SN000002"
+          },
+          supplement_light_state: 0,
+          temperature: 33.1,
+          wind_speed: 0.8
+        },
+        sn: "SN00001"
+      }
+
+      Thing::Product::FlightHubDockOsdMessage.new(
+        OrganizationUUID: "b13d0443-4379-461b-b985-18184ffd324d",
+        biz_code: "device_osd",
+        version: "1.0",
+        timestamp: Message.current_timestamp,
+        data: message_data,
+        _data: message_data
+      )
+    end
+
     # Status
 
     def build_thing_product_update_topo_message_with_online_device
@@ -444,6 +517,8 @@ module DjiMqttConnect
       )
     end
 
+    ### offline_map_get ###
+
     def build_thing_product_offline_map_get_requests_message
       message_data = {}
 
@@ -467,6 +542,35 @@ module DjiMqttConnect
       )
     end
 
+    ### offline_map_get_v2 ###
+
+    def build_thing_product_offline_map_get_v2_requests_message
+      message_data = {
+        tile_type: ["base_map_dem", "semantic_info"]
+      }
+
+      Thing::Product::OfflineMapGetV2RequestsMessage.new(
+        _method: "offline_map_get_v2",
+        _data: message_data,
+        tid: Message.generate_tid,
+        bid: Message.generate_bid,
+        timestamp: Message.current_timestamp,
+        gateway: "GATEWAYSN",
+        data: message_data
+      )
+    end
+
+    def build_thing_product_offline_map_get_v2_requests_reply_message
+      request_message = build_thing_product_offline_map_get_v2_requests_message
+
+      Thing::Product::OfflineMapGetV2RequestsReplyMessage.build_for(
+        request_message,
+        result: 0
+      )
+    end
+
+    ### storage_config_get ###
+
     def build_thing_product_storage_config_get_requests_message
       message_data = {
         module: 0

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

@@ -32,6 +32,23 @@ module DjiMqttConnect
                   "4g_uav_quality" => "_4g_uav_quality"
               end
             end
+
+            # FlightHub Dock messages have a host attribute
+            guard ->(data) { data.key?("host") } do
+              map_value "host" do
+                # Rename the invalid (for Ruby) wireless link attributes
+                guard ->(data) { data.key?("wireless_link") } do
+                  # Translate wireless_link 4g keys (from remote payload)
+                  map_value "wireless_link" do
+                    rename_keys "4g_freq_band" => "_4g_freq_band",
+                      "4g_gnd_quality" => "_4g_gnd_quality",
+                      "4g_link_state" => "_4g_link_state",
+                      "4g_quality" => "_4g_quality",
+                      "4g_uav_quality" => "_4g_uav_quality"
+                  end
+                end
+              end
+            end
           end
         end
       end
@@ -42,7 +59,9 @@ module DjiMqttConnect
 
         message_data = parsed_message.fetch("data", {})
 
-        message_class = if drone_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) }
+        message_class = if parsed_message.key?("OrganizationUUID")
+          FlightHubDockOsdMessage
+        elsif drone_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) }
           DroneOsdMessage
         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) }
@@ -55,6 +74,8 @@ module DjiMqttConnect
 
         transformed_message = osd_transformer.call(parsed_message)
 
+        puts JSON.pretty_generate(transformed_message)
+
         build_message(message_class, transformed_message)
       end
 

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

@@ -17,8 +17,6 @@ module DjiMqttConnect
           attribute :status, Types::ServicesOutputStatus
 
           attribute :progress do
-            include Mixins::EventsProgressChecks
-
             # {"min":"0","max":"100","step":"1"}
             attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
 
@@ -28,6 +26,7 @@ module DjiMqttConnect
 
             # {"get_bid":"Get bid","check_work_mode":"Check whether to enter remote debugging mode","check_task_state":"Check if the DJI Dock is free","land_mcu_reboot":"Land MCU reboot","rain_mcu_reboot":"Weather station MCU reboot","core_mcu_reboot":"Central control MCU reboot","sdr_reboot":"SDR reboot","write_reboot_param_file":"Write reboot flag","get_drone_power_state":"Get battery charge state","close_putter":"Close the putter","check_wired_connect_state":"Get aircraft state","open_drone":"Open the plane","open_alarm":"Open sound and light alarm","check_scram_state":"Check if the emergency stop switch is pressed","open_cover":"Open the hatch","check_drone_sdr_connect_state":"Establish SDR wireless connection","turn_on_drone":"Turn the plane on","drone_paddle_forward":"Turn on forward paddle","close_cover":"Close the hatch","drone_paddle_reverse":"Turn on reverse paddle","drone_paddle_stop":"Stop Paddle Rotation","free_putter":"Free Putter","stop_charge":"Stop charging"}
             attribute? :step_key, Types::EventsProgressStepKey
+            include Mixins::EventsProgressChecks
 
             attribute? :step_result, Types::Integer
           end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # @see https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/cmd.html#shutdown-aircraft-progress
+    class DroneCloseEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("drone_close")
+
+      attribute :data do
+        include Mixins::ResultMessage
+
+        attribute :result, Types::ResultCode
+
+        attribute :output do
+          include Mixins::ServicesOutputStatusChecks
+
+          # {"sent":"sent","in_progress":"in progress","ok":"success","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or stopped","timeout":"timeout"}
+          attribute :status, Types::ServicesOutputStatus
+
+          attribute :progress do
+            include Mixins::EventsProgressChecks
+
+            # {"min":"0","max":"100","step":"1"}
+            attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
+
+            # {"get_bid":"Get bid","check_work_mode":"Check whether to enter remote debugging mode","check_task_state":"Check if the DJI Dock is free","land_mcu_reboot":"Land MCU reboot","rain_mcu_reboot":"Weather station MCU reboot","core_mcu_reboot":"Central control MCU reboot","sdr_reboot":"SDR reboot","write_reboot_param_file":"Write reboot flag","get_drone_power_state":"Get battery charge state","close_putter":"Close the putter","check_wired_connect_state":"Get aircraft state","open_drone":"Open the plane","open_alarm":"Open sound and light alarm","check_scram_state":"Check if the emergency stop switch is pressed","open_cover":"Open the hatch","check_drone_sdr_connect_state":"Establish SDR wireless connection","turn_on_drone":"Turn the plane on","drone_paddle_forward":"Turn on forward paddle","close_cover":"Close the hatch","drone_paddle_reverse":"Turn on reverse paddle","drone_paddle_stop":"Stop Paddle Rotation","free_putter":"Free Putter","stop_charge":"Stop charging"}
+            attribute? :step_key, Types::EventsProgressStepKey
+          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/events/drone_open.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # @see https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/cmd.html#aircraft-power-on-progress
+    class DroneOpenEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("drone_open")
+
+      attribute :data do
+        include Mixins::ResultMessage
+
+        attribute :result, Types::ResultCode
+
+        attribute :output do
+          include Mixins::ServicesOutputStatusChecks
+
+          # {"sent":"sent","in_progress":"in progress","ok":"success","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or stopped","timeout":"timeout"}
+          attribute :status, Types::ServicesOutputStatus
+        end
+      end
+
+      def humanized_summary_interpolation
+        super.merge(
+          status: data.output.humanized_status
+        )
+      end
+    end
+  end
+end

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

@@ -7,13 +7,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("release_terminal_control_area")
 
       attribute :data do
-        attribute :flight_id, Types::String
+        attribute :flight_id, Types::FlightID.optional
         attribute :reason, Types::Integer
       end
 
       # All the flight IDs in the message
       def flight_ids
-        [data.flight_id]
+        [data.flight_id].compact
       end
     end
   end

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class UomFlyDataInfoEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("uom_fly_data_info")
+
+      attribute :data do
+        attribute :result, Types::ResultCode
+        include Mixins::ResultMessage
+
+        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::ServicesOutputStatusChecks
+
+          attribute? :progress do
+            attribute? :current_step, Types::Integer
+
+            # {"min":"0","max":"100","step":"1"}
+            attribute? :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
+          end
+
+          attribute? :ext do
+            attribute? :G5, Types::Integer
+            attribute? :VS, Types::Integer
+
+            attribute? :altitude, Types::JSON::Decimal
+
+            attribute? :area_code, Types::String
+
+            attribute? :coordinate, Types::Integer
+
+            attribute? :course, Types::Integer
+
+            attribute? :flight_status, Types::String
+
+            attribute? :height, Types::JSON::Decimal
+
+            attribute? :height_type, Types::Integer
+
+            attribute? :is_flying, Types::Bool
+
+            attribute? :is_simulator_open, Types::Bool
+
+            attribute? :latitude, Types::JSON::Decimal
+
+            attribute? :longitude, Types::JSON::Decimal
+
+            attribute? :manufacture_id, Types::String
+
+            attribute? :order_id, Types::String
+
+            attribute? :sn, Types::SerialNumber
+
+            attribute? :time_stamp, Types::Coercible::Integer
+
+            attribute? :uas_id, Types::String
+
+            attribute? :uas_model, Types::String
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,9 +9,6 @@ module DjiMqttConnect
         job_number
       ]
 
-      # {"0":"Idle mode (No cooling, heating, and dehumidification)","1":"Cooling mode","2":"Heating mode","3":"Dehumidification mode","4":"Cooling exit mode","5":"Heating exit mode","6":"Dehumidification exit mode","7":"Cooling preparation mode","8":"Heating preparation mode","9":"Dehumidification preparation mode"}
-      AirConditionerState = Types::Integer.enum(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
-
       attribute :data do
         include Mixins::LatitudeConditional
         include Mixins::LongitudeConditional
@@ -54,25 +51,14 @@ module DjiMqttConnect
 
         attribute? :drone_charge_state do
           # {"0":"not charging","1":"charging"}
-          attribute :state, Types::Integer.enum(
-            STATE_NOT_CHARGING = 0,
-            STATE_CHARGING = 1
-          )
-
-          def humanized_state
-            state_key = case state
-            when STATE_NOT_CHARGING
-              "Not Charging"
-            when STATE_CHARGING
-              "Charging"
-            end
-            I18n.t(state_key.parameterize.underscore, scope: "dji_mqtt_connect.dock_drone_charge_state.state", default: state_key)
-          end
+          attribute :state, Types::DroneChargeState
+          include Mixins::DroneChargeState
 
           # {"min":"0","max":"100"}
           attribute :capacity_percent, Types::Integer
           include Mixins::CapacityPercent
         end
+
         attribute? :drone_in_dock, Types::Integer.enum(0, 1)
 
         attribute? :electric_supply_voltage, Types::Integer
@@ -104,38 +90,13 @@ module DjiMqttConnect
         end
 
         attribute? :network_state do
-          attribute :type, Types::Integer.enum(
-            NETWORK_TYPE_4G = 1,
-            NETWORK_TYPE_ETHERNET = 2
-          )
-          attribute :quality, Types::Integer.enum(
-            QUALITY_BAD = 0,
-            QUALITY_MODERATE = 1,
-            QUALITY_GOOD = 2
-          )
-          attribute :rate, Types::JSON::Decimal
+          attribute :type, Types::NetworkStateType
+          include Mixins::NetworkStateType
 
-          def humanized_type
-            type_key = case type
-            when NETWORK_TYPE_4G
-              "4G"
-            when NETWORK_TYPE_ETHERNET
-              "Ethernet"
-            end
-            I18n.t(type_key.downcase, scope: "dji_mqtt_connect.dock_network_state.type", default: type_key)
-          end
+          attribute :quality, Types::NetworkStateQuality
+          include Mixins::NetworkStateQuality
 
-          def humanized_quality
-            quality_key = case quality
-            when QUALITY_BAD
-              "Bad"
-            when QUALITY_MODERATE
-              "Moderate"
-            when QUALITY_GOOD
-              "Good"
-            end
-            I18n.t(quality_key.downcase, scope: "dji_mqtt_connect.dock_network_state.quality", default: quality_key)
-          end
+          attribute :rate, Types::JSON::Decimal
         end
 
         attribute? :sdr do
@@ -212,10 +173,7 @@ module DjiMqttConnect
           attribute :is_fixed, Types::Integer.enum(0, 1, 2, 3)
 
           attribute :quality, Types::Integer
-
-          def quality?
-            quality && Types::PositionStateQuality.valid?(quality)
-          end
+          include Mixins::PositionStateQuality
 
           attribute :gps_number, Types::Integer
           attribute :rtk_number, Types::Integer
@@ -229,11 +187,11 @@ module DjiMqttConnect
         attribute? :mode_code, Types::DockModeCode
 
         attribute? :air_conditioner do
-          attribute :air_conditioner_state, AirConditionerState | Types::Integer
+          attribute :air_conditioner_state, Types::AirConditionerState | Types::Integer
           attribute :switch_time, Types::Integer
 
           def air_conditioner_state?
-            AirConditionerState.valid?(air_conditioner_state)
+            Types::AirConditionerState.valid?(air_conditioner_state)
           end
         end
 

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

@@ -78,11 +78,9 @@ module DjiMqttConnect
         attribute :position_state do
           attribute :gps_number, Types::Integer
           attribute :is_fixed, Types::Integer
-          attribute :quality, Types::Integer
 
-          def quality?
-            quality && Types::PositionStateQuality.valid?(quality)
-          end
+          attribute :quality, Types::Integer
+          include Mixins::PositionStateQuality
 
           attribute :rtk_number, Types::Integer
         end