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

Add some debug stuff

Browse source
This commit is contained in:
Connor Rigby 2017-12-28 11:22:55 -08:00 committed by Connor Rigby
parent 1580e1e08d
commit 1d46c6ae05
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,7 @@ defmodule Farmbot.Firmware do
spawn __MODULE__, :do_read_params_and_report_position, [%{}]
_ ->
Logger.debug 3, "Setting up old params."
spawn __MODULE__, :do_read_params_and_report_position, [old]
spawn __MODULE__, :do_read_params_and_report_position, [Map.delete(old, "param_version")]
end
{nil, %{state | initializing: true}}
end

2
nerves/target/config_migration/after_network.ex
View file

@ -14,6 +14,7 @@ defmodule Farmbot.Target.ConfigMigration.AfterNetwork do
def init([]) do
old_config_json_file = Path.join(@data_path, "config.json")
backup_config_json_file = Path.join(@data_path, "old_config.json")
if File.exists?(old_config_json_file) do
server = ConfigStorage.get_config_value(:string, "authorization", "server")
secret = ConfigStorage.get_config_value(:string, "authorization", "password")
@ -23,6 +24,7 @@ defmodule Farmbot.Target.ConfigMigration.AfterNetwork do
ConfigStorage.update_config_value(:string, "authorization", "token", encoded)
ConfigStorage.update_config_value(:string, "authorization", "email", email)
Logger.success 1, "Successfully migrated secret."
File.cp(old_config_json_file, backup_config_json_file)
File.rm(old_config_json_file)
:ignore
{:error, reason} ->

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

@ -75,7 +75,8 @@ defmodule Farmbot.Target.ConfigMigration.BeforeNetwork do
ConfigStorage.update_config_value(:string, "authorization", "server", server)
end
defp migrate_configuration(%{"firmware_hardware" => hw,
defp migrate_configuration(%{
"firmware_hardware" => hw,
"first_party_farmware" => fpf,
"os_auto_update" => os_auto_update,
"steps_per_mm_x" => spmx,
@ -95,9 +96,9 @@ 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 / 1)},
{:spmy, :update_config_value, :ok} <- {:spmy, :update_config_value, update_config_value(:float, "hardware_params", "movement_axis_nr_steps_y", spmy / 1)},
{:spmz, :update_config_value, :ok} <- {:spmz, :update_config_value, update_config_value(:float, "hardware_params", "movement_axis_nr_steps_z", spmz / 1)},
{: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)},
{: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."
:ok
@ -120,7 +121,7 @@ defmodule Farmbot.Target.ConfigMigration.BeforeNetwork do
end
end) do
if Enum.count(migrated) > 0 do
ConfigStorage.update_config_value(:float, "hardware_params", "param_version", 1.0)
ConfigStorage.update_config_value(:float, "hardware_params", "param_version", -5.0)
ConfigStorage.update_config_value(:float, "hardware_params", "movement_home_spd_x", 50.0)
ConfigStorage.update_config_value(:float, "hardware_params", "movement_home_spd_y", 50.0)
ConfigStorage.update_config_value(:float, "hardware_params", "movement_home_spd_z", 50.0)