fix missing params
parent
21bbd16851
commit
b75af407ed
|
@ -85,6 +85,12 @@ defmodule FarmbotCore.Asset.FirmwareConfig do
|
|||
field(:movement_timeout_x, :float)
|
||||
field(:movement_timeout_y, :float)
|
||||
field(:movement_timeout_z, :float)
|
||||
field(:movement_motor_current_x, :float)
|
||||
field(:movement_motor_current_y, :float)
|
||||
field(:movement_motor_current_z, :float)
|
||||
field(:movement_stall_sensitivity_x, :float)
|
||||
field(:movement_stall_sensitivity_y, :float)
|
||||
field(:movement_stall_sensitivity_z, :float)
|
||||
field(:param_e_stop_on_mov_err, :float)
|
||||
field(:param_mov_nr_retry, :float)
|
||||
field(:pin_guard_1_active_state, :float)
|
||||
|
@ -181,6 +187,12 @@ defmodule FarmbotCore.Asset.FirmwareConfig do
|
|||
movement_timeout_x: firmware_config.movement_timeout_x,
|
||||
movement_timeout_y: firmware_config.movement_timeout_y,
|
||||
movement_timeout_z: firmware_config.movement_timeout_z,
|
||||
movement_motor_current_x: firmware_config.movement_motor_current_x,
|
||||
movement_motor_current_y: firmware_config.movement_motor_current_y,
|
||||
movement_motor_current_z: firmware_config.movement_motor_current_z,
|
||||
movement_stall_sensitivity_x: firmware_config.movement_stall_sensitivity_x,
|
||||
movement_stall_sensitivity_y: firmware_config.movement_stall_sensitivity_y,
|
||||
movement_stall_sensitivity_z: firmware_config.movement_stall_sensitivity_z,
|
||||
param_e_stop_on_mov_err: firmware_config.param_e_stop_on_mov_err,
|
||||
param_mov_nr_retry: firmware_config.param_mov_nr_retry,
|
||||
pin_guard_1_active_state: firmware_config.pin_guard_1_active_state,
|
||||
|
@ -277,6 +289,12 @@ defmodule FarmbotCore.Asset.FirmwareConfig do
|
|||
:movement_timeout_x,
|
||||
:movement_timeout_y,
|
||||
:movement_timeout_z,
|
||||
:movement_motor_current_x,
|
||||
:movement_motor_current_y,
|
||||
:movement_motor_current_z,
|
||||
:movement_stall_sensitivity_x,
|
||||
:movement_stall_sensitivity_y,
|
||||
:movement_stall_sensitivity_z,
|
||||
:param_e_stop_on_mov_err,
|
||||
:param_mov_nr_retry,
|
||||
:pin_guard_1_active_state,
|
||||
|
|
|
@ -95,6 +95,12 @@ defmodule FarmbotCore.BotStateNG.McuParams do
|
|||
field(:encoder_invert_x, :float)
|
||||
field(:encoder_missed_steps_max_x, :float)
|
||||
field(:movement_invert_motor_y, :float)
|
||||
field(:movement_motor_current_x, :float)
|
||||
field(:movement_motor_current_y, :float)
|
||||
field(:movement_motor_current_z, :float)
|
||||
field(:movement_stall_sensitivity_x, :float)
|
||||
field(:movement_stall_sensitivity_y, :float)
|
||||
field(:movement_stall_sensitivity_z, :float)
|
||||
end
|
||||
|
||||
def new() do
|
||||
|
@ -192,7 +198,13 @@ defmodule FarmbotCore.BotStateNG.McuParams do
|
|||
movement_axis_nr_steps_z: mcu_params.movement_axis_nr_steps_z,
|
||||
encoder_invert_x: mcu_params.encoder_invert_x,
|
||||
encoder_missed_steps_max_x: mcu_params.encoder_missed_steps_max_x,
|
||||
movement_invert_motor_y: mcu_params.movement_invert_motor_y
|
||||
movement_invert_motor_y: mcu_params.movement_invert_motor_y,
|
||||
movement_motor_current_x: mcu_params.movement_motor_current_x,
|
||||
movement_motor_current_y: mcu_params.movement_motor_current_y,
|
||||
movement_motor_current_z: mcu_params.movement_motor_current_z,
|
||||
movement_stall_sensitivity_x: mcu_params.movement_stall_sensitivity_x,
|
||||
movement_stall_sensitivity_y: mcu_params.movement_stall_sensitivity_y,
|
||||
movement_stall_sensitivity_z: mcu_params.movement_stall_sensitivity_z
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -286,7 +298,13 @@ defmodule FarmbotCore.BotStateNG.McuParams do
|
|||
:movement_axis_nr_steps_z,
|
||||
:encoder_invert_x,
|
||||
:encoder_missed_steps_max_x,
|
||||
:movement_invert_motor_y
|
||||
:movement_invert_motor_y,
|
||||
:movement_motor_current_x,
|
||||
:movement_motor_current_y,
|
||||
:movement_motor_current_z,
|
||||
:movement_stall_sensitivity_x,
|
||||
:movement_stall_sensitivity_y,
|
||||
:movement_stall_sensitivity_z
|
||||
])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -220,7 +220,7 @@ defmodule FarmbotFirmware.Param do
|
|||
@seconds "(seconds)"
|
||||
@steps "(steps)"
|
||||
@steps_per_mm "(steps/mm)"
|
||||
@amps "(amps)"
|
||||
@milliamps "(milliamps)"
|
||||
|
||||
@doc "Translates a param to a human readable string"
|
||||
@spec to_human(parameter :: t() | number(), value :: number()) ::
|
||||
|
@ -379,13 +379,13 @@ defmodule FarmbotFirmware.Param do
|
|||
do: {"invert endstops, z-axis", nil, format_bool(value)}
|
||||
|
||||
def to_human(:movement_motor_current_x, value),
|
||||
do: {"motor current, x-axis", @amps, format_float(value)}
|
||||
do: {"motor current, x-axis", @milliamps, format_float(value)}
|
||||
|
||||
def to_human(:movement_motor_current_y, value),
|
||||
do: {"motor current, y-axis", @amps, format_float(value)}
|
||||
do: {"motor current, y-axis", @milliamps, format_float(value)}
|
||||
|
||||
def to_human(:movement_motor_current_z, value),
|
||||
do: {"motor current, z-axis", @amps, format_float(value)}
|
||||
do: {"motor current, z-axis", @milliamps, format_float(value)}
|
||||
|
||||
def to_human(:movement_stall_sensitivity_x, value),
|
||||
do: {"stall sensitivity, x-axis", nil, format_float(value)}
|
||||
|
|
|
@ -92,7 +92,13 @@ defmodule FarmbotFirmware.StubSideEffects do
|
|||
movement_stop_at_home_y: 1.0,
|
||||
pin_guard_2_time_out: 60.0,
|
||||
encoder_scaling_z: 5556.0,
|
||||
encoder_missed_steps_decay_x: 5.0
|
||||
encoder_missed_steps_decay_x: 5.0,
|
||||
movement_motor_current_x: 600,
|
||||
movement_motor_current_y: 600,
|
||||
movement_motor_current_z: 600,
|
||||
movement_stall_sensitivity_x: 30,
|
||||
movement_stall_sensitivity_y: 30,
|
||||
movement_stall_sensitivity_z: 30
|
||||
]
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue