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

Fix write_parm sending scientific notation

pull/599/head
Connor Rigby 2018-07-23 16:52:12 -07:00 committed by connor rigby
parent 8d5ff11a20
commit f58e317449
No known key found for this signature in database
GPG Key ID: 24DC438382965C3B
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/farmbot/firmware/uart_handler/uart_handler.ex
View File

@ -360,7 +360,7 @@ defmodule Farmbot.Firmware.UartHandler do
def handle_call({:update_param, param, val}, _from, state) do
num = Farmbot.Firmware.Gcode.Param.parse_param(param)
do_write("F22 P#{num} V#{val}", state)
do_write("F22 P#{num} V#{fmnt_float(val)}", state)
end
def handle_call(:read_all_params, _from, state) do
@ -378,7 +378,7 @@ defmodule Farmbot.Firmware.UartHandler do
do_write("F42 P#{pin} M#{encoded_mode}", state, dispatch)
end
def handle_call({:write_pin, pin, mode, value}, _from, state) do
def handle_call({:write_pin, pin, mode, value}, _from, state) when is_integer(value) do
encoded_mode = extract_pin_mode(mode)
dispatch = [{:report_pin_mode, pin, mode}, {:report_pin_value, pin, value}]
do_write("F41 P#{pin} V#{value} M#{encoded_mode}", state, dispatch)
@ -388,7 +388,7 @@ defmodule Farmbot.Firmware.UartHandler do
do_write("F83", state)
end
def handle_call({:set_servo_angle, pin, angle}, _, state) do
def handle_call({:set_servo_angle, pin, angle}, _, state) when is_integer(angle) do
do_write("F61 P#{pin} V#{angle}", state)
end

4
platform/target/network/manager.ex
View File

@ -111,7 +111,7 @@ defmodule Farmbot.Target.Network.Manager do
"""
Logger.error 1, msg
Farmbot.System.factory_reset(msg)
{:stop, %{state | not_found_timer: nil}}
{:stop, :network_not_found, %{state | not_found_timer: nil}}
true ->
Logger.error 1, "Network not found after timer. Farmbot is disconnected."
msg = """
@ -125,7 +125,7 @@ defmodule Farmbot.Target.Network.Manager do
Farmbot.System.factory_reset(msg)
# Network.teardown(state.interface)
# Network.setup(state.interface, state.opts)
{:stop, %{state | not_found_timer: nil}}
{:stop, :network_not_found, %{state | not_found_timer: nil}}
end
end