dji_mqtt_connect 0.1.15.1 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47088befabe8de8f2476d0cae32c0a7d6514bb4bb535a4fa9f9ca77d8487b012
-  data.tar.gz: 794eaa0083251281365af9ac3eabdaa1d519c97ca306387384af51b8461211d9
+  metadata.gz: dc9663b6e47df7b5cb49186748af7973143782dcd7dfcb8c8fd64f4023857d78
+  data.tar.gz: e1e0849ffbbf5ed675792d80e453b1f36d1ff10e50e5f0f94381ecec04ca1e0f
 SHA512:
-  metadata.gz: 54ecb1cfb6c7e1155a52c8cd1543c7b251e9ed573c34a9dcb6b563b15bc0374d685812735e867811ccbc7ab5f81004973ab2917d6f63e6954d10295720a9f9ce
-  data.tar.gz: 8ebd5fd2616808530e7c7ea23cfbf52ef705314462baf408c886fd91c93afb17f051ae413492db65279ddd934988f90384bdb171aa3a1d4ac17217a257557bdc
+  metadata.gz: f88bcf6906c9d340447825dff46b410a6f6548448ea53c78183f20d24d7ee7626f9ef81994c353de6c7aff3b5c3a47790eb029bccd6ea47a02443089a1285a3b
+  data.tar.gz: d360b73a17536d58d2df09e8a2d9de7e13328f81e9acb65d33df69efbbbc8df6a4bfd52f973c336f25a35e1def4b9b468ca7941bcb98d0794b5b84bc5da28381

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.15.1)
+    dji_mqtt_connect (0.1.16)
       activesupport (>= 6.0, <= 8)
       dry-struct (~> 1.6)
       dry-transformer (~> 1.0)

data/config/locales/services_output_status.en.yml

@@ -1,7 +1,7 @@
 ---
 :en:
   :dji_mqtt_connect:
-    :cover_step_key:
+    :events_step_key:
       check_drone_sdr_connect_state: "Check Drone SDR Connect State"
       check_scram_state: "Check SCRAM State"
       core_mcu_reboot: "Core MCU Reboot"

data/lib/dji_mqtt_connect/factories.rb

@@ -24,6 +24,28 @@ module DjiMqttConnect
       )
     end
 
+    def build_thing_product_device_reboot_events_message
+      message_data = {
+        result: 0,
+        output: {
+          status: "ok",
+          progress: {
+            percent: 100
+          }
+        }
+      }
+
+      Thing::Product::DeviceRebootEventsMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "device_reboot",
+        need_reply: 1,
+        data: message_data,
+        _data: message_data
+      )
+    end
+
     def build_file_upload_callback_events_message
       message_data = {
         file: {

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

@@ -30,6 +30,7 @@ module DjiMqttConnect
                     nest "args", ["component_index", "sensor_index"]
 
                     map_value "id", ->(id) { "0x#{id}" }
+                    map_value "level", ->(level) { [level - 1, 0].max }
                     rename_keys "id" => "code"
 
                     deep_merge({"module" => 3}) # hardcoded to hms module

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

@@ -15,6 +15,8 @@ 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)
 
@@ -23,37 +25,7 @@ module DjiMqttConnect
             attribute? :total_steps, Types::Integer
 
             # {"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::String.enum(
-              "get_bid",
-              "check_work_mode",
-              "check_task_state",
-              "land_mcu_reboot",
-              "rain_mcu_reboot",
-              "core_mcu_reboot",
-              "sdr_reboot",
-              "write_reboot_param_file",
-              "get_drone_power_state",
-              "close_putter",
-              "check_wired_connect_state",
-              "open_drone",
-              "open_alarm",
-              "check_scram_state",
-              "open_cover",
-              "check_drone_sdr_connect_state",
-              "turn_on_drone",
-              "drone_paddle_forward",
-              "close_cover",
-              "drone_paddle_reverse",
-              "drone_paddle_stop",
-              "free_putter",
-              "stop_charge"
-            )
-
-            def humanized_step_key
-              return unless step_key
-
-              I18n.t(step_key, scope: "dji_mqtt_connect.cover_step_key", default: step_key.titleize)
-            end
+            attribute? :step_key, Types::EventsProgressStepKey
 
             attribute? :step_result, Types::Integer
           end

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

@@ -15,6 +15,8 @@ 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)
 
@@ -23,37 +25,7 @@ module DjiMqttConnect
             attribute? :total_steps, Types::Integer
 
             # {"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::String.enum(
-              "get_bid",
-              "check_work_mode",
-              "check_task_state",
-              "land_mcu_reboot",
-              "rain_mcu_reboot",
-              "core_mcu_reboot",
-              "sdr_reboot",
-              "write_reboot_param_file",
-              "get_drone_power_state",
-              "close_putter",
-              "check_wired_connect_state",
-              "open_drone",
-              "open_alarm",
-              "check_scram_state",
-              "open_cover",
-              "check_drone_sdr_connect_state",
-              "turn_on_drone",
-              "drone_paddle_forward",
-              "close_cover",
-              "drone_paddle_reverse",
-              "drone_paddle_stop",
-              "free_putter",
-              "stop_charge"
-            )
-
-            def humanized_step_key
-              return unless step_key
-
-              I18n.t(step_key, scope: "dji_mqtt_connect.cover_step_key", default: step_key.titleize)
-            end
+            attribute? :step_key, Types::EventsProgressStepKey
 
             attribute? :step_result, Types::Integer
           end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class DeviceRebootEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("device_reboot")
+
+      attribute :data do
+        attribute :result, Types::Integer
+
+        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)
+
+            attribute? :current_step, Types::Integer
+
+            attribute? :total_steps, Types::Integer
+
+            # {"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
+
+            attribute? :step_result, Types::Integer
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/mixins/events_progress_checks.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Mixins
+    # Provides checks for the event progress object that contains a Types::EventsProgressStepKey step_key value
+    module EventsProgressChecks
+      # Provide accessors for each step key value
+      DjiMqttConnect::Types::EventsProgressStepKey.values.each do |step_key_value|
+        define_method(:"#{step_key_value}_step?") { step_key == step_key_value }
+      end
+
+      def humanized_step_key
+        return unless step_key
+
+        I18n.t(step_key, scope: "dji_mqtt_connect.events_step_key", default: step_key.titleize)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/mixins/services_output_status_checks.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-module DjiMqttConnect
-end
-# frozen_string_literal: true
-
 module DjiMqttConnect
   module Mixins
     # Provides checks for the output object that contains a Types::ServicesOutputStatus status value

data/lib/dji_mqtt_connect/types.rb

@@ -35,6 +35,33 @@ module DjiMqttConnect
     InvalidTemperature = Types::Integer.constrained(gteq: 1300) # maximum temp of k-type thermocouple, errors are usually 30K+
     Temperature = InvalidTemperature | Types::JSON::Decimal
 
+    # {"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"}
+    EventsProgressStepKey = Types::String.enum(
+      "get_bid",
+      "check_work_mode",
+      "check_task_state",
+      "land_mcu_reboot",
+      "rain_mcu_reboot",
+      "core_mcu_reboot",
+      "sdr_reboot",
+      "write_reboot_param_file",
+      "get_drone_power_state",
+      "close_putter",
+      "check_wired_connect_state",
+      "open_drone",
+      "open_alarm",
+      "check_scram_state",
+      "open_cover",
+      "check_drone_sdr_connect_state",
+      "turn_on_drone",
+      "drone_paddle_forward",
+      "close_cover",
+      "drone_paddle_reverse",
+      "drone_paddle_stop",
+      "free_putter",
+      "stop_charge"
+    )
+
     # {"sent":"sent","in_progress":"in progress","ok":"success","paused":"paused","rejected":"rejected","failed":"failed","canceled":"canceled or stopped","timeout":"timeout"}
     ServicesOutputStatus = Types::String.enum(
       SERVICE_OUTPUT_STATUS_SENT = "sent",

data/lib/dji_mqtt_connect/version.rb

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

data/lib/dji_mqtt_connect.rb

@@ -37,6 +37,7 @@ module DjiMqttConnect
       autoload :CoverCloseEventsMessage, "dji_mqtt_connect/messages/thing/product/events/cover_close"
       autoload :CoverOpenEventsMessage, "dji_mqtt_connect/messages/thing/product/events/cover_open"
       autoload :DeviceLogEventsMessage, "dji_mqtt_connect/messages/thing/product/events/device_log"
+      autoload :DeviceRebootEventsMessage, "dji_mqtt_connect/messages/thing/product/events/device_reboot"
       autoload :DeviceExitHomingNotifyEventsMessage, "dji_mqtt_connect/messages/thing/product/events/device_exit_homing_notify"
       autoload :FileUploadCallbackEventsMessage, "dji_mqtt_connect/messages/thing/product/events/file_upload_callback"
       autoload :FileuploadProgressEventsMessage, "dji_mqtt_connect/messages/thing/product/events/fileupload_progress"
@@ -124,6 +125,7 @@ module DjiMqttConnect
 
   # Mixinx
   module Mixins
+    autoload :EventsProgressChecks, "dji_mqtt_connect/mixins/events_progress_checks"
     autoload :LatitudeConditional, "dji_mqtt_connect/mixins/latitude_conditional"
     autoload :LongitudeConditional, "dji_mqtt_connect/mixins/longitude_conditional"
     autoload :ServicesOutputStatusChecks, "dji_mqtt_connect/mixins/services_output_status_checks"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.15.1
+  version: 0.1.16
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,6 +129,7 @@ files:
 - 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_log.rb
+- lib/dji_mqtt_connect/messages/thing/product/events/device_reboot.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/file_upload_callback.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/fileupload_progress.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/flighttask_progress.rb
@@ -183,6 +184,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/return_home.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/return_home_cancel.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply_message.rb
+- lib/dji_mqtt_connect/mixins/events_progress_checks.rb
 - lib/dji_mqtt_connect/mixins/latitude_conditional.rb
 - lib/dji_mqtt_connect/mixins/longitude_conditional.rb
 - lib/dji_mqtt_connect/mixins/services_output_status_checks.rb