From 5bb77c1c1485ad245ad9651631a9a289bed31fa6 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Fri, 17 Apr 2020 10:58:36 -0500 Subject: [PATCH 1/2] Delete dump_info node --- app/models/celery_script_settings_bag.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/models/celery_script_settings_bag.rb b/app/models/celery_script_settings_bag.rb index 704e02c06..bf005b226 100644 --- a/app/models/celery_script_settings_bag.rb +++ b/app/models/celery_script_settings_bag.rb @@ -326,10 +326,6 @@ module CeleryScriptSettingsBag args: [:x, :y, :z], tags: [:data, :location_like], }, - dump_info: { - tags: [:function, :network_user, :disk_user, :api_writer], - docs: "Sends an info dump to server administrators for troubleshooting.", - }, emergency_lock: { tags: [:function, :firmware_user, :control_flow], }, From 6f834517cadba3f70e5767d0ba421cb19074fd83 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Fri, 17 Apr 2020 11:08:17 -0500 Subject: [PATCH 2/2] More dump_info removal --- app/models/celery_script_settings_bag.rb | 4 ++-- app/models/pin_binding.rb | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/models/celery_script_settings_bag.rb b/app/models/celery_script_settings_bag.rb index bf005b226..b1bb32768 100644 --- a/app/models/celery_script_settings_bag.rb +++ b/app/models/celery_script_settings_bag.rb @@ -33,7 +33,7 @@ module CeleryScriptSettingsBag ALLOWED_POINTER_TYPE = %w(GenericPointer ToolSlot Plant Weed) ALLOWED_RESOURCE_TYPE = %w(Device Point Plant ToolSlot Weed GenericPointer) ALLOWED_RPC_NODES = %w(assertion calibrate change_ownership - check_updates dump_info emergency_lock + check_updates emergency_lock emergency_unlock execute execute_script factory_reset find_home flash_firmware home install_farmware install_first_party_farmware _if @@ -42,7 +42,7 @@ module CeleryScriptSettingsBag send_message set_servo_angle set_user_env sync take_photo toggle_pin update_farmware wait write_pin zero) - ALLOWED_SPEC_ACTION = %w(dump_info emergency_lock emergency_unlock power_off + ALLOWED_SPEC_ACTION = %w(emergency_lock emergency_unlock power_off read_status reboot sync take_photo) ANY_VARIABLE = %i(tool coordinate point identifier) BAD_ALLOWED_PIN_MODES = '"%s" is not a valid pin_mode. Allowed values: %s' diff --git a/app/models/pin_binding.rb b/app/models/pin_binding.rb index cb8d5d02d..dd6c893ba 100644 --- a/app/models/pin_binding.rb +++ b/app/models/pin_binding.rb @@ -1,20 +1,18 @@ class PinBinding < ApplicationRecord - OFF_LIMITS = [ - 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 21, 23, 24, 25, 27 + OFF_LIMITS = [ + 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 21, 23, 24, 25, 27, ] - BAD_PIN_NUM = \ - "The following pin numbers cannot be used: %s" % OFF_LIMITS.join(", ") + BAD_PIN_NUM = "The following pin numbers cannot be used: %s" % OFF_LIMITS.join(", ") belongs_to :device belongs_to :sequence - enum special_action: { dump_info: "dump_info", - emergency_lock: "emergency_lock", + enum special_action: { emergency_lock: "emergency_lock", emergency_unlock: "emergency_unlock", - power_off: "power_off", - read_status: "read_status", - reboot: "reboot", - sync: "sync", - take_photo: "take_photo" } + power_off: "power_off", + read_status: "read_status", + reboot: "reboot", + sync: "sync", + take_photo: "take_photo" } validates :pin_num, uniqueness: { scope: :device } def fancy_name