spacecruft/farmbot_os
spacecruft/farmbot_os
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix wrong param name during migration, and add ugly logs

Browse source
This commit is contained in:
Connor Rigby 2017-12-28 11:43:13 -08:00 committed by Connor Rigby
parent 1d46c6ae05
commit ee9c4b0d55
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/farmbot/firmware/firmware.ex
View file

@ -40,6 +40,9 @@ defmodule Farmbot.Firmware do
For a list of paramaters see `Farmbot.Firmware.Gcode.Param`
"""
def update_param(param, val) do
if val == 0 do
Logger.warn 1, "WRITING PARAM: #{param} ZERO!!!"
end
GenStage.call(__MODULE__, {:update_param, [param, val]}, :infinity)
end
@ -294,6 +297,9 @@ defmodule Farmbot.Firmware do
end
defp handle_gcode({:report_parameter_value, param, value}, state) do
if value == 0 do
Logger.warn 1, "Firmware reported zero for #{param}!!!!"
end
Farmbot.System.ConfigStorage.update_config_value(:float, "hardware_params", to_string(param), value / 1)
{:mcu_params, %{param => value}, state}

8
nerves/target/config_migration/before_network.ex
View file

@ -96,11 +96,11 @@ defmodule Farmbot.Target.ConfigMigration.BeforeNetwork do
{:user_env, :type_check, true} <- {:user_env, :type_check, is_map(user_env)},
{:user_env, :type_cast, {:ok, user_env_enc}} <- {:user_env, :type_cast, Poison.encode(user_env)},
{:user_env, :update_config_value, :ok} <- {:user_env, :update_config_value, update_config_value(:string, "settings", "user_env", user_env_enc)},
{:spmx, :update_config_value, :ok} <- {:spmx, :update_config_value, update_config_value(:float, "hardware_params", "movement_axis_nr_steps_x", (spmx || 5) / 1)},
{:spmy, :update_config_value, :ok} <- {:spmy, :update_config_value, update_config_value(:float, "hardware_params", "movement_axis_nr_steps_y", (spmy || 5) / 1)},
{:spmz, :update_config_value, :ok} <- {:spmz, :update_config_value, update_config_value(:float, "hardware_params", "movement_axis_nr_steps_z", (spmz || 25) / 1)},
{:spmx, :update_config_value, :ok} <- {:spmx, :update_config_value, update_config_value(:float, "hardware_params", "movement_step_per_mm_x", (spmx || 5) / 1)},
{:spmy, :update_config_value, :ok} <- {:spmy, :update_config_value, update_config_value(:float, "hardware_params", "movement_step_per_mm_y", (spmy || 5) / 1)},
{:spmz, :update_config_value, :ok} <- {:spmz, :update_config_value, update_config_value(:float, "hardware_params", "movement_step_per_mm_z", (spmz || 25) / 1)},
{:first_boot, :update_config_value, :ok} <- {:first_boot, :update_config_value, update_config_value(:bool, "settings", "first_boot", false)} do
Logger.success 1, "Configuration data from jsono file was merged."
Logger.success 1, "Configuration data from json file was merged."
:ok
else
{step, sub_step, err} ->