v9.1.2-rc4

pull/1159/head
Rick Carlino 2020-02-20 14:52:00 -06:00
parent 91a57ef5af
commit 205fa6afd6
4 changed files with 13 additions and 4 deletions

View File

@ -1 +1 @@
9.1.2-rc3
9.1.2-rc4

View File

@ -24,7 +24,7 @@ defmodule FarmbotCore.Asset.Point do
field(:z, :float)
field(:tool_id, :integer)
field(:discarded_at, :utc_datetime)
field(:gantry_mounted, :boolean, default: false)
field(:gantry_mounted, :boolean)
field(:monitor, :boolean, default: true)
timestamps()
end
@ -40,6 +40,7 @@ defmodule FarmbotCore.Asset.Point do
radius: point.radius,
tool_id: point.tool_id,
discarded_at: point.discarded_at,
gantry_mounted: point.gantry_mounted,
x: point.x,
y: point.y,
z: point.z
@ -60,6 +61,7 @@ defmodule FarmbotCore.Asset.Point do
:y,
:z,
:tool_id,
:gantry_mounted,
:discarded_at,
:monitor,
:created_at,

View File

@ -32,7 +32,6 @@ defmodule FarmbotExt.API.SyncGroup do
FarmwareEnv,
FirstPartyFarmware,
FarmwareInstallation
# PublicKey
]
@doc "Group 1 should have no external requirements"

View File

@ -33,6 +33,10 @@ defmodule FarmbotOS.SysCalls.PointLookup do
tool = Asset.get_tool(id: id)
p = Asset.get_point(tool_id: id)
IO.puts("======== BEGIN get_toolslot_for_tool(id)")
IO.inspect(tool)
IO.inspect(p)
with %{id: ^id} <- tool,
%{name: name, x: x, y: y, z: z, gantry_mounted: mounted} <- p do
maybe_adjust_coordinates(%{
@ -48,8 +52,12 @@ defmodule FarmbotOS.SysCalls.PointLookup do
end
defp maybe_adjust_coordinates(%{gantry_mounted: true} = point) do
IO.puts("==== IT IS DOING THE CORRECT THING")
%{point | x: Movement.get_current_x()}
end
defp maybe_adjust_coordinates(point), do: point
defp maybe_adjust_coordinates(point) do
IO.puts("==== Using regular coordinates!")
point
end
end