dji_mqtt_connect 0.1.28 → 0.1.29

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

@@ -11,52 +11,53 @@ module DjiMqttConnect
 
           attribute? :air_conditioner do
             attribute :air_conditioner_state, Types::AirConditionerState | Types::Integer
-            attribute :switch_time, Types::Integer
+            include Mixins::AirConditionerState
 
-            def air_conditioner_state?
-              Types::AirConditionerState.valid?(air_conditioner_state)
-            end
+            attribute :switch_time, Types::Integer
           end
 
           attribute? :activation_time, Types::Integer
 
           # {"0":"Closed","1":"Opened"}
-          attribute? :alarm_state, Types::Integer.enum(
-            ALARM_STATE_CLOSED = 0,
-            ALARM_STATE_OPEN = 1
-          )
+          attribute? :alarm_state, Types::AlarmState
+          include Mixins::AlarmState
 
           attribute? :alternate_land_point do
             attribute :latitude, Types::Latitude
+            include Mixins::Latitude
+
             attribute :longitude, Types::Longitude
+            include Mixins::Longitude
+
             attribute :height, Types::JSON::Decimal
             attribute :safe_land_height, Types::JSON::Decimal
             attribute :is_configured, Types::Integer.enum(0, 1)
           end
 
           attribute? :backup_battery do
-            include Mixins::TemperatureConditional
-
             attribute :switch, Types::Integer.enum(0, 1)
+
             attribute :voltage, Types::Integer
+
             attribute :temperature, Types::Temperature
+            include Mixins::Temperature
           end
 
           # {"1":"Planned storage strategy of battery","2":"Emergency storage strategy of battery"}
           attribute? :battery_store_mode, Types::Integer.enum(1, 2)
 
           # {"0":"Closed","1":"Opened","2":"Half-open","3":"Cover state is abnormal"}
-          attribute? :cover_state, Types::Integer.enum(
-            COVER_STATE_CLOSED = 0,
-            COVER_STATE_OPEN = 1,
-            COVER_STATE_HALF_OPEN = 2,
-            COVER_STATE_ABNORMAL = 3
-          )
+          attribute? :cover_state, Types::CoverState
+          include Mixins::CoverState
 
           attribute? :departure_point do
             attribute :height, Types::JSON::Decimal
+
             attribute :latitude, Types::Latitude
+            include Mixins::Latitude
+
             attribute :longitude, Types::Longitude
+            include Mixins::Longitude
           end
 
           attribute? :departure_point_status, Types::Integer
@@ -68,15 +69,15 @@ module DjiMqttConnect
 
           attribute? :drone_battery_maintenance_info do
             attribute :batteries, Types::Array do
-              include Mixins::TemperatureConditional
-
               attribute :index, Types::Integer
 
               attribute :capacity_percent, Types::Integer
               include Mixins::CapacityPercent
 
               attribute :voltage, Types::Integer
+
               attribute :temperature, Types::Temperature
+              include Mixins::Temperature
             end
 
             # {"0":"Battery is not in heating or insulation","1":"Battery is in heating","2":"Battery is in insulation"}
@@ -96,17 +97,17 @@ module DjiMqttConnect
             include Mixins::CapacityPercent
           end
 
-          attribute? :drone_in_dock, Types::Integer.enum(0, 1)
+          attribute? :drone_in_dock, Types::DroneInDock
+          include Mixins::DroneInDock
 
           attribute? :electric_supply_voltage, Types::Integer
 
           # {"0":"Closed","1":"Opened"}
-          attribute? :emergency_stop_state, Types::Integer.enum(
-            EMERGENCY_STOP_STATE_CLOSED = 0,
-            EMERGENCY_STOP_STATE_OPEN = 1
-          )
+          attribute? :emergency_stop_state, Types::EmergencyStopState
+          include Mixins::EmergencyStopState
 
           attribute? :environment_temperature, Types::Temperature
+          include Mixins::EnvironmentTemperature
 
           attribute? :first_power_on, Types::Integer
 
@@ -128,8 +129,10 @@ module DjiMqttConnect
           attribute? :job_number, Types::Integer
 
           attribute? :latitude, Types::Latitude
+          include Mixins::Latitude
 
           attribute? :longitude, Types::Longitude
+          include Mixins::Longitude
 
           attribute? :maintain_status do
             attribute :maintain_status_array, Types::Array do
@@ -179,24 +182,20 @@ module DjiMqttConnect
           end
 
           # {"0":"Closed","1":"Opened","2":"Half-open","3":"Putter state is abnormal"}
-          attribute? :putter_state, Types::Integer.enum(
-            PUTTER_STATE_CLOSED = 0,
-            PUTTER_STATE_OPEN = 1,
-            PUTTER_STATE_HALF_OPEN = 2,
-            PUTTER_STATE_ABNORMAL = 3
-          )
+          attribute? :putter_state, Types::PutterState
+          include Mixins::PutterState
 
           # {"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
-          )
+          attribute? :rainfall, Types::Rainfall
+          include Mixins::Rainfall
 
           attribute? :relative_alternate_land_point do
             attribute :latitude, Types::Latitude
+            include Mixins::Latitude
+
             attribute :longitude, Types::Longitude
+            include Mixins::Longitude
+
             attribute :safe_land_height, Types::JSON::Decimal
             attribute :status, Types::Integer
           end
@@ -209,8 +208,12 @@ module DjiMqttConnect
 
           attribute? :self_converge_coordinate do
             attribute :height, Types::JSON::Decimal
+
             attribute :latitude, Types::Latitude
+            include Mixins::Latitude
+
             attribute :longitude, Types::Longitude
+            include Mixins::Longitude
           end
 
           attribute? :silent_mode, Types::Integer
@@ -231,10 +234,8 @@ module DjiMqttConnect
             attribute :device_paired, Types::Integer.enum(0, 1)
           end
 
-          attribute? :supplement_light_state, Types::Integer.enum(
-            SUPPLEMENT_LIGHT_STATE_CLOSED = 0,
-            SUPPLEMENT_LIGHT_STATE_OPEN = 1
-          )
+          attribute? :supplement_light_state, Types::SupplementLightState
+          include Mixins::SupplementLightState
 
           attribute? :temperature, Types::Temperature
 

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

@@ -4,14 +4,14 @@ module DjiMqttConnect
   module Thing::Product
     class RemoteOsdMessage < OsdMessage
       attribute :data do
-        include Mixins::LatitudeConditional
-        include Mixins::LongitudeConditional
-
         attribute :capacity_percent, Types::Integer
         include Mixins::CapacityPercent
 
         attribute :latitude, Types::Latitude
+        include Mixins::Latitude
+
         attribute :longitude, Types::Longitude
+        include Mixins::Longitude
 
         attribute? :live_status do
           attribute :live_time, Types::Integer

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/airport_bind_status.rb

@@ -21,9 +21,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("airport_bind_status")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :bind_status, Types::Array do

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/airport_organization_bind.rb

@@ -20,9 +20,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("airport_organization_bind")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :err_infos, Types::Array do
           attribute :sn, Types::SerialNumber

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/airport_organization_get.rb

@@ -20,9 +20,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("airport_organization_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :organization_name, Types::String

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/flight_areas_get.rb

@@ -22,9 +22,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("flight_areas_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :files, Types::Array do

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/flighttask_resource_get.rb

@@ -23,9 +23,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("flighttask_resource_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :file do

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/offline_map_get.rb

@@ -19,9 +19,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("offline_map_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
       end
     end
   end

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/offline_map_get_v2.rb

@@ -18,9 +18,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("offline_map_get_v2")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
       end
     end
   end

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply/storage_config_get.rb

@@ -20,9 +20,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("storage_config_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :bucket, Types::String

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

@@ -50,7 +50,10 @@ module DjiMqttConnect
             attribute :dock_type, Types::String.enum("landing", "takeoff")
 
             attribute :latitude, Types::Latitude
+            include Mixins::Latitude
+
             attribute :longitude, Types::Longitude
+            include Mixins::Longitude
 
             attribute :height, Types::JSON::Decimal
 

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

@@ -90,7 +90,10 @@ module DjiMqttConnect
           attribute :is_enable, Types::Integer.enum(0, 1)
 
           attribute :latitude, Types::Latitude
+          include Mixins::Latitude
+
           attribute :longitude, Types::Longitude
+          include Mixins::Longitude
         end
       end
 

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("alarm_state_switch")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("cover_close")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("cover_open")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("debug_mode_close")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("debug_mode_open")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("drone_close")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("drone_open")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::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
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,9 +6,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("flighttask_progress_get")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :flight_id, Types::String
@@ -33,10 +32,7 @@ module DjiMqttConnect
           attribute :progress do
             # {"0":"Initial state","1":"Pre-flight check, whether the aircraft is executing a wayline","2":"Pre-flight check, whether the dock has exited working mode","3":"Pre-flight check, wayline execution in progress","4":"Pre-return-to-home check, in the process of returning to home","5":"Wayline execution enters the preparation state, waiting for the mission to be issued","6":"Dock enters working state","7":"Enter the startup check and cover preparation work","8":"Remote image transmission frequency Pairing","9":"Waiting for the flight system to be ready, push connection established","10":"Waiting for RTK source to listen for reported values","11":"Check if the RTK source is from the dock, if not, reset it","12":"Waiting for flight control notification","13":"The dock has no control and seizes the control of the aircraft","14":"Consistency check of custom flight area","15":"Consistency check of offline maps","16":"Get the latest KMZ URL","17":"Download KMZ","18":"KMZ uploading","19":"Coloring configuration","20":"Aircraft takeoff parameter setting, alternate landing point setting, takeoff altitude setting, coloring setting","21":"Aircraft flyto takeoff parameter setting","22":"Takeoff dock checks the landing dock preparation status","23":"Home point setting","24":"Trigger wayline execution","25":"Wayline executing","26":"Enter pre-return-to-home check","27":"Aircraft landing at the dock","28":"Close the cover after landing","29":"Dock exits working mode","30":"Dock abnormal recovery","31":"Dock uploads flight system logs","32":"Check camera recording state","33":"Get the number of media files","34":"Abnormal recovery after dock takeoff cover","35":"Notify mission result","36":"Log list retrieval - Aircraft list","37":"Log list retrieval - Retrieve the list of docks","38":"Log list retrieval - Upload log list result","39":"Log retrieval - Retrieve aircraft logs","40":"Log retrieval - Retrieve dock logs","41":"Log retrieval - Compress aircraft logs","42":"Log retrieval - Compress dock logs","43":"Log retrieval - Upload aircraft logs","44":"Log retrieval - Upload dock logs","45":"Log retrieval - Notify the result","46":"Custom flight area file update preparation","47":"Custom flight area updating","48":"Offline map update preparation","49":"Offline map updating","65533":"Wait for service response after completion","65534":"No specific state","65535":"UNKNOWN"}
             attribute :current_step, Types::Integer
-
-            def humanized_current_step
-              I18n.t(current_step, scope: "dji_mqtt_connect.flighttask_progress.current_step", default: current_step.to_s)
-            end
+            include Mixins::FlighttaskProgressCurrentStep
 
             # {"min":"0","max":"100","step":"1"}
             attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("return_home")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute? :output do
-          include Mixins::ServicesOutputStatusChecks
-
           # {"sent":"sent","in_progress":"in progress","ok":"succeeded","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or terminated","timeout":"timeout"}
           attribute :status, Types::ServicesOutputStatus
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -6,15 +6,13 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("return_specific_home")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute? :output do
-          include Mixins::ServicesOutputStatusChecks
-
           # {"sent":"sent","in_progress":"in progress","ok":"succeeded","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or terminated","timeout":"timeout"}
           attribute :status, Types::ServicesOutputStatus
+          include Mixins::ServicesOutputStatus
         end
       end
     end

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

@@ -11,9 +11,8 @@ module DjiMqttConnect
       attribute :_method, Types::String
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
       end
 
       def humanized_summary

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

@@ -145,8 +145,7 @@ module DjiMqttConnect
             attribute :coexist_video_number_max, Types::Integer
             attribute :camera_list, Types::Array do
               attribute :camera_index, Types::String
-
-              include Mixins::HumanizedCameraIndex
+              include Mixins::CameraIndex
 
               attribute :available_video_number, Types::Integer
               attribute :coexist_video_number_max, Types::Integer

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

@@ -23,9 +23,8 @@ module DjiMqttConnect
       attribute :timestamp, Types::Timestamp
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
       end
 
       def humanized_summary

data/lib/dji_mqtt_connect/mixins/air_conditioner_state.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Mixins
+    module AirConditionerState
+      def air_conditioner_state?
+        Types::AirConditionerState.valid?(air_conditioner_state)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/mixins/alarm_state.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Mixins
+    module AlarmState
+      def humanized_alarm_state
+        return unless alarm_state
+
+        state_key = case alarm_state
+        when Types::ALARM_STATE_CLOSED
+          "Closed"
+        when Types::ALARM_STATE_OPEN
+          "Open"
+        end
+
+        I18n.t(state_key.downcase, scope: "dji_mqtt_connect.dock_alarm_state", default: state_key)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/mixins/{humanized_camera_index.rb → camera_index.rb}

@@ -3,9 +3,13 @@
 module DjiMqttConnect
   module Mixins
     # Provides a conditional that returns false for nil for invalid latitude values
-    module HumanizedCameraIndex
+    module CameraIndex
+      def camera_index?
+        camera_index.present?
+      end
+
       def humanised_camera_index
-        return unless camera_index.present?
+        return unless camera_index?
 
         I18n.t(camera_index, scope: "dji_mqtt_connect.camera_index", default: camera_index)
       end

data/lib/dji_mqtt_connect/mixins/cover_state.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Mixins
+    module CoverState
+      def humanized_cover_state
+        return unless cover_state
+
+        state_key = case cover_state
+        when Types::COVER_STATE_CLOSED
+          "Closed"
+        when Types::COVER_STATE_OPEN
+          "Open"
+        when Types::COVER_STATE_HALF_OPEN
+          "Half-open"
+        when Types::COVER_STATE_ABNORMAL
+          "Abnormal"
+        end
+
+        I18n.t(state_key.parameterize.underscore, scope: "dji_mqtt_connect.dock_cover_state", default: state_key)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/mixins/drone_in_dock.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Mixins
+    module DroneInDock
+      def drone_in_dock?
+        drone_in_dock == Types::DRONE_IN_DOCK
+      end
+    end
+  end
+end