dji_mqtt_connect 0.1.28 → 0.1.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3cb4405a25a3c1b68d7e59f9ca08d8b89ba847807614c8b37127cbf59e31f1
-  data.tar.gz: bb6b789291fd1563dc244e80b9a9a3f0eb58f508d1072a841e7796fb46bd9aa6
+  metadata.gz: ad6c951a41f2f540dfbd4ec551ed9b74f0f84675c07496b6119387232e39d2c0
+  data.tar.gz: 18044b1fe94f1276c6d920794a0f1261bd446455ed261f0704236dbc0e925162
 SHA512:
-  metadata.gz: 90cf0d255e1f891ceb3a2a2034fa9e665bf88d9e53ff39a48635b0f5a49197a1b90144bb9bb7fd30e4b3c51f2f0fd2fe10b700f21336b93704678399eb28c841
-  data.tar.gz: b42b2addd144c918e861c1e704e57c385279e0efae12d7dbbb73eb0203c40d9592723928b115051961a51f3a03f63ae8489aa915c204cdb2d9ab2c544a1cf9db
+  metadata.gz: 0df22624ae36218051c85386369975633f07c42d1020f5682807f3cbe28ec57a1b731ac03710ff07db33f81ce9de71d1a7a4517d3e252dcd2fe7fe881c4daa3a
+  data.tar.gz: d5ca85ce8795e967c8274438ddb7f845ce8bacbc1bc65be863c1fa626544b3c60ce763f2fa1d9c06cfd47924195cd921e5ac914aed64e35fff6fb37abac905b0

data/lib/dji_mqtt_connect/messages/sys/product/status_reply_message.rb

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

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

@@ -13,8 +13,10 @@ module DjiMqttConnect
           attribute :warning_level, Types::Integer.enum(0, 1, 2, 3, 4)
 
           attribute :latitude, Types::Latitude
+          include Mixins::Latitude
 
           attribute :longitude, Types::Longitude
+          include Mixins::Longitude
 
           attribute :altitude, Types::Integer
 

data/lib/dji_mqtt_connect/messages/thing/product/events/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
 
           attribute :progress do
             # {"min":"0","max":"100","step":"1"}
@@ -26,7 +24,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
+            include Mixins::EventsProgressStepKey
 
             attribute? :step_result, Types::Integer
           end

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

@@ -6,19 +6,15 @@ 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
 
           attribute :progress do
-            include Mixins::EventsProgressChecks
-
             # {"min":"0","max":"100","step":"1"}
             attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
 
@@ -28,6 +24,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::EventsProgressStepKey
 
             attribute? :step_result, Types::Integer
           end

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

@@ -6,19 +6,15 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("device_reboot")
 
       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
 
           attribute :progress do
-            include Mixins::EventsProgressChecks
-
             # {"min":"0","max":"100","step":"1"}
             attribute :percent, Types::Integer.constrained(gteq: 0, lteq: 100)
 
@@ -28,6 +24,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::EventsProgressStepKey
 
             attribute? :step_result, Types::Integer
           end

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

@@ -7,24 +7,21 @@ 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
 
           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
+            include Mixins::EventsProgressStepKey
           end
         end
       end

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

@@ -7,15 +7,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
 

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

@@ -6,9 +6,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("file_upload_callback")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :file do
           attribute :object_key, Types::String
@@ -38,14 +37,14 @@ module DjiMqttConnect
             attribute :created_time, Types::JSON::DateTime | Types::Nil
 
             attribute :shoot_position do
-              include Mixins::LatitudeConditional
-              include Mixins::LongitudeConditional
-
               attribute :lat, Types::Latitude
               attribute :lng, Types::Longitude
 
               alias_method :latitude, :lat
+              include Mixins::Latitude
+
               alias_method :longitude, :lng
+              include Mixins::Longitude
             end
           end
         end

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

@@ -9,9 +9,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("flighttask_progress")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :output do
           attribute :ext do
@@ -81,10 +80,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/events/return_home_info.rb

@@ -27,7 +27,11 @@ module DjiMqttConnect
 
         attribute :planned_path_points, Types::Array.default([].freeze) do
           attribute :latitude, Types::Latitude
+          include Mixins::Latitude
+
           attribute :longitude, Types::Longitude
+          include Mixins::Longitude
+
           attribute :height, Types::JSON::Decimal
         end
 

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

@@ -6,9 +6,8 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("takeoff_to_point_progress")
 
       attribute :data do
-        include Mixins::ResultMessage
-
         attribute :result, Types::ResultCode
+        include Mixins::ResultCode
 
         attribute :flight_id, Types::FlightID
 

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

@@ -7,12 +7,12 @@ module DjiMqttConnect
 
       attribute :data do
         attribute :result, Types::ResultCode
-        include Mixins::ResultMessage
+        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::ServicesOutputStatusChecks
+          include Mixins::ServicesOutputStatus
 
           attribute? :progress do
             attribute? :current_step, Types::Integer
@@ -43,8 +43,10 @@ module DjiMqttConnect
 
             attribute? :is_simulator_open, Types::Bool
 
+            # NOTE: Not a real latitude type, just a decimal
             attribute? :latitude, Types::JSON::Decimal
 
+            # NOTE: Not a real longitude type, just a decimal
             attribute? :longitude, Types::JSON::Decimal
 
             attribute? :manufacture_id, Types::String

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

@@ -27,9 +27,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/osd/dock.rb

@@ -10,19 +10,16 @@ module DjiMqttConnect
       ]
 
       attribute :data do
-        include Mixins::LatitudeConditional
-        include Mixins::LongitudeConditional
-        include Mixins::TemperatureConditional
-
         attribute? :acc_time, Types::Integer
         attribute? :activation_time, Types::Integer
 
         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
 
         # {"0":"Disconnected","1":"Connecting","2":"Connected"}
@@ -30,15 +27,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"}
@@ -59,7 +56,8 @@ 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
 
@@ -70,7 +68,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
@@ -127,37 +128,24 @@ module DjiMqttConnect
         attribute? :humidity, Types::Integer
 
         attribute? :temperature, Types::Temperature
+        include Mixins::Temperature
+
         attribute? :wind_speed, Types::JSON::Decimal
+
         attribute? :environment_temperature, Types::Temperature
+        include Mixins::EnvironmentTemperature
 
         # {"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? :rainfall, Types::Rainfall
+        include Mixins::Rainfall
 
         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)
@@ -188,122 +176,33 @@ 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
 
         # {"0":"Closed","1":"Opened"}
-        attribute? :alarm_state, Types::Integer.enum(
-          ALARM_STATE_CLOSED = 0,
-          ALARM_STATE_OPEN = 1
-        )
-
-        def humanized_alarm_state
-          return unless alarm_state
-
-          state_key = case alarm_state
-          when ALARM_STATE_CLOSED
-            "Closed"
-          when ALARM_STATE_OPEN
-            "Open"
-          end
-
-          I18n.t(state_key.downcase, scope: "dji_mqtt_connect.dock_alarm_state", default: state_key)
-        end
+        attribute? :alarm_state, Types::AlarmState
+        include Mixins::AlarmState
 
         # {"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
-        )
-
-        def humanized_cover_state
-          return unless cover_state
-
-          state_key = case cover_state
-          when COVER_STATE_CLOSED
-            "Closed"
-          when COVER_STATE_OPEN
-            "Open"
-          when COVER_STATE_HALF_OPEN
-            "Half-open"
-          when COVER_STATE_ABNORMAL
-            "Abnormal"
-          end
-
-          I18n.t(state_key.parameterize.underscore, scope: "dji_mqtt_connect.dock_cover_state", default: state_key)
-        end
+        attribute? :cover_state, Types::CoverState
+        include Mixins::CoverState
 
         # {"0":"Closed","1":"Opened"}
-        attribute? :emergency_stop_state, Types::Integer.enum(
-          EMERGENCY_STOP_STATE_CLOSED = 0,
-          EMERGENCY_STOP_STATE_OPEN = 1
-        )
-
-        def humanized_emergency_stop_state
-          return unless emergency_stop_state
-
-          state_key = case emergency_stop_state
-          when EMERGENCY_STOP_STATE_CLOSED
-            "Closed"
-          when EMERGENCY_STOP_STATE_OPEN
-            "Open"
-          end
-
-          I18n.t(state_key.downcase, scope: "dji_mqtt_connect.dock_emergency_stop_state", default: state_key)
-        end
+        attribute? :emergency_stop_state, Types::EmergencyStopState
+        include Mixins::EmergencyStopState
 
         # {"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
-        )
-
-        def humanized_putter_state
-          return unless putter_state
-
-          state_key = case putter_state
-          when PUTTER_STATE_CLOSED
-            "Closed"
-          when PUTTER_STATE_OPEN
-            "Open"
-          when PUTTER_STATE_HALF_OPEN
-            "Half-open"
-          when PUTTER_STATE_ABNORMAL
-            "Abnormal"
-          end
-
-          I18n.t(state_key.parameterize.underscore, scope: "dji_mqtt_connect.dock_putter_state", default: state_key)
-        end
+        attribute? :putter_state, Types::PutterState
+        include Mixins::PutterState
 
         # {"0":"Closed","1":"Opened"}
-        attribute? :supplement_light_state, Types::Integer.enum(
-          SUPPLEMENT_LIGHT_STATE_CLOSED = 0,
-          SUPPLEMENT_LIGHT_STATE_OPEN = 1
-        )
-
-        def humanized_supplement_light_state
-          return unless supplement_light_state
-
-          state_key = case supplement_light_state
-          when SUPPLEMENT_LIGHT_STATE_CLOSED
-            "Closed"
-          when SUPPLEMENT_LIGHT_STATE_OPEN
-            "Open"
-          end
-
-          I18n.t(state_key.downcase, scope: "dji_mqtt_connect.dock_supplement_light_state", default: state_key)
-        end
+        attribute? :supplement_light_state, Types::SupplementLightState
+        include Mixins::SupplementLightState
 
         attribute? :sub_device do
           attribute? :device_sn, Types::SerialNumber
@@ -315,14 +214,6 @@ module DjiMqttConnect
           # {"0":"Not paired","1":"Paired"}
           attribute :device_paired, Types::Integer.enum(0, 1)
         end
-
-        def drone_in_dock?
-          drone_in_dock == 1
-        end
-
-        def environment_temperature?
-          environment_temperature && !Types::InvalidTemperature.valid?(environment_temperature)
-        end
       end
 
       def humanized_summary

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

@@ -21,16 +21,11 @@ module DjiMqttConnect
       ]
 
       attribute :data do
-        include Mixins::LatitudeConditional
-        include Mixins::LongitudeConditional
-
         attribute :attitude_head, Types::JSON::Decimal
         attribute :attitude_pitch, Types::JSON::Decimal
         attribute :attitude_roll, Types::JSON::Decimal
         attribute :battery do
           attribute :batteries, Types::Array do
-            include Mixins::TemperatureConditional
-
             attribute :capacity_percent, Types::Integer
             include Mixins::CapacityPercent
 
@@ -40,7 +35,10 @@ module DjiMqttConnect
             attribute :loop_times, Types::Integer
             attribute :sn, Types::SerialNumber | Types::Nil
             attribute :sub_type, Types::DeviceSubType
+
             attribute :temperature, Types::Temperature
+            include Mixins::Temperature
+
             attribute :type, Types::DeviceType
             attribute :voltage, Types::Integer
           end
@@ -69,8 +67,12 @@ module DjiMqttConnect
         attribute? :height_limit, Types::JSON::Decimal
         attribute :home_distance, Types::JSON::Decimal
         attribute :horizontal_speed, Types::JSON::Decimal
+
         attribute :latitude, Types::Latitude
+        include Mixins::Latitude
+
         attribute :longitude, Types::Longitude
+        include Mixins::Longitude
 
         # {"0":"Standby","1":"Takeoff preparation","2":"Takeoff preparation completed","3":"Manual flight","4":"Automatic takeoff","5":"Wayline flight","6":"Panoramic photography","7":"Intelligent tracking","8":"ADS-B avoidance","9":"Auto returning to home","10":"Automatic landing","11":"Forced landing","12":"Three-blade landing","13":"Upgrading","14":"Not connected","15":"APAS","16":"Virtual stick state","17":"Live Flight Controls","18":"Airborne RTK fixing mode","19":"Dock address selecting","20":"POI"}
         attribute :mode_code, Types::DroneModeCode